diff options
author | Geyslan G. Bem | 2017-03-29 16:30:41 -0300 |
---|---|---|
committer | Geyslan G. Bem | 2017-03-29 16:30:41 -0300 |
commit | 9ff6a6fe41277297bcb2201571100fb1360a1a9d (patch) | |
tree | 992aedcf0443fd31a15f39671f8e2b7aebeb08c9 | |
parent | 1d1b8fb69e01a20b69fa78e3b3861007a438409c (diff) | |
download | aur-9ff6a6fe41277297bcb2201571100fb1360a1a9d.tar.gz |
working again
Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | PKGBUILD | 24 | ||||
-rw-r--r-- | wxGTK-2.8.12.1-r2-gcc6.patch | 73 |
4 files changed, 98 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = wxwidgets2.8-light pkgdesc = wxWidgets suite for Base and GTK2 toolkits (GNOME/GStreamer free!) pkgver = 2.8.12.1 - pkgrel = 9 + pkgrel = 10 url = http://wxwidgets.org arch = i686 arch = x86_64 @@ -14,22 +14,27 @@ pkgbase = wxwidgets2.8-light makedepends = sdl makedepends = expat makedepends = zlib + makedepends = gcc-libs-multilib + makedepends = libjpeg-turbo source = wxwidgets::git+https://github.com/wxWidgets/wxPython.git#tag=wxPy-2.8.12.1 source = wxwidgets-2.8-collision.patch source = config-2.8.conf source = wx-config-2.8.sh source = make-abicheck-non-fatal.patch + source = wxGTK-2.8.12.1-r2-gcc6.patch sha1sums = SKIP sha1sums = 75d2292a0058570aa6071b4bee6eef69e47f1208 sha1sums = 1539fb4299a05d32dc739b478986cf3b3017d1b9 sha1sums = 4156d992b8fbbdc8e596a7c4e548e90295d3cf95 sha1sums = dfe38650c655395b90bf082b5734c4093508bfa3 + sha1sums = f1a3bc30ec8139d97ca239dc1bf6cbc2ceb5c5d9 pkgname = wxbase2.8-light pkgdesc = wxWidgets 2.8 Base (GNOME/GStreamer free!) depends = wxcommon2.8-light depends = expat depends = zlib + depends = gcc-libs-multilib provides = wxbase2.8=2.8.12.1 conflicts = wxbase2.8 options = !emptydirs @@ -40,6 +45,8 @@ pkgname = wxgtk2.8-light depends = gtk2 depends = libsm depends = sdl + depends = gcc-libs-multilib + depends = libjpeg-turbo provides = wxgtk2.8=2.8.12.1 conflicts = wxgtk2.8 options = !emptydirs diff --git a/.gitignore b/.gitignore index 98f24344476d..645456b1b8d3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ !wx-config-2.8.sh !make-abicheck-non-fatal.patch !wxwidgets-2.8-collision.patch +!wxGTK-2.8.12.1-r2-gcc6.patch @@ -1,24 +1,28 @@ -# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com> +# Maintainer: Geyslan G. Bem <geyslan@gmail.com> +# Contributor: Gustavo Alvarez <sl1pkn07@gmail.com> pkgbase="wxwidgets2.8-light" pkgname=('wxbase2.8-light' 'wxgtk2.8-light' 'wxcommon2.8-light') pkgver=2.8.12.1 -pkgrel=9 +pkgrel=10 pkgdesc="wxWidgets suite for Base and GTK2 toolkits (GNOME/GStreamer free!)" arch=('i686' 'x86_64') url="http://wxwidgets.org" license=('custom:wxWindows') -makedepends=('git' 'bash' 'glu' 'gtk2' 'libsm' 'sdl' 'expat' 'zlib') +makedepends=('git' 'bash' 'glu' 'gtk2' 'libsm' 'sdl' 'expat' 'zlib' 'gcc-libs-multilib' 'libjpeg-turbo') + source=("wxwidgets::git+https://github.com/wxWidgets/wxPython.git#tag=wxPy-${pkgver}" 'wxwidgets-2.8-collision.patch' 'config-2.8.conf' 'wx-config-2.8.sh' - 'make-abicheck-non-fatal.patch') + 'make-abicheck-non-fatal.patch' + 'wxGTK-2.8.12.1-r2-gcc6.patch') sha1sums=('SKIP' '75d2292a0058570aa6071b4bee6eef69e47f1208' '1539fb4299a05d32dc739b478986cf3b3017d1b9' '4156d992b8fbbdc8e596a7c4e548e90295d3cf95' - 'dfe38650c655395b90bf082b5734c4093508bfa3') + 'dfe38650c655395b90bf082b5734c4093508bfa3' + 'f1a3bc30ec8139d97ca239dc1bf6cbc2ceb5c5d9') prepare() { patch -d wxwidgets -p1 -i ../wxwidgets-2.8-collision.patch @@ -27,6 +31,10 @@ prepare() { # https://bugzilla.redhat.com/show_bug.cgi?id=1200611 patch -d wxwidgets -Np1 -i ../make-abicheck-non-fatal.patch + # fix gcc6 narrowing error + # https://bugs.gentoo.org/show_bug.cgi?id=592442 + patch -d wxwidgets -p1 -i ../wxGTK-2.8.12.1-r2-gcc6.patch + mkdir -p build-{base,gtk} } @@ -58,7 +66,7 @@ build() { package_wxbase2.8-light() { pkgdesc="wxWidgets 2.8 Base (GNOME/GStreamer free!)" - depends=('wxcommon2.8-light' 'expat' 'zlib') + depends=('wxcommon2.8-light' 'expat' 'zlib' 'gcc-libs-multilib') provides=("wxbase2.8=${pkgver}") conflicts=('wxbase2.8') options=('!emptydirs') @@ -74,7 +82,7 @@ package_wxbase2.8-light() { package_wxgtk2.8-light() { pkgdesc="wxWidgets 2.8 with GTK2 Toolkit (GNOME/GStreamer free!)" - depends=('wxbase2.8-light' 'gtk2' 'libsm' 'sdl') + depends=('wxbase2.8-light' 'gtk2' 'libsm' 'sdl' 'gcc-libs-multilib' 'libjpeg-turbo') provides=("wxgtk2.8=${pkgver}") conflicts=('wxgtk2.8') options=('!emptydirs') @@ -111,4 +119,4 @@ package_wxcommon2.8-light() { install -Dm644 config-2.8.conf "${pkgdir}/etc/wx/config-2.8" install -Dm755 wx-config-2.8.sh "${pkgdir}/usr/bin/wx-config-2.8" -}
\ No newline at end of file +} diff --git a/wxGTK-2.8.12.1-r2-gcc6.patch b/wxGTK-2.8.12.1-r2-gcc6.patch new file mode 100644 index 000000000000..b5d7531d62c4 --- /dev/null +++ b/wxGTK-2.8.12.1-r2-gcc6.patch @@ -0,0 +1,73 @@ +--- 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}; + |