diff options
| -rw-r--r-- | packages/synergy/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/synergy/files/synergy-1.3.1+gcc-4.3.patch | 161 | ||||
| -rw-r--r-- | packages/synergy/synergy_1.3.1.bb | 3 | ||||
| -rw-r--r-- | packages/xorg-font/font-util_1.0.1.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-font/xfonts-xorg_6.8.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-font/xorg-font-common.inc | 2 |
6 files changed, 169 insertions, 1 deletions
diff --git a/packages/synergy/files/.mtn2git_empty b/packages/synergy/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/synergy/files/.mtn2git_empty diff --git a/packages/synergy/files/synergy-1.3.1+gcc-4.3.patch b/packages/synergy/files/synergy-1.3.1+gcc-4.3.patch new file mode 100644 index 0000000000..c13a179cf7 --- /dev/null +++ b/packages/synergy/files/synergy-1.3.1+gcc-4.3.patch @@ -0,0 +1,161 @@ +Index: synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp ++++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp +@@ -20,6 +20,8 @@ + #include <fcntl.h> + #include <errno.h> + ++#include <cstdlib> ++ + // + // CArchDaemonUnix + // +Index: synergy-1.3.1/lib/arch/CMultibyte.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/arch/CMultibyte.cpp ++++ synergy-1.3.1/lib/arch/CMultibyte.cpp +@@ -19,14 +19,12 @@ + #include "CArch.h" + #include <limits.h> + #include <string.h> ++#include <cstdlib> + #if HAVE_LOCALE_H + # include <locale.h> + #endif + #if HAVE_WCHAR_H || defined(_MSC_VER) + # include <wchar.h> +-#elif __APPLE__ +- // wtf? Darwin puts mbtowc() et al. in stdlib +-# include <stdlib.h> + #else + // platform apparently has no wchar_t support. provide dummy + // implementations. hopefully at least the C++ compiler has +Index: synergy-1.3.1/lib/base/CStringUtil.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/base/CStringUtil.cpp ++++ synergy-1.3.1/lib/base/CStringUtil.cpp +@@ -19,6 +19,7 @@ + #include <cctype> + #include <cstdio> + #include <cstdlib> ++#include <cstring> + #include <algorithm> + + // +Index: synergy-1.3.1/lib/client/CClient.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/client/CClient.cpp ++++ synergy-1.3.1/lib/client/CClient.cpp +@@ -27,6 +27,9 @@ + #include "IEventQueue.h" + #include "TMethodEventJob.h" + ++#include <cstring> ++#include <cstdlib> ++ + // + // CClient + // +Index: synergy-1.3.1/lib/client/CServerProxy.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/client/CServerProxy.cpp ++++ synergy-1.3.1/lib/client/CServerProxy.cpp +@@ -24,6 +24,7 @@ + #include "TMethodEventJob.h" + #include "XBase.h" + #include <memory> ++#include <cstring> + + // + // CServerProxy +Index: synergy-1.3.1/lib/net/CTCPSocket.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/net/CTCPSocket.cpp ++++ synergy-1.3.1/lib/net/CTCPSocket.cpp +@@ -24,6 +24,7 @@ + #include "CArch.h" + #include "XArch.h" + #include <string.h> ++#include <cstdlib> + + // + // CTCPSocket +Index: synergy-1.3.1/lib/platform/CXWindowsScreen.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp ++++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp +@@ -27,6 +27,7 @@ + #include "IEventQueue.h" + #include "TMethodEventJob.h" + #include <cstring> ++#include <cstdlib> + #if X_DISPLAY_MISSING + # error X11 is required to build synergy + #else +Index: synergy-1.3.1/lib/server/CClientProxy1_3.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp ++++ synergy-1.3.1/lib/server/CClientProxy1_3.cpp +@@ -18,6 +18,8 @@ + #include "IEventQueue.h" + #include "TMethodEventJob.h" + ++#include <cstring> ++ + // + // CClientProxy1_3 + // +Index: synergy-1.3.1/lib/server/CServer.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/server/CServer.cpp ++++ synergy-1.3.1/lib/server/CServer.cpp +@@ -28,7 +28,8 @@ + #include "CLog.h" + #include "TMethodEventJob.h" + #include "CArch.h" +-#include <string.h> ++#include <cstring> ++#include <cstdlib> + + // + // CServer +Index: synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp ++++ synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp +@@ -16,6 +16,7 @@ + #include "IEventQueue.h" + #include "CLock.h" + #include "TMethodEventJob.h" ++#include <cstring> + + // + // CPacketStreamFilter +Index: synergy-1.3.1/lib/synergy/IKeyState.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/synergy/IKeyState.cpp ++++ synergy-1.3.1/lib/synergy/IKeyState.cpp +@@ -13,7 +13,8 @@ + */ + + #include "IKeyState.h" +-#include <string.h> ++#include <cstring> ++#include <cstdlib> + + // + // IKeyState +Index: synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp +=================================================================== +--- synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp ++++ synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp +@@ -14,6 +14,8 @@ + + #include "IPrimaryScreen.h" + ++#include <cstdlib> ++ + // + // IPrimaryScreen + // diff --git a/packages/synergy/synergy_1.3.1.bb b/packages/synergy/synergy_1.3.1.bb index 3a1199b385..d46cb47203 100644 --- a/packages/synergy/synergy_1.3.1.bb +++ b/packages/synergy/synergy_1.3.1.bb @@ -6,7 +6,8 @@ SECTION = "x11/utils" DEPENDS = "libx11 libxtst" PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/synergy2/synergy-${PV}.tar.gz \ + file://synergy-1.3.1+gcc-4.3.patch;patch=1" do_configure_prepend() { grep -l -- -Werror "${S}/"* | xargs sed -i 's:-Werror::' diff --git a/packages/xorg-font/font-util_1.0.1.bb b/packages/xorg-font/font-util_1.0.1.bb index 915c40cd5c..3ba1c05a29 100644 --- a/packages/xorg-font/font-util_1.0.1.bb +++ b/packages/xorg-font/font-util_1.0.1.bb @@ -1,5 +1,7 @@ require xorg-font-common.inc +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" + DESCRIPTION = "X font utils." DEPENDS = "encodings" diff --git a/packages/xorg-font/xfonts-xorg_6.8.bb b/packages/xorg-font/xfonts-xorg_6.8.bb index f8a6a76964..78068e0534 100644 --- a/packages/xorg-font/xfonts-xorg_6.8.bb +++ b/packages/xorg-font/xfonts-xorg_6.8.bb @@ -3,6 +3,8 @@ PR = "r1" # XXX Is this true? These fonts are from X.org. LICENSE = "XFree86" +PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}" + SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;tag=XORG-6_8_0;method=pserver \ file://lexer.patch;patch=1" diff --git a/packages/xorg-font/xorg-font-common.inc b/packages/xorg-font/xorg-font-common.inc index c2977c8db9..09489b1cf8 100644 --- a/packages/xorg-font/xorg-font-common.inc +++ b/packages/xorg-font/xorg-font-common.inc @@ -22,6 +22,8 @@ do_stage() { autotools_stage_all } +PACKAGE_ARCH = "all" + pkg_postinst_${PN} () { set -x for fontdir in `find $D/usr/lib/X11/fonts -type d`; do |