midikeyboard: fix build on x86_64.

haikuports · Jan 22, 2017 · 5d806bc · 5d806bc
1 parent 0f43995
commit 5d806bc
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe b/haiku-apps/midikeyboard/midikeyboard-1.0.0.recipe
@@ -6,13 +6,14 @@ input and output devices."
 HOMEPAGE="https://github.com/HaikuArchives/MidiKeyboard"
 COPYRIGHT="2000-2002 Martijn Sipkema"
 LICENSE="GNU LGPL v2"
-REVISION="2"
+REVISION="3"
 srcGitRev="137dc9f05ecf3eb1086322117cfd81d62da3dda7"
 SOURCE_URI="$HOMEPAGE/archive/$srcGitRev.tar.gz"
 CHECKSUM_SHA256="625d7278eae65923c4ef1e3ba5fd01d8ec8ee93a4df81212ab855d1da1502471"
 SOURCE_DIR="MidiKeyboard-$srcGitRev"
+PATCHES="midikeyboard-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 !x86 !x86_64"
+ARCHITECTURES="x86_gcc2 !x86 x86_64"
 
 PROVIDES="
 	midikeyboard = $portVersion

diff --git a/haiku-apps/midikeyboard/patches/midikeyboard-1.0.0.patchset b/haiku-apps/midikeyboard/patches/midikeyboard-1.0.0.patchset
@@ -0,0 +1,42 @@
+From 36e8deb3638ef4b404fd497fef1cf408cd16effa Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+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 <MidiRoster.h>
+ #include <cstdio>
+
++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 <list>
+
++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
+