Date: Saturday, May 23, 2015 @ 14:06:47 Author: alucryd Revision: 134002
archrelease: copy trunk to multilib-x86_64 Added: lib32-wxgtk/repos/multilib-x86_64/PKGBUILD (from rev 134001, lib32-wxgtk/trunk/PKGBUILD) lib32-wxgtk/repos/multilib-x86_64/make-abicheck-non-fatal.patch (from rev 134001, lib32-wxgtk/trunk/make-abicheck-non-fatal.patch) lib32-wxgtk/repos/multilib-x86_64/wxGTK-collision.patch (from rev 134001, lib32-wxgtk/trunk/wxGTK-collision.patch) Deleted: lib32-wxgtk/repos/multilib-x86_64/PKGBUILD lib32-wxgtk/repos/multilib-x86_64/wxGTK-collision.patch -------------------------------+ PKGBUILD | 127 ++++++++++++++++++++-------------------- make-abicheck-non-fatal.patch | 16 +++++ wxGTK-collision.patch | 54 ++++++++--------- 3 files changed, 108 insertions(+), 89 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2015-05-23 12:06:35 UTC (rev 134001) +++ PKGBUILD 2015-05-23 12:06:47 UTC (rev 134002) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@archlinux.org> -# Contributor: Eric Bélanger <e...@archlinux.org> - -pkgname=lib32-wxgtk -pkgver=3.0.2 -pkgrel=4 -pkgdesc='GTK+ implementation of wxWidgets API for GUI' -arch=('x86_64') -url='http://wxwidgets.org' -license=('custom:wxWindows') -depends=('lib32-gtk2' 'lib32-libsm' "wxgtk=${pkgver}") -makedepends=('gcc-multilib' 'lib32-glu') -options=('!emptydirs') -source=("http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2" - 'wxGTK-collision.patch') -sha256sums=('346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d' - 'c73c51f4b65a779462a4e0923a7e3bc7fe28457258fc8bfb5d843d87df119364') - -prepare() { - cd wx*-${pkgver} - - patch -Np1 -i ../wxGTK-collision.patch -} - - -build() { - cd wxWidgets-${pkgver} - - 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" - - ./configure \ - --prefix='/usr' \ - --libdir='/usr/lib32' \ - --enable-graphics_ctx \ - --enable-unicode \ - --disable-{mediactrl,webview} \ - --disable-precomp-headers \ - --with-gtk='2' \ - --with-lib{jpeg,png,tiff,xpm}='sys' \ - --with-opengl \ - --with-regex='builtin' \ - --without-libnotify - make - make -C locale allmo -} - -package() { - cd wxWidgets-${pkgver} - - make DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{include,share} - - install -dm 755 "${pkgdir}"/usr/share/licenses - ln -s wxgtk "${pkgdir}"/usr/share/licenses/lib32-wxgtk -} - -# vim: ts=2 sw=2 et: Copied: lib32-wxgtk/repos/multilib-x86_64/PKGBUILD (from rev 134001, lib32-wxgtk/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2015-05-23 12:06:47 UTC (rev 134002) @@ -0,0 +1,65 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@archlinux.org> +# Contributor: Eric Bélanger <e...@archlinux.org> + +pkgname=lib32-wxgtk +pkgver=3.0.2 +pkgrel=5 +pkgdesc='GTK+ implementation of wxWidgets API for GUI' +arch=('x86_64') +url='http://wxwidgets.org' +license=('custom:wxWindows') +depends=('lib32-gtk2' 'lib32-libsm' "wxgtk=${pkgver}") +makedepends=('gcc-multilib' 'lib32-glu') +options=('!emptydirs') +source=("http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2" + 'make-abicheck-non-fatal.patch' + 'wxGTK-collision.patch') +sha256sums=('346879dc554f3ab8d6da2704f651ecb504a22e9d31c17ef5449b129ed711585d' + 'd4c2d070a06eb63f0a018c8cf687589e5ffdec601225b4d16a268ffe390fb58b' + 'c73c51f4b65a779462a4e0923a7e3bc7fe28457258fc8bfb5d843d87df119364') + +prepare() { + cd wx*-${pkgver} + + patch -Np1 -i ../make-abicheck-non-fatal.patch + patch -Np1 -i ../wxGTK-collision.patch +} + + +build() { + cd wxWidgets-${pkgver} + + 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" + + ./configure \ + --prefix='/usr' \ + --libdir='/usr/lib32' \ + --enable-graphics_ctx \ + --enable-unicode \ + --disable-{mediactrl,webview} \ + --disable-precomp-headers \ + --with-gtk='2' \ + --with-lib{jpeg,png,tiff,xpm}='sys' \ + --with-opengl \ + --with-regex='builtin' \ + --without-libnotify + make + make -C locale allmo +} + +package() { + cd wxWidgets-${pkgver} + + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/{include,share} + + install -dm 755 "${pkgdir}"/usr/share/licenses + ln -s wxgtk "${pkgdir}"/usr/share/licenses/lib32-wxgtk +} + +# vim: ts=2 sw=2 et: Copied: lib32-wxgtk/repos/multilib-x86_64/make-abicheck-non-fatal.patch (from rev 134001, lib32-wxgtk/trunk/make-abicheck-non-fatal.patch) =================================================================== --- make-abicheck-non-fatal.patch (rev 0) +++ make-abicheck-non-fatal.patch 2015-05-23 12:06:47 UTC (rev 134002) @@ -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 + + Deleted: wxGTK-collision.patch =================================================================== --- wxGTK-collision.patch 2015-05-23 12:06:35 UTC (rev 134001) +++ wxGTK-collision.patch 2015-05-23 12:06:47 UTC (rev 134002) @@ -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) Copied: lib32-wxgtk/repos/multilib-x86_64/wxGTK-collision.patch (from rev 134001, lib32-wxgtk/trunk/wxGTK-collision.patch) =================================================================== --- wxGTK-collision.patch (rev 0) +++ wxGTK-collision.patch 2015-05-23 12:06:47 UTC (rev 134002) @@ -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)