From 2f06a8974dbb868c11dc8202f878ee164751512f Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 26 Jan 2017 21:39:15 +0100 Subject: [PATCH] midikeyboard: patch is upstreamed. --- .../midikeyboard/midikeyboard-1.0.0.recipe | 7 ++-- .../patches/midikeyboard-1.0.0.patchset | 42 ------------------- 2 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 haiku-apps/midikeyboard/patches/midikeyboard-1.0.0.patchset diff --git a/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe b/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe index 17233dc37..f5d8c53c9 100644 --- a/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe +++ b/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe @@ -6,12 +6,11 @@ input and output devices." HOMEPAGE="https://github.com/HaikuArchives/MidiKeyboard" COPYRIGHT="2000-2002 Martijn Sipkema" LICENSE="GNU LGPL v2" -REVISION="3" -srcGitRev="137dc9f05ecf3eb1086322117cfd81d62da3dda7" +REVISION="4" +srcGitRev="80d41b88a6770c12a7c550f0b64b0765543d1fb8" SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="625d7278eae65923c4ef1e3ba5fd01d8ec8ee93a4df81212ab855d1da1502471" +CHECKSUM_SHA256="5c42b9fa93b76cf634f4f78398a782b31b79bfc82934bc66ae209423e64e3281" SOURCE_DIR="MidiKeyboard-$srcGitRev" -PATCHES="midikeyboard-$portVersion.patchset" ARCHITECTURES="x86_gcc2 !x86 x86_64" diff --git a/haiku-apps/midikeyboard/patches/midikeyboard-1.0.0.patchset b/haiku-apps/midikeyboard/patches/midikeyboard-1.0.0.patchset deleted file mode 100644 index 9d83802f2..000000000 --- a/haiku-apps/midikeyboard/patches/midikeyboard-1.0.0.patchset +++ /dev/null @@ -1,42 +0,0 @@ -From 36e8deb3638ef4b404fd497fef1cf408cd16effa Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sun, 22 Jan 2017 14:36:58 +0100 -Subject: x86_64 build fix. - - -diff --git a/KbApplication.cc b/KbApplication.cc -index a7938a4..5d39c36 100644 ---- a/KbApplication.cc -+++ b/KbApplication.cc -@@ -47,6 +47,8 @@ - #include - #include - -+using namespace std; -+ - const uint32 SET_RECEIVE_CHANNEL = 'schR'; - const uint32 SET_TRANSMIT_CHANNEL = 'schT'; - const uint32 PRODUCER_CONNECT = 'ctPD'; -diff --git a/keyboard_state.h b/keyboard_state.h -index 521200b..1e735d1 100644 ---- a/keyboard_state.h -+++ b/keyboard_state.h -@@ -31,6 +31,8 @@ - - #include - -+using namespace std; -+ - class key - { - public: -@@ -69,4 +71,4 @@ public: - - // compare - key_list compare(keyboard_state&); --}; -\ No newline at end of file -+}; --- -2.10.2 -