Date: Friday, January 14, 2011 @ 16:07:17 Author: bisson Revision: 106155
cleaner patch from upstream Modified: stardict/trunk/PKGBUILD stardict/trunk/help-in-destdir.patch -----------------------+ PKGBUILD | 12 ++++++++---- help-in-destdir.patch | 42 +++++++++++++++++++++--------------------- 2 files changed, 29 insertions(+), 25 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-01-14 20:20:36 UTC (rev 106154) +++ PKGBUILD 2011-01-14 21:07:17 UTC (rev 106155) @@ -4,7 +4,7 @@ pkgname=stardict pkgver=3.0.2 -pkgrel=1 +pkgrel=2 pkgdesc='A powerful international dictionary written in Gtk2.' arch=('i686' 'x86_64') url='http://stardict.sourceforge.net/' @@ -13,16 +13,20 @@ makedepends=('intltool' 'popt' 'gnome-doc-utils') options=('!libtool' '!emptydirs') source=("http://downloads.sourceforge.net/sourceforge/stardict/$pkgname-$pkgver.tar.bz2" - 'help-in-destdir.patch') + 'help-in-destdir.patch' + 'as-needed.patch') sha1sums=('301875657cd39b5f25e5933ece22936a28db1230' - '2016db86bb10782701c94777ebf67455282ca163') + '0249d769e5cc85e183eb395b824342f8ca320f56' + '22fca061d1be23ac79da6c0ec5fc488ae0aca9c1') build() { cd "$srcdir/$pkgname-$pkgver" - export LDFLAGS="${LDFLAGS// -Wl,--as-needed/}" + # patches accepted upstream; will be in stardict>3.0.2 patch -p1 -i ../help-in-destdir.patch + patch -p1 -i ../as-needed.patch + automake ./configure PKG_CONFIG=/usr/bin/pkg-config --prefix=/usr \ --sysconfdir=/etc --mandir=/usr/share/man \ Modified: help-in-destdir.patch =================================================================== --- help-in-destdir.patch 2011-01-14 20:20:36 UTC (rev 106154) +++ help-in-destdir.patch 2011-01-14 21:07:17 UTC (rev 106155) @@ -1,21 +1,21 @@ -diff -aur old/help/Makefile.in new/help/Makefile.in ---- old/help/Makefile.in 2011-01-11 17:04:09.000000000 +0100 -+++ new/help/Makefile.in 2011-01-13 21:46:53.250005822 +0100 -@@ -1066,7 +1066,7 @@ - @GNOME_SUPPORT_TRUE@stardict-install-html: - @GNOME_SUPPORT_FALSE@stardict-install-html: - @GNOME_SUPPORT_FALSE@ for lc in $(STARDICT_ALL_LINGUAS); do \ --@GNOME_SUPPORT_FALSE@ install_dir=$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \ -+@GNOME_SUPPORT_FALSE@ install_dir=$(DESTDIR)$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \ - @GNOME_SUPPORT_FALSE@ htmldir=$(srcdir)/$${lc}/html; \ - @GNOME_SUPPORT_FALSE@ for file in `find $${htmldir} -type f -print`; do \ - @GNOME_SUPPORT_FALSE@ relfile=$${file#$${htmldir}/}; \ -@@ -1085,7 +1085,7 @@ - @GNOME_SUPPORT_TRUE@stardict-uninstall-html: - @GNOME_SUPPORT_FALSE@stardict-uninstall-html: - @GNOME_SUPPORT_FALSE@ for lc in $(STARDICT_ALL_LINGUAS); do \ --@GNOME_SUPPORT_FALSE@ install_dir=$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \ -+@GNOME_SUPPORT_FALSE@ install_dir=$(DESTDIR)$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \ - @GNOME_SUPPORT_FALSE@ rm -rf $${install_dir}; \ - @GNOME_SUPPORT_FALSE@ done; - +diff -aur old/help/Makefile.am new/help/Makefile.am +--- old/help/Makefile.am 2011-01-03 17:14:20.000000000 +0100 ++++ new/help/Makefile.am 2011-01-13 21:42:06.046672489 +0100 +@@ -104,7 +104,7 @@ + else + stardict-install-html: + for lc in $(STARDICT_ALL_LINGUAS); do \ +- install_dir=$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \ ++ install_dir=$(DESTDIR)$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \ + htmldir=$(srcdir)/$${lc}/html; \ + for file in `find $${htmldir} -type f -print`; do \ + relfile=$${file#$${htmldir}/}; \ +@@ -126,7 +126,7 @@ + else + stardict-uninstall-html: + for lc in $(STARDICT_ALL_LINGUAS); do \ +- install_dir=$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \ ++ install_dir=$(DESTDIR)$(STARDICT_HTML_INSTALL_DIR)/$${lc}; \ + rm -rf $${install_dir}; \ + done; + endif