summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-04 23:21:04 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-07-05 08:52:31 +0700
commitc9542caa88962982340a806ea02ceee8bb5fd11d (patch)
treec929d3fdd86677de0b4766be17669f157d6b8403
parent0a63a5d29bef60133c54eeee256a0842dbe5ea5a (diff)
downloadslackbuilds-c9542caa88962982340a806ea02ceee8bb5fd11d.tar.gz
libraries/wxGTK: Fix build on -current.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--libraries/wxGTK/wxGTK-gcc.patch74
-rw-r--r--libraries/wxGTK/wxGTK.SlackBuild1
2 files changed, 75 insertions, 0 deletions
diff --git a/libraries/wxGTK/wxGTK-gcc.patch b/libraries/wxGTK/wxGTK-gcc.patch
new file mode 100644
index 0000000000..682b0b5873
--- /dev/null
+++ b/libraries/wxGTK/wxGTK-gcc.patch
@@ -0,0 +1,74 @@
+--- wxPython-src-2.8.12.1/src/gtk/bdiag.xbm 2007-07-04 21:25:08.000000000 +0200
++++ wxPython-src-2.8.12.1/src/gtk/bdiag.xbm 2016-08-31 23:37:12.299122408 +0200
+@@ -1,6 +1,6 @@
+ #define bdiag_width 16
+ #define bdiag_height 16
+ static char bdiag_bits[] = {
+- 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10, 0x08, 0x08, 0x04, 0x04,
+- 0x02, 0x02, 0x01, 0x01, 0x80, 0x80, 0x40, 0x40, 0x20, 0x20, 0x10, 0x10,
+- 0x08, 0x08, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01};
++ (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10, (char)0x08, (char)0x08, (char)0x04, (char)0x04,
++ (char)0x02, (char)0x02, (char)0x01, (char)0x01, (char)0x80, (char)0x80, (char)0x40, (char)0x40, (char)0x20, (char)0x20, (char)0x10, (char)0x10,
++ (char)0x08, (char)0x08, (char)0x04, (char)0x04, (char)0x02, (char)0x02, (char)0x01, (char)0x01};
+--- wxPython-src-2.8.12.1/src/gtk/fdiag.xbm 2007-07-04 21:25:08.000000000 +0200
++++ wxPython-src-2.8.12.1/src/gtk/fdiag.xbm 2016-08-31 23:40:46.011086115 +0200
+@@ -1,6 +1,6 @@
+ #define fdiag_width 16
+ #define fdiag_height 16
+ static char fdiag_bits[] = {
+- 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08, 0x10, 0x10, 0x20, 0x20,
+- 0x40, 0x40, 0x80, 0x80, 0x01, 0x01, 0x02, 0x02, 0x04, 0x04, 0x08, 0x08,
+- 0x10, 0x10, 0x20, 0x20, 0x40, 0x40, 0x80, 0x80};
++ (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08, (char)0x10, (char)0x10, (char)0x20, (char)0x20,
++ (char)0x40, (char)0x40, (char)0x80, (char)0x80, (char)0x01, (char)0x01, (char)0x02, (char)0x02, (char)0x04, (char)0x04, (char)0x08, (char)0x08,
++ (char)0x10, (char)0x10, (char)0x20, (char)0x20, (char)0x40, (char)0x40, (char)0x80, (char)0x80};
+--- wxPython-src-2.8.12.1/src/gtk/cdiag.xbm 2007-07-04 21:25:08.000000000 +0200
++++ wxPython-src-2.8.12.1/src/gtk/cdiag.xbm 2016-08-31 23:43:36.585258499 +0200
+@@ -1,6 +1,6 @@
+ #define cdiag_width 16
+ #define cdiag_height 16
+ static char cdiag_bits[] = {
+- 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18, 0x18, 0x18, 0x24, 0x24,
+- 0x42, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x42, 0x24, 0x24, 0x18, 0x18,
+- 0x18, 0x18, 0x24, 0x24, 0x42, 0x42, 0x81, 0x81};
++ (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18, (char)0x18, (char)0x18, (char)0x24, (char)0x24,
++ (char)0x42, (char)0x42, (char)0x81, (char)0x81, (char)0x81, (char)0x81, (char)0x42, (char)0x42, (char)0x24, (char)0x24, (char)0x18, (char)0x18,
++ (char)0x18, (char)0x18, (char)0x24, (char)0x24, (char)0x42, (char)0x42, (char)0x81, (char)0x81};
+--- wxPython-src-2.8.12.1/src/gtk/horiz.xbm 2007-07-04 21:25:08.000000000 +0200
++++ wxPython-src-2.8.12.1/src/gtk/horiz.xbm 2016-08-31 23:45:50.488608592 +0200
+@@ -1,6 +1,6 @@
+ #define horiz_width 15
+ #define horiz_height 15
+ static char horiz_bits[] = {
+- 0x00, 0x00, 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+- 0x00, 0x00, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+- 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00};
++ (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
++ (char)0x00, (char)0x00, (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00, (char)0x00,
++ (char)0xff, (char)0x7f, (char)0x00, (char)0x00, (char)0x00, (char)0x00};
+--- wxPython-src-2.8.12.1/src/gtk/verti.xbm 2016-08-31 23:46:37.464380555 +0200
++++ wxPython-src-2.8.12.1/src/gtk/verti.xbm 2016-08-31 23:48:07.672942608 +0200
+@@ -1,6 +1,6 @@
+ #define verti_width 15
+ #define verti_height 15
+ static char verti_bits[] = {
+- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+- 0x84, 0x10, 0x84, 0x10, 0x84, 0x10};
++ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10};
+--- wxPython-src-2.8.12.1/src/gtk/cross.xbm 2007-07-04 21:25:08.000000000 +0200
++++ wxPython-src-2.8.12.1/src/gtk/cross.xbm 2016-08-31 23:51:25.478982130 +0200
+@@ -1,6 +1,6 @@
+ #define cross_width 15
+ #define cross_height 15
+ static char cross_bits[] = {
+- 0x84, 0x10, 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+- 0x84, 0x10, 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10, 0x84, 0x10,
+- 0xff, 0x7f, 0x84, 0x10, 0x84, 0x10};
++ (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++ (char)0x84, (char)0x10, (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10, (char)0x84, (char)0x10,
++ (char)0xff, (char)0x7f, (char)0x84, (char)0x10, (char)0x84, (char)0x10};
+
+
diff --git a/libraries/wxGTK/wxGTK.SlackBuild b/libraries/wxGTK/wxGTK.SlackBuild
index 9074ba2470..504e7b5084 100644
--- a/libraries/wxGTK/wxGTK.SlackBuild
+++ b/libraries/wxGTK/wxGTK.SlackBuild
@@ -94,6 +94,7 @@ if [ "$UNICODE" = "YES" ]; then
elif [ "$UNICODE" = "NO" ]; then
_do_unicode="dis"
fi
+patch -p1 < $CWD/wxGTK-gcc.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \