From 0639707694f5182bde8d13539cefb59274f15342 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 31 Jan 2017 20:10:44 +0100 Subject: [PATCH] phantomlimb: fix x86_64 build. * use a safe source. --- .../patches/phantomlimb-1.patchset | 22 +++++++++++++++++++ haiku-apps/phantomlimb/phantomlimb-1.recipe | 10 ++++++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 haiku-apps/phantomlimb/patches/phantomlimb-1.patchset diff --git a/haiku-apps/phantomlimb/patches/phantomlimb-1.patchset b/haiku-apps/phantomlimb/patches/phantomlimb-1.patchset new file mode 100644 index 000000000..0110c9f7f --- /dev/null +++ b/haiku-apps/phantomlimb/patches/phantomlimb-1.patchset @@ -0,0 +1,22 @@ +From c46502f18c0044a8164d45021943ecbca5e1451a Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Tue, 31 Jan 2017 19:48:07 +0100 +Subject: fix x86_64 build + + +diff --git a/source/PhantomView.h b/source/PhantomView.h +index e262ef8..b1576f6 100644 +--- a/source/PhantomView.h ++++ b/source/PhantomView.h +@@ -69,7 +69,7 @@ private: + int32 _testSign[2]; + bool _awaitingAnswer; + +- static long TestThreadFunc(void * a) {return ((PhantomView*)a)->TestThread();} ++ static status_t TestThreadFunc(void * a) {return ((PhantomView*)a)->TestThread();} + long TestThread(); + }; + +-- +2.10.2 + diff --git a/haiku-apps/phantomlimb/phantomlimb-1.recipe b/haiku-apps/phantomlimb/phantomlimb-1.recipe index 406485b3c..b65362352 100644 --- a/haiku-apps/phantomlimb/phantomlimb-1.recipe +++ b/haiku-apps/phantomlimb/phantomlimb-1.recipe @@ -12,10 +12,14 @@ HOMEPAGE="https://github.com/HaikuArchives/PhantomLimb" COPYRIGHT="2001 Ben Loftis 2013 Jeremy Friesner" LICENSE="Public Domain" -REVISION="2" -SOURCE_URI="git+git://github.com/HaikuArchives/PhantomLimb.git#5444867ac9" +REVISION="3" +srcGitRev="5444867ac9e8b3a55395106a46affff9bfcea5b1" +SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="c9da10aeeb7598be66507d8db15fcb7bd0ad619c85b0e4dcb2fe708500e49fd9" +SOURCE_DIR="PhantomLimb-$srcGitRev" +PATCHES="phantomlimb-$portVersion.patchset" -ARCHITECTURES="x86_gcc2 x86 ?x86_64" +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" phantomlimb = $portVersion