[arch-commits] Commit in wxgtk2.8/trunk (PKGBUILD wxGTK-collision.patch)

[Eric Bélanger]

    Date: Monday, August 11, 2014 @ 21:42:38
  Author: eric
Revision: 219578

upgpkg: wxgtk2.8 2.8.12.1-2

Add wxwin2.8.m4 file (close FS#41351)

Modified:
  wxgtk2.8/trunk/PKGBUILD
  wxgtk2.8/trunk/wxGTK-collision.patch

-----------------------+
 PKGBUILD              |    4 ++--
 wxGTK-collision.patch |    7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-11 18:21:59 UTC (rev 219577)
+++ PKGBUILD	2014-08-11 19:42:38 UTC (rev 219578)
@@ -3,7 +3,7 @@
 
 pkgname=wxgtk2.8
 pkgver=2.8.12.1
-pkgrel=1
+pkgrel=2
 pkgdesc="GTK+ implementation of wxWidgets API for GUI"
 arch=('i686' 'x86_64')
 url="http://wxwidgets.org"
@@ -13,7 +13,7 @@
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2 wxGTK-collision.patch)
 sha1sums=('05688dc03d61631750f5904273122bb40a2115f5'
-          '575fb4688051c246777988332f55703df403d6b9')
+          '75d2292a0058570aa6071b4bee6eef69e47f1208')
 
 prepare() {
   cd wx*-${pkgver}

Modified: wxGTK-collision.patch
===================================================================
--- wxGTK-collision.patch	2014-08-11 18:21:59 UTC (rev 219577)
+++ wxGTK-collision.patch	2014-08-11 19:42:38 UTC (rev 219578)
@@ -13,13 +13,12 @@
 diff -Naur 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-04 22:28:16.545107766 -0500
 +++ wxPython-src-2.8.12.1/Makefile.in	2014-01-04 22:40:27.191813403 -0500
-@@ -11695,10 +11695,11 @@
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+@@ -11695,9 +11695,11 @@
  
  install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__inst
 all_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+ 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
 -	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
-+
++	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin2.8.m4)
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
 -	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
 +	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \