Tue Jul 19 23:13:07 UTC 2011

3 files changed, 54 insertions, 25 deletions

diff --git a/extra/stardict/NetDictRequests.patch b/extra/stardict/NetDictRequests.patch
new file mode 100644
index 000000000..4d6fe145a
--- /dev/null
+++ b/extra/stardict/NetDictRequests.patch
@@ -0,0 +1,12 @@
+diff -aur old/dict/src/lib/compositelookup.cpp new/dict/src/lib/compositelookup.cpp
+--- old/dict/src/lib/compositelookup.cpp	2011-07-02 23:58:40.000000000 -0700
++++ new/dict/src/lib/compositelookup.cpp	2011-07-18 07:40:01.795710505 -0700
+@@ -50,7 +50,7 @@
+ void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key)
+ {
+ 	NetDictRequest request(dict_id, key);
+-	g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request));
++	std::find(NetDictRequests.begin(), NetDictRequests.end(), request);
+ 	NetDictRequests.push_back(request);
+ }
+ 
diff --git a/extra/stardict/PKGBUILD b/extra/stardict/PKGBUILD
index b02aefd11..8ce7a50e8 100644
--- a/extra/stardict/PKGBUILD
+++ b/extra/stardict/PKGBUILD
@@ -1,42 +1,48 @@
-# $Id: PKGBUILD 106155 2011-01-14 21:07:17Z bisson $
+# $Id: PKGBUILD 131980 2011-07-18 15:27:26Z bisson $
 # Maintainer: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Neil Lin <neil@vip.url.com.tw>
 
 pkgname=stardict
-pkgver=3.0.2
-pkgrel=2
-pkgdesc='A powerful international dictionary written in Gtk2.'
+pkgver=3.0.3
+pkgrel=1
+pkgdesc='International dictionary software'
 arch=('i686' 'x86_64')
-url='http://stardict.sourceforge.net/'
+url='http://www.stardict.org/'
 license=('GPL')
 depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
-makedepends=('intltool' 'popt' 'gnome-doc-utils')
+makedepends=('intltool' 'popt' 'gnome-doc-utils' 'libmysqlclient')
 options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/sourceforge/stardict/$pkgname-$pkgver.tar.bz2"
-        'help-in-destdir.patch'
-        'as-needed.patch')
-sha1sums=('301875657cd39b5f25e5933ece22936a28db1230'
-          '0249d769e5cc85e183eb395b824342f8ca320f56'
-          '22fca061d1be23ac79da6c0ec5fc488ae0aca9c1')
+source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2"
+        'NetDictRequests.patch'
+        'gcc46.patch')
+sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f'
+          '97af8fdb73c8f04674234b629c6867254e9bd043'
+          '6605a9cdfc4abc2a0ab4462d1228233d34806f0a')
 
-build()
-{
-	cd "$srcdir/$pkgname-$pkgver"
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# patches accepted upstream; will be in stardict>3.0.2
-	patch -p1 -i ../help-in-destdir.patch
-	patch -p1 -i ../as-needed.patch
+	# ugly hack to avoid crashing with empty dictionaries
+	patch -p1 -i ../NetDictRequests.patch
+	patch -p1 -i ../gcc46.patch
 	automake
 
-	./configure PKG_CONFIG=/usr/bin/pkg-config --prefix=/usr \
-		--sysconfdir=/etc --mandir=/usr/share/man \
-		--disable-gnome-support --disable-schemas-install \
-		--disable-espeak --disable-gucharmap \
-		--disable-festival --disable-updateinfo
+	./configure \
+		PKG_CONFIG=/usr/bin/pkg-config \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--disable-gnome-support \
+		--disable-schemas-install \
+		--disable-espeak \
+		--disable-gucharmap \
+		--disable-festival \
+		--disable-updateinfo \
+
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/stardict/gcc46.patch b/extra/stardict/gcc46.patch
new file mode 100644
index 000000000..944b9635c
--- /dev/null
+++ b/extra/stardict/gcc46.patch
@@ -0,0 +1,11 @@
+diff -aur old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h
+--- old/dict/stardict-plugins/stardict-wordnet-plugin/utils.h	2011-07-18 06:58:58.519404744 -0700
++++ new/dict/stardict-plugins/stardict-wordnet-plugin/utils.h	2011-07-18 07:01:10.739734313 -0700
+@@ -26,6 +26,7 @@
+ #ifndef __TYPES_H__
+ #define __TYPES_H__
+ 
++#include <cstddef>
+ #include <math.h>
+ 
+ typedef float single;