[oe-commits] org.oe.dev merge of '1a4455548bddc38a21bde1cbdcb1d0fc7f25b9cc'

[oe commit]

merge of '1a4455548bddc38a21bde1cbdcb1d0fc7f25b9cc'
     and '73307f34eb6c0e821ead39db55ec63966dbf5c6b'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: dd12cf1614fbdd04c9791735ee944b266f1c6c74
ViewMTN: http://monotone.openembedded.org/revision/info/dd12cf1614fbdd04c9791735ee944b266f1c6c74
Files:
1
packages/xorg-font/font-util_1.0.1.bb
packages/xorg-font/xfonts-xorg_6.8.bb
packages/xorg-font/xorg-font-common.inc
packages/synergy/files
packages/synergy/files/synergy-1.3.1+gcc-4.3.patch
packages/synergy/synergy_1.3.1.bb
Diffs:

#
# mt diff -r1a4455548bddc38a21bde1cbdcb1d0fc7f25b9cc -rdd12cf1614fbdd04c9791735ee944b266f1c6c74
#
#
#
# patch "packages/xorg-font/font-util_1.0.1.bb"
#  from [29499d32e8b5b2e57bdda74b6b9a0c8c67b14225]
#    to [1ff5dfafad42ebe6042f344ead7b882ca4f6d512]
# 
# patch "packages/xorg-font/xfonts-xorg_6.8.bb"
#  from [04153a52816068f1546023f7132a6fccd967c12c]
#    to [09c9f1340c65d7c3b13e37bd3c7387bf7f4c3d59]
# 
# patch "packages/xorg-font/xorg-font-common.inc"
#  from [cf6510bed6aeab3d7421aeade96f76d37f25ab60]
#    to [5a6c5689ff11a07dd132a451ba320402d78a32f6]
#
============================================================
--- packages/xorg-font/font-util_1.0.1.bb	29499d32e8b5b2e57bdda74b6b9a0c8c67b14225
+++ packages/xorg-font/font-util_1.0.1.bb	1ff5dfafad42ebe6042f344ead7b882ca4f6d512
@@ -1,5 +1,7 @@ require xorg-font-common.inc
 require xorg-font-common.inc
 
+PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
+
 DESCRIPTION = "X font utils."
 
 DEPENDS = "encodings"
============================================================
--- packages/xorg-font/xfonts-xorg_6.8.bb	04153a52816068f1546023f7132a6fccd967c12c
+++ packages/xorg-font/xfonts-xorg_6.8.bb	09c9f1340c65d7c3b13e37bd3c7387bf7f4c3d59
@@ -3,6 +3,8 @@ LICENSE = "XFree86"
 # 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"
 
============================================================
--- packages/xorg-font/xorg-font-common.inc	cf6510bed6aeab3d7421aeade96f76d37f25ab60
+++ packages/xorg-font/xorg-font-common.inc	5a6c5689ff11a07dd132a451ba320402d78a32f6
@@ -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 


#
# mt diff -r73307f34eb6c0e821ead39db55ec63966dbf5c6b -rdd12cf1614fbdd04c9791735ee944b266f1c6c74
#
#
#
# add_dir "packages/synergy/files"
# 
# add_file "packages/synergy/files/synergy-1.3.1+gcc-4.3.patch"
#  content [b3a179405bc5b98c2379e13c27a760b543f7a476]
# 
# patch "packages/synergy/synergy_1.3.1.bb"
#  from [860f8088a0473a57ace13cb733b57d532eac0148]
#    to [e2504407a43e379d753c3f21e2181a2d541ca781]
#
============================================================
--- packages/synergy/files/synergy-1.3.1+gcc-4.3.patch	b3a179405bc5b98c2379e13c27a760b543f7a476
+++ packages/synergy/files/synergy-1.3.1+gcc-4.3.patch	b3a179405bc5b98c2379e13c27a760b543f7a476
@@ -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
+ //
============================================================
--- packages/synergy/synergy_1.3.1.bb	860f8088a0473a57ace13cb733b57d532eac0148
+++ packages/synergy/synergy_1.3.1.bb	e2504407a43e379d753c3f21e2181a2d541ca781
@@ -6,7 +6,8 @@ PR = "r0"
 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::'