[arch-commits] Commit in lib32-wxgtk2.8/repos (3 files)

[Florian Pritz]

    Date: Monday, April 6, 2015 @ 18:23:47
  Author: bluewind
Revision: 130842

archrelease: copy trunk to multilib-testing-x86_64

Added:
  lib32-wxgtk2.8/repos/multilib-testing-x86_64/
  lib32-wxgtk2.8/repos/multilib-testing-x86_64/PKGBUILD
    (from rev 130841, lib32-wxgtk2.8/trunk/PKGBUILD)
  lib32-wxgtk2.8/repos/multilib-testing-x86_64/wxGTK-collision.patch
    (from rev 130841, lib32-wxgtk2.8/trunk/wxGTK-collision.patch)

-----------------------+
 PKGBUILD              |   56 ++++++++++++++++++++++++++++++++++++++++++++++++
 wxGTK-collision.patch |   25 +++++++++++++++++++++
 2 files changed, 81 insertions(+)

Copied: lib32-wxgtk2.8/repos/multilib-testing-x86_64/PKGBUILD (from rev 130841, lib32-wxgtk2.8/trunk/PKGBUILD)
===================================================================
--- multilib-testing-x86_64/PKGBUILD	                        (rev 0)
+++ multilib-testing-x86_64/PKGBUILD	2015-04-06 16:23:47 UTC (rev 130842)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at gmail.com>
+# Contributor: Eric Belanger <eric at archlinux.org>
+
+pkgname=lib32-wxgtk2.8
+pkgver=2.8.12.1
+pkgrel=5
+pkgdesc='GTK+ implementation of wxWidgets API for GUI'
+arch=('x86_64')
+url="http://wxwidgets.org/"
+license=('custom:wxWindows')
+depends=('lib32-gtk2' 'lib32-sdl' "${pkgname#*-}")
+makedepends=('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'
+  export CFLAGS="-I/usr/include/libtiff32 $CFLAGS"
+  export CXXFLAGS="-I/usr/include/libtiff32 $CXXFLAGS"
+
+  ./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:

Copied: lib32-wxgtk2.8/repos/multilib-testing-x86_64/wxGTK-collision.patch (from rev 130841, lib32-wxgtk2.8/trunk/wxGTK-collision.patch)
===================================================================
--- multilib-testing-x86_64/wxGTK-collision.patch	                        (rev 0)
+++ multilib-testing-x86_64/wxGTK-collision.patch	2015-04-06 16:23:47 UTC (rev 130842)
@@ -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)
+- at COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+- at COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
++ at COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc32-$(WX_RELEASE)
+ 
+ @COND_USE_XRC_1 at uninstall_wxrc: 
+ @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)