summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorGeyslan G. Bem2017-03-29 16:30:41 -0300
committerGeyslan G. Bem2017-03-29 16:30:41 -0300
commit9ff6a6fe41277297bcb2201571100fb1360a1a9d (patch)
tree992aedcf0443fd31a15f39671f8e2b7aebeb08c9 /PKGBUILD
parent1d1b8fb69e01a20b69fa78e3b3861007a438409c (diff)
downloadaur-9ff6a6fe41277297bcb2201571100fb1360a1a9d.tar.gz
working again
Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD24
1 files changed, 16 insertions, 8 deletions
diff --git a/PKGBUILD b/PKGBUILD
index ab9a649a3c0d..264c703d3fcd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
+}