diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-29 04:11:37 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-06-29 04:11:37 +0000 |
commit | 58beaea4e8efc53ea238eedf446ec5d8c1cd5fdb (patch) | |
tree | d00ff5b736b1188b0c39f0a90e251e71c9bb70ae /community/stardict | |
parent | f62112e9664a5448ebcceb9e4b851d65f2361a5c (diff) |
Sun Jun 29 04:05:35 UTC 2014
Diffstat (limited to 'community/stardict')
-rw-r--r-- | community/stardict/PKGBUILD | 24 | ||||
-rw-r--r-- | community/stardict/zlib.patch | 35 |
2 files changed, 10 insertions, 49 deletions
diff --git a/community/stardict/PKGBUILD b/community/stardict/PKGBUILD index 03d6b3999..4bd06779c 100644 --- a/community/stardict/PKGBUILD +++ b/community/stardict/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 99992 2013-10-31 02:53:04Z allan $ +# $Id: PKGBUILD 113721 2014-06-28 18:11:12Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Gaetan Bisson <bisson@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -7,30 +7,28 @@ 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}" 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 @@ build() { 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,14 +64,13 @@ package_stardict() { 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" make DESTDIR="${pkgdir}" install } -md5sums=('0a9abf1936c43a3ee255802c75267f1a' +md5sums=('e5fcf03cbf44d61c4e89ab3e7a70ec39' '52ff47441c503de07add4b7688510bc5' - 'b2f216897c9053c7e4666c3d78705cf1' - 'ee26dce70fc83b3ce86e5100fede7fad') + 'b2f216897c9053c7e4666c3d78705cf1') diff --git a/community/stardict/zlib.patch b/community/stardict/zlib.patch deleted file mode 100644 index eb5a9a12a..000000000 --- a/community/stardict/zlib.patch +++ /dev/null @@ -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.343333334 +0000 -+++ new/lib/src/libcommon.cpp 2012-07-12 11:34:05.006568754 +0000 -@@ -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.h 2012-07-12 11:33:30.343333334 +0000 -+++ new/lib/src/libcommon.h 2012-07-12 11:34:05.006568754 +0000 -@@ -187,8 +187,9 @@ - typedef ResourceWrapper<FILE, FILE*, int, fclose> File; - } - -+extern int gzclose_compat(void * file); - namespace zip { --typedef ResourceWrapper<void, void*, int, gzclose> gzFile; -+typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile; - } - - /* Create a new temporary file. Return file name in file name encoding. |