diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | PKGBUILD | 75 | ||||
| -rw-r--r-- | lib32-wxwidgets-collision.patch | 27 |
4 files changed, 46 insertions, 70 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Sat Aug 5 14:56:30 UTC 2017 pkgbase = lib32-wxwidgets-light pkgdesc = wxWidgets suite for Base and GTK2 and GTK3 toolkits (GNOME/GStreamer free!) (32 bits) - pkgver = 3.0.3 - pkgrel = 3 + pkgver = 3.0.5 + pkgrel = 1 url = http://wxwidgets.org arch = x86_64 license = custom:wxWindows @@ -16,12 +14,11 @@ pkgbase = lib32-wxwidgets-light makedepends = lib32-sdl makedepends = lib32-expat makedepends = lib32-zlib - source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.0.3 + makedepends = lib32-libnotify + source = wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v3.0.5 source = lib32-make-abicheck-non-fatal.patch - source = lib32-wxwidgets-collision.patch sha256sums = SKIP sha256sums = d4c2d070a06eb63f0a018c8cf687589e5ffdec601225b4d16a268ffe390fb58b - sha256sums = c73c51f4b65a779462a4e0923a7e3bc7fe28457258fc8bfb5d843d87df119364 pkgname = lib32-wxbase-light pkgdesc = wxWidgets Base (GNOME/GStreamer free!) (32 bits) @@ -41,6 +38,7 @@ pkgname = lib32-wxgtk2-light depends = lib32-gtk2 depends = lib32-libsm depends = lib32-sdl2 + depends = lib32-libnotify provides = lib32-wxgtk provides = lib32-wxgtk2 conflicts = lib32-wxgtk @@ -54,6 +52,7 @@ pkgname = lib32-wxgtk3-light depends = lib32-gtk3 depends = lib32-libsm depends = lib32-sdl2 + depends = lib32-libnotify provides = lib32-wxgtk3 conflicts = lib32-wxgtk3 options = !emptydirs diff --git a/.gitignore b/.gitignore index 4034b61bd001..6e20c34e4cac 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ !config32.conf !wx-config32.sh !lib32-make-abicheck-non-fatal.patch -!lib32-wxwidgets-collision.patch @@ -6,8 +6,8 @@ pkgname=('lib32-wxbase-light' 'lib32-wxgtk3-light' 'lib32-wxcommon-light' ) -pkgver=3.0.3 -pkgrel=3 +pkgver=3.0.5 +pkgrel=1 pkgdesc="wxWidgets suite for Base and GTK2 and GTK3 toolkits (GNOME/GStreamer free!) (32 bits)" arch=('x86_64') url='http://wxwidgets.org' @@ -21,26 +21,21 @@ makedepends=('lib32-gcc-libs' 'lib32-sdl' 'lib32-expat' 'lib32-zlib' + 'lib32-libnotify' ) source=("wxwidgets::git+https://github.com/wxWidgets/wxWidgets.git#tag=v${pkgver}" 'lib32-make-abicheck-non-fatal.patch' - 'lib32-wxwidgets-collision.patch' ) sha256sums=('SKIP' 'd4c2d070a06eb63f0a018c8cf687589e5ffdec601225b4d16a268ffe390fb58b' - 'c73c51f4b65a779462a4e0923a7e3bc7fe28457258fc8bfb5d843d87df119364' ) prepare() { mkdir -p build-{base,gtk{2,3}} - cd wxwidgets - - patch -p1 -i "${srcdir}/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 -p1 -i "${srcdir}/lib32-make-abicheck-non-fatal.patch" + patch -d wxwidgets -p1 -i "${srcdir}/lib32-make-abicheck-non-fatal.patch" } build() { @@ -48,9 +43,8 @@ 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" + msg2 "Configure WxBASE" cd "${srcdir}/build-base" ../wxwidgets/configure \ --prefix=/usr \ @@ -59,9 +53,7 @@ build() { --enable-unicode \ --disable-{precomp-headers,gui} - make - make -C ../wxwidgets/locale allmo - + msg2 "Configure WxGTK2" cd "${srcdir}/build-gtk2" ../wxwidgets/configure \ --prefix=/usr \ @@ -70,13 +62,12 @@ build() { --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} + --enable-graphics_ctx \ + --without-gnomevfs \ + --disable-{precomp-headers,mediactrl,webview} \ - make - make -C ../wxwidgets/locale allmo + msg2 "Configure WxGTK3" cd "${srcdir}/build-gtk3" ../wxwidgets/configure \ --prefix=/usr \ @@ -85,12 +76,23 @@ build() { --with-lib{jpeg,png,tiff,xpm}=sys \ --with-regex=builtin \ --with-{opengl,sdl} \ - --enable-{unicode,graphics_ctx} \ - --without-{libnotify,gnome{vfs,print}} \ + --enable-graphics_ctx \ + --without-gnomevfs \ --disable-{precomp-headers,mediactrl,webview} - make - make -C ../wxwidgets/locale allmo + cd "${srcdir}" + + msg2 "Build WxBASE" + make -C build-base + make -C wxwidgets/locale allmo + + msg2 "Build WxGTK2" + make -C build-gtk2 + make -C wxwidgets/locale allmo + + msg2 "Build WxGTK3" + make -C build-gtk3 + make -C wxwidgets/locale allmo } package_lib32-wxbase-light() { @@ -107,9 +109,7 @@ package_lib32-wxbase-light() { make -C build-base DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}/usr/bin/wx-config32" - mv "${pkgdir}/usr/bin/wx-config32-3.0" "${pkgdir}/usr/bin/wx-config32-3.0-base" - (cd "${pkgdir}/usr/bin"; ln -s wx-config32-3.0-base wx-config32-base) + mv "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config32-base" rm -fr "${pkgdir}/usr/include" rm -fr "${pkgdir}/usr/share" @@ -123,6 +123,7 @@ package_lib32-wxgtk2-light() { 'lib32-gtk2' 'lib32-libsm' 'lib32-sdl2' + 'lib32-libnotify' ) provides=('lib32-wxgtk' 'lib32-wxgtk2' @@ -134,9 +135,10 @@ package_lib32-wxgtk2-light() { make -C build-gtk2 DESTDIR="${pkgdir}" install - cp -P "${pkgdir}/usr/bin/wx-config32" "${pkgdir}/usr/bin/wx-config32-gtk2" - cp -P "${pkgdir}/usr/bin/wx-config32-3.0" "${pkgdir}/usr/bin/wx-config32-3.0-gtk2" - rm -fr "${pkgdir}/usr/bin/"wxrc32{,-3.0} + cp -P "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config32" + mv "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config32-gtk2" + + rm -fr "${pkgdir}/usr/bin/"wxrc{,-3.0} rm -fr "${pkgdir}/usr/include" rm -fr "${pkgdir}/usr/lib32/"*baseu* rm -fr "${pkgdir}/usr/share" @@ -151,6 +153,7 @@ package_lib32-wxgtk3-light() { 'lib32-gtk3' 'lib32-libsm' 'lib32-sdl2' + 'lib32-libnotify' ) provides=('lib32-wxgtk3') conflicts=('lib32-wxgtk3') @@ -158,10 +161,9 @@ package_lib32-wxgtk3-light() { make -C build-gtk3 DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}/usr/bin/wx-config32" - mv "${pkgdir}/usr/bin/wx-config32-3.0" "${pkgdir}/usr/bin/wx-config32-3.0-gtk3" - (cd "${pkgdir}/usr/bin"; ln -s wx-config32-3.0-gtk3 wx-config32-gtk3) - rm -fr "${pkgdir}/usr/bin/"wxrc32{,-3.0} + mv "${pkgdir}/usr/bin/wx-config" "${pkgdir}/usr/bin/wx-config32-gtk3" + + rm -fr "${pkgdir}/usr/bin/"wxrc{,-3.0} rm -fr "${pkgdir}/usr/include" rm -fr "${pkgdir}/usr/lib32/"*baseu* rm -fr "${pkgdir}/usr/share" @@ -185,10 +187,13 @@ package_lib32-wxcommon-light() { make -C build-gtk2 DESTDIR="${pkgdir}" install rm -fr "${pkgdir}/usr/bin" make -C build-gtk3 DESTDIR="${pkgdir}" install - rm -fr "${pkgdir}/usr/bin/"wx-config32{,-3.0} + rm -fr "${pkgdir}/usr/bin/wx-config" make -C build-base DESTDIR="${pkgdir}" install + rm -fr "${pkgdir}/usr/bin/wx-config" + + mv "${pkgdir}/usr/bin/wxrc" "${pkgdir}/usr/bin/wxrc32" + mv "${pkgdir}/usr/bin/wxrc-3.0" "${pkgdir}/usr/bin/wxrc32-3.0" - rm -fr "${pkgdir}/usr/bin/"wx-config32{,-3.0} rm -fr "${pkgdir}/usr/include" rm -fr "${pkgdir}/usr/lib32" rm -fr "${pkgdir}/usr/share" diff --git a/lib32-wxwidgets-collision.patch b/lib32-wxwidgets-collision.patch deleted file mode 100644 index cdbb436d907f..000000000000 --- a/lib32-wxwidgets-collision.patch +++ /dev/null @@ -1,27 +0,0 @@ -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) |