From 801752ba7d09e152d6ddafbcad84fff6a8176461 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 7 Feb 2017 20:34:51 +0100 Subject: [PATCH] phantomlimb: patch is upstreamed. --- .../patches/phantomlimb-1.patchset | 22 ------------------- haiku-apps/phantomlimb/phantomlimb-1.recipe | 7 +++--- 2 files changed, 3 insertions(+), 26 deletions(-) delete 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 deleted file mode 100644 index 0110c9f7f..000000000 --- a/haiku-apps/phantomlimb/patches/phantomlimb-1.patchset +++ /dev/null @@ -1,22 +0,0 @@ -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 b65362352..ffd984326 100644 --- a/haiku-apps/phantomlimb/phantomlimb-1.recipe +++ b/haiku-apps/phantomlimb/phantomlimb-1.recipe @@ -12,12 +12,11 @@ HOMEPAGE="https://github.com/HaikuArchives/PhantomLimb" COPYRIGHT="2001 Ben Loftis 2013 Jeremy Friesner" LICENSE="Public Domain" -REVISION="3" -srcGitRev="5444867ac9e8b3a55395106a46affff9bfcea5b1" +REVISION="4" +srcGitRev="2ad55873b4e9e6397d55cdedbf497117640716ee" SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="c9da10aeeb7598be66507d8db15fcb7bd0ad619c85b0e4dcb2fe708500e49fd9" +CHECKSUM_SHA256="e6a86517b54d350a311b2f3f93a36c63b6b2088d338527bc0472d2b005a0386d" SOURCE_DIR="PhantomLimb-$srcGitRev" -PATCHES="phantomlimb-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64"