summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsl1pkn072015-06-08 17:17:38 +0200
committersl1pkn072015-06-08 17:17:38 +0200
commit554721d3a2e326090ff2312ed431f408d8a8beab (patch)
treec7ae1419ffd9cb2d9420dff98a42a626205ef531
downloadaur-554721d3a2e326090ff2312ed431f408d8a8beab.tar.gz
Initial commit
-rw-r--r--.SRCINFO55
-rw-r--r--.gitignore8
-rw-r--r--PKGBUILD124
-rw-r--r--config32.conf4
-rw-r--r--lib32-make-abicheck-non-fatal.patch16
-rw-r--r--lib32-wxwidgets-collision.patch27
-rw-r--r--wx-config32.sh5
7 files changed, 239 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..2ad09aa69f1f
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,55 @@
+pkgbase = lib32-wxwidgets-light
+ pkgdesc = wxWidgets suite for Base and GTK2 toolkits (GNOME/GStreamer free!) (32 bits)
+ pkgver = 3.0.2
+ pkgrel = 3
+ url = http://wxwidgets.org
+ arch = x86_64
+ license = custom:wxWindows
+ makedepends = lib32-gcc-libs
+ makedepends = git
+ makedepends = lib32-glu
+ makedepends = lib32-gtk2
+ makedepends = lib32-libsm
+ makedepends = lib32-sdl
+ makedepends = lib32-expat
+ makedepends = lib32-zlib
+ source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.0.2
+ source = lib32-make-abicheck-non-fatal.patch
+ source = lib32-wxwidgets-collision.patch
+ source = config32.conf
+ source = wx-config32.sh
+ sha1sums = SKIP
+ sha1sums = ef7d3727381adf62b9f3a9b28120cb7646163666
+ sha1sums = ef6bf800b1505bb617eeeb0516ab43a6226920a4
+ sha1sums = 55436b5c57eae798f716e3e486c6834d6274cec5
+ sha1sums = 218ec754f1f93affc8f51396304abf5d11b898f2
+
+pkgname = lib32-wxbase-light
+ pkgdesc = wxWidgets Base (GNOME/GStreamer free!) (32 bits)
+ depends = lib32-gcc-libs
+ depends = lib32-wxcommon-light
+ depends = lib32-expat
+ depends = lib32-zlib
+ provides = lib32-wxbase=3.0.2
+ conflicts = lib32-wxbase
+ options = !emptydirs
+
+pkgname = lib32-wxgtk-light
+ pkgdesc = wxWidgets GTK2 Toolkit (GNOME/GStreamer free!) (32 bits)
+ depends = lib32-wxbase-light
+ depends = lib32-gtk2
+ depends = lib32-libsm
+ depends = lib32-sdl
+ provides = lib32-wxgtk=3.0.2
+ conflicts = lib32-wxgtk
+ options = !emptydirs
+
+pkgname = lib32-wxcommon-light
+ pkgdesc = wxWidgets common (GNOME/GStreamer free!) (32 bits)
+ arch = any
+ depends = wxcommon-light
+ provides = lib32-wxcommon=3.0.2
+ conflicts = lib32-wxcommon
+ options = !emptydirs
+ backup = etc/wx/config32
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..4034b61bd001
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
+!config32.conf
+!wx-config32.sh
+!lib32-make-abicheck-non-fatal.patch
+!lib32-wxwidgets-collision.patch
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..ba7bbf9cb69e
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,124 @@
+# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
+
+pkgbase="lib32-wxwidgets-light"
+pkgname=('lib32-wxbase-light' 'lib32-wxgtk-light' 'lib32-wxcommon-light')
+pkgver=3.0.2
+pkgrel=3
+pkgdesc="wxWidgets suite for Base and GTK2 toolkits (GNOME/GStreamer free!) (32 bits)"
+arch=('x86_64')
+url="http://wxwidgets.org"
+license=('custom:wxWindows')
+makedepends=('lib32-gcc-libs' 'git' 'lib32-glu' 'lib32-gtk2' 'lib32-libsm' 'lib32-sdl' 'lib32-expat' 'lib32-zlib')
+source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}"
+ 'lib32-make-abicheck-non-fatal.patch'
+ 'lib32-wxwidgets-collision.patch'
+ 'config32.conf'
+ 'wx-config32.sh')
+sha1sums=('SKIP'
+ 'ef7d3727381adf62b9f3a9b28120cb7646163666'
+ 'ef6bf800b1505bb617eeeb0516ab43a6226920a4'
+ '55436b5c57eae798f716e3e486c6834d6274cec5'
+ '218ec754f1f93affc8f51396304abf5d11b898f2')
+
+prepare() {
+ patch -d wxwidgets -Np1 -i ../lib32-wxwidgets-collision.patch
+
+ # C++ ABI check is too strict and breaks with GCC 5.1
+ # https://bugzilla.redhat.com/show_bug.cgi?id=1200611
+ patch -d wxwidgets -Np1 -i ../lib32-make-abicheck-non-fatal.patch
+
+ mkdir -p build-{base,gtk}
+}
+
+build() {
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ export CFLAGS="-I/usr/include/libtiff32 $CFLAGS"
+ export CXXFLAGS="-I/usr/include/libtiff32 $CXXFLAGS"
+
+ cd "${srcdir}/build-base"
+ ../wxwidgets/configure \
+ --prefix=/usr \
+ --libdir=/usr/lib32 \
+ --with-regex='builtin' \
+ --enable-unicode \
+ --disable-{precomp-headers,gui}
+ make
+ make -C ../wxwidgets/locale allmo
+
+ cd "${srcdir}/build-gtk"
+ ../wxwidgets/configure \
+ --prefix=/usr \
+ --libdir=/usr/lib32 \
+ --with-gtk='2' \
+ --with-lib{jpeg,png,tiff,xpm}='sys' \
+ --with-regex='builtin' \
+ --with-{opengl,sdl} \
+ --enable-{unicode,graphics_ctx} \
+ --without-{libnotify,gnome{vfs,print}} \
+ --disable-{precomp-headers,mediactrl,webview}
+ make
+ make -C ../wxwidgets/locale allmo
+}
+
+package_lib32-wxbase-light() {
+ pkgdesc="wxWidgets Base (GNOME/GStreamer free!) (32 bits)"
+ depends=('lib32-gcc-libs' 'lib32-wxcommon-light' 'lib32-expat' 'lib32-zlib')
+ provides=("lib32-wxbase=${pkgver}")
+ conflicts=('lib32-wxbase')
+ options=('!emptydirs')
+
+ make -C build-base DESTDIR="${pkgdir}" install
+
+ rm -fr "${pkgdir}/usr/bin/"wx-config32*
+ rm -fr "${pkgdir}/usr/include"
+ rm -fr "${pkgdir}/usr/share/"
+
+ install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/lib32-wxbase-light/LICENSE"
+}
+
+package_lib32-wxgtk-light() {
+ pkgdesc="wxWidgets GTK2 Toolkit (GNOME/GStreamer free!) (32 bits)"
+ depends=('lib32-wxbase-light' 'lib32-gtk2' 'lib32-libsm' 'lib32-sdl')
+ provides=("lib32-wxgtk=${pkgver}")
+ conflicts=('lib32-wxgtk')
+ options=('!emptydirs')
+
+ make -C build-gtk DESTDIR="${pkgdir}" install
+
+ rm -fr "${pkgdir}/usr/bin/"wx-config32*
+ rm -fr "${pkgdir}/usr/include"
+ rm -fr "${pkgdir}/usr/lib32/"*baseu*
+ rm -fr "${pkgdir}/usr/share"
+
+ install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/lib32-wxgtk-light/LICENSE"
+}
+
+package_lib32-wxcommon-light() {
+ pkgdesc="wxWidgets common (GNOME/GStreamer free!) (32 bits)"
+ arch=('any')
+ depends=('wxcommon-light')
+ provides=("lib32-wxcommon=${pkgver}")
+ conflicts=('lib32-wxcommon')
+ options=('!emptydirs')
+ backup=('etc/wx/config32')
+
+ make -C build-gtk DESTDIR="${pkgdir}" install
+
+ rm -fr "${pkgdir}/usr/bin"
+
+ make -C build-base DESTDIR="${pkgdir}" install
+
+ rm -fr "${pkgdir}/usr/bin"
+ rm -fr "${pkgdir}/usr/include"
+ rm -fr "${pkgdir}/usr/lib32"
+ rm -fr "${pkgdir}/usr/share"
+
+ install -Dm644 wxwidgets/docs/licence.txt "${pkgdir}/usr/share/licenses/lib32-wxcommon-light/LICENSE"
+
+ install -Dm644 config32.conf "${pkgdir}/etc/wx/config32"
+ install -Dm755 wx-config32.sh "${pkgdir}/usr/bin/wx-config32"
+ ln -s wx-config32 "${pkgdir}/usr/bin/wx-config32-3.0"
+} \ No newline at end of file
diff --git a/config32.conf b/config32.conf
new file mode 100644
index 000000000000..57db6a5f6a32
--- /dev/null
+++ b/config32.conf
@@ -0,0 +1,4 @@
+# Set wx-config executable
+
+#wx=base-unicode-3.0
+wx=gtk2-unicode-3.0
diff --git a/lib32-make-abicheck-non-fatal.patch b/lib32-make-abicheck-non-fatal.patch
new file mode 100644
index 000000000000..90085f02c8ad
--- /dev/null
+++ b/lib32-make-abicheck-non-fatal.patch
@@ -0,0 +1,16 @@
+diff -up wxGTK-2.8.12/src/common/appbase.cpp.abicheck wxGTK-2.8.12/src/common/appbase.cpp
+--- wxGTK-2.8.12/src/common/appbase.cpp.abicheck 2015-03-12 17:15:18.000000000 +0100
++++ wxGTK-2.8.12/src/common/appbase.cpp 2015-03-12 17:15:57.000000000 +0100
+@@ -424,10 +424,7 @@ bool wxAppConsole::CheckBuildOptions(con
+ msg.Printf(_T("Mismatch between the program and library build versions detected.\nThe library used %s,\nand %s used %s."),
+ lib.c_str(), progName.c_str(), prog.c_str());
+
+- wxLogFatalError(msg.c_str());
+-
+- // normally wxLogFatalError doesn't return
+- return false;
++ wxLogWarning(msg.c_str());
+ }
+ #undef wxCMP
+
+
diff --git a/lib32-wxwidgets-collision.patch b/lib32-wxwidgets-collision.patch
new file mode 100644
index 000000000000..cdbb436d907f
--- /dev/null
+++ b/lib32-wxwidgets-collision.patch
@@ -0,0 +1,27 @@
+diff -rupN wxWidgets-3.0.1.orig/Makefile.in wxWidgets-3.0.1/Makefile.in
+--- wxWidgets-3.0.1.orig/Makefile.in 2014-07-30 00:40:09.604520200 +0200
++++ wxWidgets-3.0.1/Makefile.in 2014-07-30 00:43:08.131765800 +0200
+@@ -16140,7 +16140,8 @@ install-wxconfig:
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config32-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config32-$(WX_RELEASE))
++ (cd $(DESTDIR)$(bindir) && $(LN_S) wx-config32-$(WX_RELEASE) wx-config32$(EXEEXT))
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+diff -rupN wxWidgets-3.0.1.orig/utils/wxrc/Makefile.in wxWidgets-3.0.1/utils/wxrc/Makefile.in
+--- wxWidgets-3.0.1.orig/utils/wxrc/Makefile.in 2014-07-30 00:40:10.712676300 +0200
++++ wxWidgets-3.0.1/utils/wxrc/Makefile.in 2014-07-30 00:47:04.729183400 +0200
+@@ -124,8 +124,8 @@ distclean: clean
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+-@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
++@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc32-$(WX_RELEASE)
++@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc32-$(WX_RELEASE) wxrc32$(EXEEXT))
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/wx-config32.sh b/wx-config32.sh
new file mode 100644
index 000000000000..aed09a7bd85b
--- /dev/null
+++ b/wx-config32.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+source /etc/wx/config32
+
+. /usr/lib32/wx/config/$wx $@