Date: Friday, August 15, 2014 @ 02:54:06 Author: alucryd Revision: 117412
archrelease: copy trunk to multilib-x86_64 Added: lib32-wxgtk2.8/repos/multilib-x86_64/PKGBUILD (from rev 117411, lib32-wxgtk2.8/trunk/PKGBUILD) lib32-wxgtk2.8/repos/multilib-x86_64/wxGTK-collision.patch (from rev 117411, lib32-wxgtk2.8/trunk/wxGTK-collision.patch) Deleted: lib32-wxgtk2.8/repos/multilib-x86_64/PKGBUILD lib32-wxgtk2.8/repos/multilib-x86_64/wxGTK-collision.patch -----------------------+ PKGBUILD | 105 ++++++++++++++++++++++++------------------------ wxGTK-collision.patch | 50 +++++++++++----------- 2 files changed, 79 insertions(+), 76 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-08-15 00:54:00 UTC (rev 117411) +++ PKGBUILD 2014-08-15 00:54:06 UTC (rev 117412) @@ -1,51 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin <aluc...@gmail.com> -# Contributor: Eric Belanger <e...@archlinux.org> - -pkgname=lib32-wxgtk2.8 -pkgver=2.8.12.1 -pkgrel=2 -pkgdesc='GTK+ implementation of wxWidgets API for GUI' -arch=('x86_64') -url="http://wxwidgets.org/" -license=('custom:wxWindows') -makedepends=('lib32-glu' 'lib32-gstreamer0.10-base-plugins' 'lib32-gtk2' 'lib32-sdl') -replaces=('lib32-wxgtk') -source=("http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2" - 'wxGTK-collision.patch') -sha256sums=('1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0' - '582eaed73d94eba2cfe7390c59b5143daef7d1c61554c4543261fe444d46e7d8') - -prepare() { - cd wx*-${pkgver} - - patch -Np1 -i ../wxGTK-collision.patch -} - -build() { - cd wx*-${pkgver} - - export CC='gcc -m32' - export CXX='g++ -m32' - export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' - - ./configure --prefix='/usr' --libdir='/usr/lib32' --with-{gtk='2',{libjpeg,libpng,libtifflibxpm}='sys',opengl,regex='builtin',sdl} --enable-{graphics_ctx,unicode} --disable-{mediactrl,optimize,precomp-headers} - make - make -C locale allmo - make -C contrib/src -} - -package() { - depends=('lib32-gstreamer0.10-base' 'lib32-gtk2' 'lib32-sdl' "${pkgname#*-}") - - cd wx*-${pkgver} - - make DESTDIR="${pkgdir}" install - make -C contrib/src DESTDIR="${pkgdir}" install - rm -rf "${pkgdir}"/usr/{include,share} - - install -dm 755 "${pkgdir}"/usr/share/licenses - ln -s ${pkgname#*-} "${pkgdir}"/usr/share/licenses/${pkgname} -} - -# vim: ts=2 sw=2 et: Copied: lib32-wxgtk2.8/repos/multilib-x86_64/PKGBUILD (from rev 117411, lib32-wxgtk2.8/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-08-15 00:54:06 UTC (rev 117412) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Maxime Gauduin <aluc...@gmail.com> +# Contributor: Eric Belanger <e...@archlinux.org> + +pkgname=lib32-wxgtk2.8 +pkgver=2.8.12.1 +pkgrel=3 +pkgdesc='GTK+ implementation of wxWidgets API for GUI' +arch=('x86_64') +url="http://wxwidgets.org/" +license=('custom:wxWindows') +depends=('lib32-gstreamer0.10-base' 'lib32-gtk2' 'lib32-sdl' "${pkgname#*-}") +makedepends=('lib32-gstreamer0.10-base-plugins' 'lib32-glu') +source=("http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2" + 'wxGTK-collision.patch') +sha256sums=('1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0' + '582eaed73d94eba2cfe7390c59b5143daef7d1c61554c4543261fe444d46e7d8') + +prepare() { + cd wx*-${pkgver} + + patch -Np1 -i ../wxGTK-collision.patch +} + +build() { + cd wx*-${pkgver} + + export CC='gcc -m32' + export CXX='g++ -m32' + export PKG_CONFIG_PATH='/usr/lib32/pkgconfig' + + ./configure --prefix='/usr' --libdir='/usr/lib32' \ + --enable-{graphics_ctx,mediactrl,unicode} \ + --disable-{optimize,precomp-headers} \ + --with-lib{jpeg,png,tiff,xpm}='sys' --with-regex='builtin' \ + --with-gtk='2' --with-{opengl,sdl} + make + make -C locale allmo + make -C contrib/src +} + +package() { + + cd wx*-${pkgver} + + make DESTDIR="${pkgdir}" install + make -C contrib/src DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/{include,share} + + install -dm 755 "${pkgdir}"/usr/share/licenses + ln -s ${pkgname#*-} "${pkgdir}"/usr/share/licenses/${pkgname} +} + +# vim: ts=2 sw=2 et: Deleted: wxGTK-collision.patch =================================================================== --- wxGTK-collision.patch 2014-08-15 00:54:00 UTC (rev 117411) +++ wxGTK-collision.patch 2014-08-15 00:54:06 UTC (rev 117412) @@ -1,25 +0,0 @@ -diff -rupN wxPython-src-2.8.12.1.orig/Makefile.in wxPython-src-2.8.12.1/Makefile.in ---- wxPython-src-2.8.12.1.orig/Makefile.in 2014-01-06 09:52:42.577935546 +0100 -+++ wxPython-src-2.8.12.1/Makefile.in 2014-01-06 10:02:53.671582953 +0100 -@@ -12455,7 +12456,7 @@ 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) -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config32-$(WX_RELEASE)) - - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale -diff -rupN wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in wxPython-src-2.8.12.1/utils/wxrc/Makefile.in ---- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in 2014-01-06 09:52:42.437940198 +0100 -+++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in 2014-01-06 10:04:54.567685196 +0100 -@@ -119,8 +119,7 @@ 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@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) Copied: lib32-wxgtk2.8/repos/multilib-x86_64/wxGTK-collision.patch (from rev 117411, lib32-wxgtk2.8/trunk/wxGTK-collision.patch) =================================================================== --- wxGTK-collision.patch (rev 0) +++ wxGTK-collision.patch 2014-08-15 00:54:06 UTC (rev 117412) @@ -0,0 +1,25 @@ +diff -rupN wxPython-src-2.8.12.1.orig/Makefile.in wxPython-src-2.8.12.1/Makefile.in +--- wxPython-src-2.8.12.1.orig/Makefile.in 2014-01-06 09:52:42.577935546 +0100 ++++ wxPython-src-2.8.12.1/Makefile.in 2014-01-06 10:02:53.671582953 +0100 +@@ -12455,7 +12456,7 @@ 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) ++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config32-$(WX_RELEASE)) + + locale_install: + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale +diff -rupN wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in wxPython-src-2.8.12.1/utils/wxrc/Makefile.in +--- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in 2014-01-06 09:52:42.437940198 +0100 ++++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in 2014-01-06 10:04:54.567685196 +0100 +@@ -119,8 +119,7 @@ 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@uninstall_wxrc: + @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)