[arch-commits] Commit in stardict/trunk (5 files)

Gaetan Bisson bisson at archlinux.org
Mon Jul 18 15:27:27 UTC 2011 

    Date: Monday, July 18, 2011 @ 11:27:26
  Author: bisson
Revision: 131980

upstream update, different patches

Added:
  stardict/trunk/NetDictRequests.patch
  stardict/trunk/gcc46.patch
Modified:
  stardict/trunk/PKGBUILD
Deleted:
  stardict/trunk/as-needed.patch
  stardict/trunk/help-in-destdir.patch

-----------------------+
 NetDictRequests.patch |   12 ++++++++++
 PKGBUILD              |   54 ++++++++++++++++++++++++++----------------------
 as-needed.patch       |   29 -------------------------
 gcc46.patch           |   11 +++++++++
 help-in-destdir.patch |   21 ------------------
 5 files changed, 53 insertions(+), 74 deletions(-)

Added: NetDictRequests.patch
===================================================================
--- NetDictRequests.patch	                        (rev 0)
+++ NetDictRequests.patch	2011-07-18 15:27:26 UTC (rev 131980)
@@ -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);
+ }
+ 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-18 15:13:07 UTC (rev 131979)
+++ PKGBUILD	2011-07-18 15:27:26 UTC (rev 131980)
@@ -3,40 +3,46 @@
 # Contributor: Neil Lin <neil at 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
 }

Deleted: as-needed.patch
===================================================================
--- as-needed.patch	2011-07-18 15:13:07 UTC (rev 131979)
+++ as-needed.patch	2011-07-18 15:27:26 UTC (rev 131980)
@@ -1,29 +0,0 @@
-Index: stardict/src/Makefile.am
-===================================================================
---- stardict/src/Makefile.am	(revision 489)
-+++ stardict/src/Makefile.am	(working copy)
-@@ -26,9 +26,9 @@
- 	-DSTARDICT_LIB_DIR=\""$(libdir)/stardict"\"
- 
- 
--stardict_DEPENDENCIES = $(LOCAL_SIGCPP_LIBFILE) lib/libstardict.a
-+stardict_DEPENDENCIES = lib/libstardict.a $(LOCAL_SIGCPP_LIBFILE)
- stardict_LDFLAGS = 
--stardict_LDADD = $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) lib/libstardict.a
-+stardict_LDADD = lib/libstardict.a $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE)
- 
- if !GNOME_SUPPORT
- if MAEMO_SUPPORT
-Index: stardict/tests/Makefile.am
-===================================================================
---- stardict/tests/Makefile.am	(revision 489)
-+++ stardict/tests/Makefile.am	(working copy)
-@@ -49,7 +49,7 @@
- t_res_database_SOURCES = t_res_database.cpp
- t_res_database_DEPENDENCIES = $(top_builddir)/src/lib/libstardict.a
- 
--LDADD = @STARDICT_LIBS@ $(top_builddir)/src/lib/libstardict.a \
-+LDADD = $(top_builddir)/src/lib/libstardict.a $(STARDICT_LIBS) \
- 	$(LOCAL_SIGCPP_LIBFILE)
- ## -I$(top_builddir) is for config.h, it's generated by configure in the build dir
- AM_CPPFLAGS = @STARDICT_CFLAGS@ $(LOCAL_SIGCPP_INCLUDE) -I$(top_builddir) \

Added: gcc46.patch
===================================================================
--- gcc46.patch	                        (rev 0)
+++ gcc46.patch	2011-07-18 15:27:26 UTC (rev 131980)
@@ -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;

Deleted: help-in-destdir.patch
===================================================================
--- help-in-destdir.patch	2011-07-18 15:13:07 UTC (rev 131979)
+++ help-in-destdir.patch	2011-07-18 15:27:26 UTC (rev 131980)
@@ -1,21 +0,0 @@
-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

More information about the arch-commits mailing list