[wxwidgets] new package

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 96 insertions, 0 deletions

diff --git a/patches/wxGTK-2.8.10/autogen.sh b/patches/wxGTK-2.8.10/autogen.sh
new file mode 100755
index 000000000..69351724f
--- /dev/null
+++ b/patches/wxGTK-2.8.10/autogen.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+autoconf -I build/aclocal/
+
diff --git a/patches/wxGTK-2.8.10/fix-cross-compiling.diff b/patches/wxGTK-2.8.10/fix-cross-compiling.diff
new file mode 100644
index 000000000..e511f0729
--- /dev/null
+++ b/patches/wxGTK-2.8.10/fix-cross-compiling.diff
@@ -0,0 +1,61 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: fix cross compiling
+
+ - make sure to search in the right paths.
+ - don't call check for pkg-config multiple times
+   or configure hangs in an endless loop
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ configure.in |   20 ++++----------------
+ 1 file changed, 4 insertions(+), 16 deletions(-)
+
+Index: b/configure.in
+===================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -2738,14 +2740,12 @@ AC_MSG_RESULT($wx_cv_std_libpath)
+ SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s@include@$wx_cv_std_libpath@g` /usr/$wx_cv_std_libpath"
+ 
+ dnl Cross compiling with gcc?
+-if test "$build" != "$host" -a "$GCC" = yes; then
++if test "$build" != "$host"; then
+     dnl for gcc cross-compilers "$CC -print-prog-name=ld" prints the path to
+     dnl the linker. Stripping off the trailing '/bin/ld' gives us a candiate
+     dnl for a 'root' below which libraries and headers for the target system
+     dnl might be installed.
+-    if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+-        cross_root=`dirname $cross_root`
+-        cross_root=`dirname $cross_root`
++    if cross_root="$SYSROOT/usr"; then
+ 
+         dnl substitute this candiate root for '^/usr' in the search lists,
+         dnl strip out any that don't start '^/usr'.
+@@ -3647,8 +3641,6 @@ libraries returned by 'pkg-config gtk+-2
+     fi
+ 
+     if test "$wxUSE_DFB" = 1; then
+-       PKG_PROG_PKG_CONFIG()
+-
+        PKG_CHECK_MODULES(DIRECTFB,
+                          [directfb >= 0.9.23],
+                          [
+@@ -3725,8 +3717,6 @@ libraries returned by 'pkg-config gtk+-2
+         fi
+ 
+         if test "$wxUSE_UNICODE" = "yes"; then
+-            PKG_PROG_PKG_CONFIG()
+-
+             PKG_CHECK_MODULES(PANGOX, pangox,
+                 [
+                     CFLAGS="$PANGOX_CFLAGS $CFLAGS"
+@@ -6154,8 +6144,6 @@ if test "$wxUSE_SOUND" = "yes"; then
+ fi
+ 
+ if test "$WXGTK20" = 1; then
+-    PKG_PROG_PKG_CONFIG()
+-
+     if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
+         if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
+ 
diff --git a/patches/wxGTK-2.8.10/fix-gsocket-name-clash.diff b/patches/wxGTK-2.8.10/fix-gsocket-name-clash.diff
new file mode 100644
index 000000000..ca645fb19
--- /dev/null
+++ b/patches/wxGTK-2.8.10/fix-gsocket-name-clash.diff
@@ -0,0 +1,29 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Subject: avoid name clashes with GSocket from glib 2.21+
+
+taken from http://trac.wxwidgets.org/changeset/61009
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+
+---
+ src/gtk/gsockgtk.cpp |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: b/src/gtk/gsockgtk.cpp
+===================================================================
+--- a/src/gtk/gsockgtk.cpp
++++ b/src/gtk/gsockgtk.cpp
+@@ -15,8 +15,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+ 
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/patches/wxGTK-2.8.10/series b/patches/wxGTK-2.8.10/series
new file mode 100644
index 000000000..58aeb4ec7
--- /dev/null
+++ b/patches/wxGTK-2.8.10/series
@@ -0,0 +1,2 @@
+fix-cross-compiling.diff
+fix-gsocket-name-clash.diff