diff options
| author | root <root@rshg054.dnsready.net> | 2013-08-20 02:15:20 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-08-20 02:15:20 -0700 |
| commit | 1ae31a85e191bbf7313077b472a66d1c24af1f74 (patch) | |
| tree | 91f021858c2e33e1a6633c12b80e54105fd7500b /community/wxgtk2.9 | |
| parent | 26606f981048ee9efcda690b619d3c53501a7a58 (diff) | |
Tue Aug 20 02:14:51 PDT 2013
Diffstat (limited to 'community/wxgtk2.9')
| -rw-r--r-- | community/wxgtk2.9/PKGBUILD | 17 | ||||
| -rw-r--r-- | community/wxgtk2.9/wxGTK-2.9.5-collision.patch (renamed from community/wxgtk2.9/wxGTK-2.9.4-collision.patch) | 13 |
2 files changed, 21 insertions, 9 deletions
diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD index 83fa6b2a9..428403d1d 100644 --- a/community/wxgtk2.9/PKGBUILD +++ b/community/wxgtk2.9/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 93329 2013-07-02 01:23:14Z eric $ +# $Id: PKGBUILD 96072 2013-08-19 20:07:32Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk2.9 -pkgver=2.9.4 -pkgrel=4 +pkgver=2.9.5 +pkgrel=1 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64') url="http://wxwidgets.org" @@ -11,13 +11,15 @@ license=('custom:wxWindows') depends=('gtk2' 'gstreamer0.10-base') makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2') optdepends=('webkitgtk2: for webview support') -source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 wxGTK-2.9.4-collision.patch) -sha1sums=('5a34ddf19d37c741f74652ee847df9568a8b81e1' - 'a76ccca4c2fad246c9aafbcc5a9697ebf35f33a3') +options=('!emptydirs') +source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 + wxGTK-2.9.5-collision.patch) +sha1sums=('0bab57ecd6d065a3672ec5fbb09d287456727ea4' + '22f21e91d847779f17cace8cfde553ab1ffac279') prepare() { cd wxWidgets-${pkgver} - patch -p1 -i ../wxGTK-2.9.4-collision.patch + patch -p1 -i ../wxGTK-2.9.5-collision.patch } build() { @@ -33,6 +35,5 @@ build() { package() { cd wxWidgets-${pkgver} make DESTDIR="${pkgdir}" install - rm "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo" install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/community/wxgtk2.9/wxGTK-2.9.4-collision.patch b/community/wxgtk2.9/wxGTK-2.9.5-collision.patch index 4b1fb395e..4d7090581 100644 --- a/community/wxgtk2.9/wxGTK-2.9.4-collision.patch +++ b/community/wxgtk2.9/wxGTK-2.9.5-collision.patch @@ -27,7 +27,7 @@ Prevent file collisions between multiple installed SLOTs. $(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) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) +- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(libdir)`/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) - + (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ + && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) @@ -75,3 +75,14 @@ Prevent file collisions between multiple installed SLOTs. @COND_USE_XRC_1@uninstall_wxrc: @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) +--- a/Makefile.in 2013-07-17 18:32:11.705720544 -0400 ++++ b/Makefile.in 2013-07-17 18:39:24.134286555 -0400 +@@ -16124,7 +16124,7 @@ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ + $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ + if test -f $(srcdir)/locale/msw/$$l.mo ; then \ +- $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \ ++ $(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \ + fi ; \ + done + |