[arch-commits] Commit in stardict/trunk (PKGBUILD zlib.patch)

[Felix Yan]

    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
===================================================================
--- PKGBUILD	2014-06-28 17:56:48 UTC (rev 113719)
+++ PKGBUILD	2014-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.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.