[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Wednesday, March 11, 2020 @ 14:07:06 Author: bgyorgy Revision: 594231 upgpkg: stardict 3.0.6-8: Remove duplicated documentation, remove deprecated gnome-doc-utils dependency Modified: stardict/trunk/PKGBUILD --+ PKGBUILD |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-03-11 14:07:02 UTC (rev 594230) +++ PKGBUILD2020-03-11 14:07:06 UTC (rev 594231) @@ -6,13 +6,13 @@ pkgname=stardict pkgver=3.0.6 -pkgrel=7 +pkgrel=8 pkgdesc='International dictionary software' arch=('x86_64') url='http://stardict-4.sourceforge.net/' license=('GPL') depends=('gtk2' 'libsigc++') -makedepends=('enchant' 'espeak' 'mariadb-libs' 'gnome-common' 'gnome-doc-utils') +makedepends=('enchant' 'espeak' 'mariadb-libs' 'gnome-common') optdepends=('enchant: spell checker plugin' 'espeak: text to speech plugin') options=('!emptydirs') @@ -34,6 +34,8 @@ sed -i 's/, enchant/, enchant-2/' dict/configure.ac sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac + sed -i '/GNOME_DOC_INIT/d' dict/configure.ac + sed -i '/gnome-doc-utils.make/d' dict/help/Makefile.am ./autogen.sh }
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Friday, April 26, 2019 @ 22:19:23 Author: arojas Revision: 454379 https Modified: stardict/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-04-26 22:18:05 UTC (rev 454378) +++ PKGBUILD2019-04-26 22:19:23 UTC (rev 454379) @@ -16,7 +16,7 @@ optdepends=('enchant: spell checker plugin' 'espeak: text to speech plugin') options=('!emptydirs') -source=("http://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgname-$pkgver.tar.bz2; +source=("https://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgname-$pkgver.tar.bz2; 'gcc46.patch' 'glib2.patch' 'mariadb.patch')
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Wednesday, January 16, 2019 @ 16:30:39 Author: felixonmars Revision: 423659 MariaDB 10.3 rebuild Modified: stardict/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2019-01-16 16:28:01 UTC (rev 423658) +++ PKGBUILD2019-01-16 16:30:39 UTC (rev 423659) @@ -6,7 +6,7 @@ pkgname=stardict pkgver=3.0.6 -pkgrel=6 +pkgrel=7 pkgdesc='International dictionary software' arch=('x86_64') url='http://stardict-4.sourceforge.net/'
[arch-commits] Commit in stardict/trunk (PKGBUILD mariadb.patch)
Date: Wednesday, January 16, 2019 @ 16:24:19 Author: eworm Revision: 423655 fix for mariadb 10.3 Added: stardict/trunk/mariadb.patch Modified: stardict/trunk/PKGBUILD ---+ PKGBUILD | 13 - mariadb.patch | 15 +++ 2 files changed, 23 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-01-16 16:20:12 UTC (rev 423654) +++ PKGBUILD2019-01-16 16:24:19 UTC (rev 423655) @@ -18,12 +18,19 @@ options=('!emptydirs') source=("http://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgname-$pkgver.tar.bz2; 'gcc46.patch' -'glib2.patch') +'glib2.patch' +'mariadb.patch') +sha256sums=('6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7' +'207dc727b69ee8552372d5551f54a638b472703aeb13a64cdfee6bad00dc380d' +'5be4d0468f6089b760924a5d25030110ca62869b4611afb46a411cd4eb59b832' +'f66b916c358bddf48fcb91a7d0190a7109fe92a1388ec982c47dfa9ac1ee69cf') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../gcc46.patch patch -p1 -i ../glib2.patch + patch -p1 -i ../mariadb.patch sed -i 's/, enchant/, enchant-2/' dict/configure.ac sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac @@ -51,7 +58,3 @@ cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } - -md5sums=('93371b35482e6380e8bd4ba5d256b864' - '52ff47441c503de07add4b7688510bc5' - 'b2f216897c9053c7e4666c3d78705cf1') Added: mariadb.patch === --- mariadb.patch (rev 0) +++ mariadb.patch 2019-01-16 16:24:19 UTC (rev 423655) @@ -0,0 +1,15 @@ +diff --git a/tools/src/wikipediaImage.cpp b/tools/src/wikipediaImage.cpp +index ff38f50..2fa5712 100644 +--- a/tools/src/wikipediaImage.cpp b/tools/src/wikipediaImage.cpp +@@ -25,6 +25,10 @@ + #define CONN_PASS "123" + #define CONN_DB "wikidb" + ++/* MariaDB >= 10.2 client does not set MYSQL_PORT */ ++#ifndef MYSQL_PORT ++# define MYSQL_PORT 3306 ++#endif + + void dump_file() + {
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Saturday, September 8, 2018 @ 12:51:53 Author: bgyorgy Revision: 378812 upgpkg: stardict 3.0.6-6 Update URL, remove gconf makedependency Modified: stardict/trunk/PKGBUILD --+ PKGBUILD | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-09-08 12:48:59 UTC (rev 378811) +++ PKGBUILD2018-09-08 12:51:53 UTC (rev 378812) @@ -7,13 +7,13 @@ pkgname=stardict pkgver=3.0.6 -pkgrel=5 +pkgrel=6 pkgdesc='International dictionary software' arch=('x86_64') -url='http://www.stardict.org/' +url='http://stardict-4.sourceforge.net/' license=('GPL') depends=('gtk2' 'libsigc++') -makedepends=('enchant' 'espeak' 'libmariadbclient' 'gconf' 'gnome-common' 'gnome-doc-utils') +makedepends=('enchant' 'espeak' 'libmariadbclient' 'gnome-common' 'gnome-doc-utils') optdepends=('enchant: spell checker plugin' 'espeak: text to speech plugin') options=('!emptydirs') @@ -27,6 +27,9 @@ patch -p1 -i ../glib2.patch sed -i 's/, enchant/, enchant-2/' dict/configure.ac + sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac + + ./autogen.sh } build() { @@ -33,7 +36,6 @@ cd "${srcdir}/${pkgname}-${pkgver}" CXXFLAGS+=" -std=gnu++11" - ./autogen.sh ./configure \ --prefix=/usr \ --sysconfdir=/etc \
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Monday, January 15, 2018 @ 17:21:23 Author: felixonmars Revision: 282775 upgpkg: stardict 3.0.6-5 rebuild with enchant 2.2.1 Modified: stardict/trunk/PKGBUILD --+ PKGBUILD |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2018-01-15 17:21:01 UTC (rev 282774) +++ PKGBUILD2018-01-15 17:21:23 UTC (rev 282775) @@ -7,7 +7,7 @@ pkgname=stardict pkgver=3.0.6 -pkgrel=4 +pkgrel=5 pkgdesc='International dictionary software' arch=('x86_64') url='http://www.stardict.org/' @@ -25,6 +25,8 @@ cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../gcc46.patch patch -p1 -i ../glib2.patch + + sed -i 's/, enchant/, enchant-2/' dict/configure.ac } build() {
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Wednesday, November 22, 2017 @ 22:49:58 Author: jgc Revision: 268117 upgpkg: stardict 3.0.6-4 enchant rebuild Modified: stardict/trunk/PKGBUILD --+ PKGBUILD |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2017-11-22 22:37:41 UTC (rev 268116) +++ PKGBUILD2017-11-22 22:49:58 UTC (rev 268117) @@ -7,7 +7,7 @@ pkgname=stardict pkgver=3.0.6 -pkgrel=3 +pkgrel=4 pkgdesc='International dictionary software' arch=('x86_64') url='http://www.stardict.org/' @@ -40,6 +40,7 @@ --disable-gucharmap \ --disable-festival \ --disable-updateinfo + sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' -i {dict,lib,tools}/libtool make }
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Saturday, January 21, 2017 @ 11:28:35 Author: bgyorgy Revision: 208238 upgpkg: stardict 3.0.6-3 Remove deprecated libgnome dependency, drop stardict-lite package Modified: stardict/trunk/PKGBUILD --+ PKGBUILD | 50 -- 1 file changed, 12 insertions(+), 38 deletions(-) Modified: PKGBUILD === --- PKGBUILD2017-01-21 10:59:33 UTC (rev 208237) +++ PKGBUILD2017-01-21 11:28:35 UTC (rev 208238) @@ -5,29 +5,30 @@ # Contributor: Neil Lin# Contributor: Cravix < dr dot neemous at gmail dot com > -pkgbase=stardict -pkgname=(stardict stardict-lite) +pkgname=stardict pkgver=3.0.6 -pkgrel=2 +pkgrel=3 +pkgdesc='International dictionary software' arch=('i686' 'x86_64') url='http://www.stardict.org/' license=('GPL') -makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmariadbclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') +depends=('gtk2' 'libsigc++') +makedepends=('enchant' 'espeak' 'libmariadbclient' 'gconf' 'gnome-common' 'gnome-doc-utils') +optdepends=('enchant: spell checker plugin' +'espeak: text to speech plugin') options=('!emptydirs') -source=("http://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgbase-$pkgver.tar.bz2; +source=("http://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgname-$pkgver.tar.bz2; 'gcc46.patch' 'glib2.patch') prepare() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../gcc46.patch patch -p1 -i ../glib2.patch - - cp -a "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/${pkgbase}-${pkgver}-lite" } build() { - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${srcdir}/${pkgname}-${pkgver}" CXXFLAGS+=" -std=gnu++11" ./autogen.sh @@ -35,21 +36,7 @@ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ ---disable-schemas-install \ ---disable-gucharmap \ ---disable-festival \ ---disable-updateinfo - make - - cd "${srcdir}/${pkgbase}-${pkgver}-lite" - ./autogen.sh - ./configure \ ---prefix=/usr \ ---sysconfdir=/etc \ ---mandir=/usr/share/man \ --disable-gnome-support \ ---disable-schemas-install \ ---disable-espeak \ --disable-gucharmap \ --disable-festival \ --disable-updateinfo @@ -56,24 +43,11 @@ make } -package_stardict() { - pkgdesc='International dictionary software' - depends=('enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') - - cd "${srcdir}/${pkgbase}-${pkgver}" +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -package_stardict-lite() { - pkgdesc='International dictionary software - lite version without gnome and espeak support' - depends=('enchant' 'gtk2' 'libsigc++' 'libsm') - provides=("stardict=$pkgver") - conflicts=(stardict) - - cd "${srcdir}/${pkgbase}-${pkgver}-lite" - make DESTDIR="${pkgdir}" install -} - md5sums=('93371b35482e6380e8bd4ba5d256b864' '52ff47441c503de07add4b7688510bc5' 'b2f216897c9053c7e4666c3d78705cf1')
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 18:46:10 Author: arojas Revision: 149000 Use C++11, needed by latest libsigc++ Modified: stardict/trunk/PKGBUILD --+ PKGBUILD |2 ++ 1 file changed, 2 insertions(+) Modified: PKGBUILD === --- PKGBUILD2015-12-06 17:45:21 UTC (rev 148999) +++ PKGBUILD2015-12-06 17:46:10 UTC (rev 149000) @@ -28,6 +28,8 @@ build() { cd "${srcdir}/${pkgbase}-${pkgver}" + + export CXXFLAGS+="-std=gnu++11" ./autogen.sh ./configure \ --prefix=/usr \
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 18:49:22 Author: arojas Revision: 149010 Add missing space Modified: stardict/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-06 17:49:06 UTC (rev 149009) +++ PKGBUILD2015-12-06 17:49:22 UTC (rev 149010) @@ -29,7 +29,7 @@ build() { cd "${srcdir}/${pkgbase}-${pkgver}" - export CXXFLAGS+="-std=gnu++11" + CXXFLAGS+=" -std=gnu++11" ./autogen.sh ./configure \ --prefix=/usr \
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Sunday, December 6, 2015 @ 20:58:40 Author: bpiotrowski Revision: 149136 C++11 ABI rebuild Modified: stardict/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2015-12-06 19:58:22 UTC (rev 149135) +++ PKGBUILD2015-12-06 19:58:40 UTC (rev 149136) @@ -8,7 +8,7 @@ pkgbase=stardict pkgname=(stardict stardict-lite) pkgver=3.0.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.stardict.org/' license=('GPL')
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Thursday, January 29, 2015 @ 10:41:46 Author: fyan Revision: 126736 upgpkg: stardict 3.0.6-1 Modified: stardict/trunk/PKGBUILD --+ PKGBUILD | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-01-29 09:29:39 UTC (rev 126735) +++ PKGBUILD2015-01-29 09:41:46 UTC (rev 126736) @@ -1,5 +1,5 @@ # $Id$ -# Maintainer: Felix Yan felixonm...@gmail.com +# Maintainer: Felix Yan felixonm...@archlinux.org # Contributor: Gaetan Bisson bis...@archlinux.org # Contributor: Aaron Griffin aa...@archlinux.org # Contributor: Neil Lin n...@vip.url.com.tw @@ -7,7 +7,7 @@ pkgbase=stardict pkgname=(stardict stardict-lite) -pkgver=3.0.5 +pkgver=3.0.6 pkgrel=1 arch=('i686' 'x86_64') url='http://www.stardict.org/' @@ -18,14 +18,15 @@ 'gcc46.patch' 'glib2.patch') -build() { +prepare() { cd ${srcdir}/${pkgbase}-${pkgver} - patch -p1 -i ../gcc46.patch patch -p1 -i ../glib2.patch - cp -r ${srcdir}/${pkgbase}-${pkgver} ${srcdir}/${pkgbase}-${pkgver}-lite + cp -a ${srcdir}/${pkgbase}-${pkgver} ${srcdir}/${pkgbase}-${pkgver}-lite +} +build() { cd ${srcdir}/${pkgbase}-${pkgver} ./autogen.sh ./configure \ @@ -71,6 +72,6 @@ make DESTDIR=${pkgdir} install } -md5sums=('e5fcf03cbf44d61c4e89ab3e7a70ec39' +md5sums=('93371b35482e6380e8bd4ba5d256b864' '52ff47441c503de07add4b7688510bc5' 'b2f216897c9053c7e4666c3d78705cf1')
[arch-commits] Commit in stardict/trunk (PKGBUILD zlib.patch)
Date: Saturday, June 28, 2014 @ 20:10:07 Author: fyan Revision: 113720 upgpkg: stardict 3.0.5-1 Modified: stardict/trunk/PKGBUILD Deleted: stardict/trunk/zlib.patch + PKGBUILD | 22 +- zlib.patch | 35 --- 2 files changed, 9 insertions(+), 48 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-06-28 17:56:48 UTC (rev 113719) +++ PKGBUILD2014-06-28 18:10:07 UTC (rev 113720) @@ -7,17 +7,16 @@ pkgbase=stardict pkgname=(stardict stardict-lite) -pkgver=3.0.4 -pkgrel=3 +pkgver=3.0.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.stardict.org/' license=('GPL') makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmariadbclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') options=('!emptydirs') -source=(http://stardict-3.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2; +source=(http://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgbase-$pkgver.tar.bz2; 'gcc46.patch' -'glib2.patch' -'zlib.patch') +'glib2.patch') build() { cd ${srcdir}/${pkgbase}-${pkgver} @@ -24,13 +23,12 @@ patch -p1 -i ../gcc46.patch patch -p1 -i ../glib2.patch - patch -p1 -i ../zlib.patch cp -r ${srcdir}/${pkgbase}-${pkgver} ${srcdir}/${pkgbase}-${pkgver}-lite cd ${srcdir}/${pkgbase}-${pkgver} + ./autogen.sh ./configure \ -PKG_CONFIG=/usr/bin/pkg-config \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -41,9 +39,8 @@ make cd ${srcdir}/${pkgbase}-${pkgver}-lite - LDFLAGS=$LDFLAGS -lgmodule-2.0 + ./autogen.sh ./configure \ -PKG_CONFIG=/usr/bin/pkg-config \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -67,7 +64,7 @@ package_stardict-lite() { pkgdesc='International dictionary software - lite version without gnome and espeak support' depends=('enchant' 'gtk2' 'libsigc++' 'libsm') - provides=(stardict) + provides=(stardict=$pkgver) conflicts=(stardict) cd ${srcdir}/${pkgbase}-${pkgver}-lite @@ -74,7 +71,6 @@ make DESTDIR=${pkgdir} install } -md5sums=('0a9abf1936c43a3ee255802c75267f1a' +md5sums=('e5fcf03cbf44d61c4e89ab3e7a70ec39' '52ff47441c503de07add4b7688510bc5' - 'b2f216897c9053c7e4666c3d78705cf1' - 'ee26dce70fc83b3ce86e5100fede7fad') + 'b2f216897c9053c7e4666c3d78705cf1') Deleted: zlib.patch === --- zlib.patch 2014-06-28 17:56:48 UTC (rev 113719) +++ zlib.patch 2014-06-28 18:10:07 UTC (rev 113720) @@ -1,35 +0,0 @@ -diff -Naur old/lib/src/libcommon.cpp new/lib/src/libcommon.cpp old/lib/src/libcommon.cpp 2012-07-12 11:33:30.34334 + -+++ new/lib/src/libcommon.cpp 2012-07-12 11:34:05.006568754 + -@@ -614,7 +614,7 @@ - return EXIT_FAILURE; - } - while(true) { -- len = gzread(get_impl(in), buf, buffer_size); -+ len = gzread((gzFile)get_impl(in), buf, buffer_size); - if(len 0) { - g_critical(read_file_err, arch_file_name, ); - return EXIT_FAILURE; -@@ -871,3 +871,8 @@ - return res; - } - } -+ -+int gzclose_compat(void * file) -+{ -+return gzclose ((gzFile)file); -+} -diff -Naur old/lib/src/libcommon.h new/lib/src/libcommon.h old/lib/src/libcommon.h2012-07-12 11:33:30.34334 + -+++ new/lib/src/libcommon.h2012-07-12 11:34:05.006568754 + -@@ -187,8 +187,9 @@ - typedef ResourceWrapperFILE, FILE*, int, fclose File; - } - -+extern int gzclose_compat(void * file); - namespace zip { --typedef ResourceWrappervoid, void*, int, gzclose gzFile; -+typedef ResourceWrappervoid, void*, int, gzclose_compat gzFile; - } - - /* Create a new temporary file. Return file name in file name encoding.
[arch-commits] Commit in stardict/trunk (PKGBUILD)
Date: Monday, March 4, 2013 @ 07:23:37 Author: fyan Revision: 85618 upgpkg: stardict 3.0.4-3 mariadb rebuild Modified: stardict/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-03-04 04:34:16 UTC (rev 85617) +++ PKGBUILD2013-03-04 06:23:37 UTC (rev 85618) @@ -8,11 +8,11 @@ pkgbase=stardict pkgname=(stardict stardict-lite) pkgver=3.0.4 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.stardict.org/' license=('GPL') -makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') +makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmariadbclient' 'enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome') options=('!libtool' '!emptydirs') source=(http://stardict-3.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2; 'gcc46.patch'
[arch-commits] Commit in stardict/trunk (PKGBUILD help-in-destdir.patch)
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 === --- PKGBUILD2011-01-14 20:20:36 UTC (rev 106154) +++ PKGBUILD2011-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 stardict3.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.0 +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.0 +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