Date: Thursday, July 12, 2012 @ 08:42:33
Author: bisson
Revision: 163464
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
stardict/repos/extra-i686/PKGBUILD
(from rev 163463, stardict/trunk/PKGBUILD)
stardict/repos/extra-i686/crash-empty-dict.patch
(from rev 163463, stardict/trunk/crash-empty-dict.patch)
stardict/repos/extra-i686/gcc46.patch
(from rev 163463, stardict/trunk/gcc46.patch)
stardict/repos/extra-i686/glib2.patch
(from rev 163463, stardict/trunk/glib2.patch)
stardict/repos/extra-i686/zlib.patch
(from rev 163463, stardict/trunk/zlib.patch)
stardict/repos/extra-x86_64/PKGBUILD
(from rev 163463, stardict/trunk/PKGBUILD)
stardict/repos/extra-x86_64/crash-empty-dict.patch
(from rev 163463, stardict/trunk/crash-empty-dict.patch)
stardict/repos/extra-x86_64/gcc46.patch
(from rev 163463, stardict/trunk/gcc46.patch)
stardict/repos/extra-x86_64/glib2.patch
(from rev 163463, stardict/trunk/glib2.patch)
stardict/repos/extra-x86_64/zlib.patch
(from rev 163463, stardict/trunk/zlib.patch)
Deleted:
stardict/repos/extra-i686/NetDictRequests.patch
stardict/repos/extra-i686/PKGBUILD
stardict/repos/extra-i686/gcc46.patch
stardict/repos/extra-x86_64/NetDictRequests.patch
stardict/repos/extra-x86_64/PKGBUILD
stardict/repos/extra-x86_64/gcc46.patch
-------------------------------------+
extra-i686/NetDictRequests.patch | 12 ----
extra-i686/PKGBUILD | 102 ++++++++++++++++++----------------
extra-i686/crash-empty-dict.patch | 12 ++++
extra-i686/gcc46.patch | 22 +++----
extra-i686/glib2.patch | 36 ++++++++++++
extra-i686/zlib.patch | 35 +++++++++++
extra-x86_64/NetDictRequests.patch | 12 ----
extra-x86_64/PKGBUILD | 102 ++++++++++++++++++----------------
extra-x86_64/crash-empty-dict.patch | 12 ++++
extra-x86_64/gcc46.patch | 22 +++----
extra-x86_64/glib2.patch | 36 ++++++++++++
extra-x86_64/zlib.patch | 35 +++++++++++
12 files changed, 296 insertions(+), 142 deletions(-)
Deleted: extra-i686/NetDictRequests.patch
===================================================================
--- extra-i686/NetDictRequests.patch 2012-07-12 12:41:37 UTC (rev 163463)
+++ extra-i686/NetDictRequests.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -1,12 +0,0 @@
-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);
- }
-
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-07-12 12:41:37 UTC (rev 163463)
+++ extra-i686/PKGBUILD 2012-07-12 12:42:33 UTC (rev 163464)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Aaron Griffin <aa...@archlinux.org>
-# Contributor: Neil Lin <n...@vip.url.com.tw>
-
-pkgname=stardict
-pkgver=3.0.3
-pkgrel=1
-pkgdesc='International dictionary software'
-arch=('i686' 'x86_64')
-url='http://www.stardict.org/'
-license=('GPL')
-depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
-makedepends=('intltool' 'popt' 'gnome-doc-utils' 'libmysqlclient')
-options=('!libtool' '!emptydirs')
-source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2";
- 'NetDictRequests.patch'
- 'gcc46.patch')
-sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f'
- '97af8fdb73c8f04674234b629c6867254e9bd043'
- '6605a9cdfc4abc2a0ab4462d1228233d34806f0a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # 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 \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: stardict/repos/extra-i686/PKGBUILD (from rev 163463,
stardict/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-07-12 12:42:33 UTC (rev 163464)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Aaron Griffin <aa...@archlinux.org>
+# Contributor: Neil Lin <n...@vip.url.com.tw>
+
+pkgname=stardict
+pkgver=3.0.3
+pkgrel=2
+pkgdesc='International dictionary software'
+arch=('i686' 'x86_64')
+url='http://www.stardict.org/'
+license=('GPL')
+depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
+makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common'
'libmysqlclient')
+options=('!libtool' '!emptydirs')
+source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2";
+ 'crash-empty-dict.patch'
+ 'gcc46.patch'
+ 'glib2.patch'
+ 'zlib.patch')
+sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f'
+ '97af8fdb73c8f04674234b629c6867254e9bd043'
+ '6605a9cdfc4abc2a0ab4462d1228233d34806f0a'
+ '467880bca5e89aa25cb4a57a9e1caba9a8841822'
+ '024ac5eb75a11c96569e31021a4bd65463b3cf5b')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i ../crash-empty-dict.patch
+ patch -p1 -i ../gcc46.patch
+ patch -p1 -i ../glib2.patch
+ patch -p1 -i ../zlib.patch
+ ./autogen.sh # gnome-autogen.sh requires gnome-common
+
+ ./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
+}
Copied: stardict/repos/extra-i686/crash-empty-dict.patch (from rev 163463,
stardict/trunk/crash-empty-dict.patch)
===================================================================
--- extra-i686/crash-empty-dict.patch (rev 0)
+++ extra-i686/crash-empty-dict.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -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);
+ }
+
Deleted: extra-i686/gcc46.patch
===================================================================
--- extra-i686/gcc46.patch 2012-07-12 12:41:37 UTC (rev 163463)
+++ extra-i686/gcc46.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -1,11 +0,0 @@
-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;
Copied: stardict/repos/extra-i686/gcc46.patch (from rev 163463,
stardict/trunk/gcc46.patch)
===================================================================
--- extra-i686/gcc46.patch (rev 0)
+++ extra-i686/gcc46.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -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;
Copied: stardict/repos/extra-i686/glib2.patch (from rev 163463,
stardict/trunk/glib2.patch)
===================================================================
--- extra-i686/glib2.patch (rev 0)
+++ extra-i686/glib2.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -0,0 +1,36 @@
+diff -Naur old/dict/configure.ac new/dict/configure.ac
+--- old/dict/configure.ac 2011-07-03 16:58:40.000000000 +1000
++++ new/dict/configure.ac 2012-07-12 22:31:52.875176842 +1000
+@@ -266,6 +266,9 @@
+ fi
+ AC_SUBST(WIKI_PARSEDATA_PLUGIN_DIR)
+
++GMODULE2_LIBS=`pkg-config --libs gmodule-2.0`
++AC_SUBST([GMODULE2_LIBS])
++
+ dnl ================================================================
+ dnl main program checks.
+ dnl ================================================================
+diff -Naur old/dict/src/Makefile.am new/dict/src/Makefile.am
+--- old/dict/src/Makefile.am 2011-07-03 16:58:40.000000000 +1000
++++ new/dict/src/Makefile.am 2012-07-12 22:29:53.714870692 +1000
+@@ -33,7 +33,7 @@
+ stardict_DEPENDENCIES = lib/libstardict.la $(LOCAL_SIGCPP_LIBFILE)
+ stardict_LDFLAGS =
+ ## place libstardict.la before any system library, otherwise build with
--as-needed linker option may fail
+-stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE)
++stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE)
$(GMODULE2_LIBS)
+
+ if !GNOME_SUPPORT
+ if MAEMO_SUPPORT
+diff -Naur old/dict/src/tomboykeybinder.h new/dict/src/tomboykeybinder.h
+--- old/dict/src/tomboykeybinder.h 2011-07-03 16:58:40.000000000 +1000
++++ new/dict/src/tomboykeybinder.h 2012-07-12 22:28:04.337920391 +1000
+@@ -21,7 +21,6 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+
+-#include <glib/gtypes.h>
+
+ G_BEGIN_DECLS
+
Copied: stardict/repos/extra-i686/zlib.patch (from rev 163463,
stardict/trunk/zlib.patch)
===================================================================
--- extra-i686/zlib.patch (rev 0)
+++ extra-i686/zlib.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -0,0 +1,35 @@
+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.
Deleted: extra-x86_64/NetDictRequests.patch
===================================================================
--- extra-x86_64/NetDictRequests.patch 2012-07-12 12:41:37 UTC (rev 163463)
+++ extra-x86_64/NetDictRequests.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -1,12 +0,0 @@
-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);
- }
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-07-12 12:41:37 UTC (rev 163463)
+++ extra-x86_64/PKGBUILD 2012-07-12 12:42:33 UTC (rev 163464)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Aaron Griffin <aa...@archlinux.org>
-# Contributor: Neil Lin <n...@vip.url.com.tw>
-
-pkgname=stardict
-pkgver=3.0.3
-pkgrel=1
-pkgdesc='International dictionary software'
-arch=('i686' 'x86_64')
-url='http://www.stardict.org/'
-license=('GPL')
-depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
-makedepends=('intltool' 'popt' 'gnome-doc-utils' 'libmysqlclient')
-options=('!libtool' '!emptydirs')
-source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2";
- 'NetDictRequests.patch'
- 'gcc46.patch')
-sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f'
- '97af8fdb73c8f04674234b629c6867254e9bd043'
- '6605a9cdfc4abc2a0ab4462d1228233d34806f0a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # 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 \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: stardict/repos/extra-x86_64/PKGBUILD (from rev 163463,
stardict/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-07-12 12:42:33 UTC (rev 163464)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Aaron Griffin <aa...@archlinux.org>
+# Contributor: Neil Lin <n...@vip.url.com.tw>
+
+pkgname=stardict
+pkgver=3.0.3
+pkgrel=2
+pkgdesc='International dictionary software'
+arch=('i686' 'x86_64')
+url='http://www.stardict.org/'
+license=('GPL')
+depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
+makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common'
'libmysqlclient')
+options=('!libtool' '!emptydirs')
+source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2";
+ 'crash-empty-dict.patch'
+ 'gcc46.patch'
+ 'glib2.patch'
+ 'zlib.patch')
+sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f'
+ '97af8fdb73c8f04674234b629c6867254e9bd043'
+ '6605a9cdfc4abc2a0ab4462d1228233d34806f0a'
+ '467880bca5e89aa25cb4a57a9e1caba9a8841822'
+ '024ac5eb75a11c96569e31021a4bd65463b3cf5b')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ patch -p1 -i ../crash-empty-dict.patch
+ patch -p1 -i ../gcc46.patch
+ patch -p1 -i ../glib2.patch
+ patch -p1 -i ../zlib.patch
+ ./autogen.sh # gnome-autogen.sh requires gnome-common
+
+ ./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
+}
Copied: stardict/repos/extra-x86_64/crash-empty-dict.patch (from rev 163463,
stardict/trunk/crash-empty-dict.patch)
===================================================================
--- extra-x86_64/crash-empty-dict.patch (rev 0)
+++ extra-x86_64/crash-empty-dict.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -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);
+ }
+
Deleted: extra-x86_64/gcc46.patch
===================================================================
--- extra-x86_64/gcc46.patch 2012-07-12 12:41:37 UTC (rev 163463)
+++ extra-x86_64/gcc46.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -1,11 +0,0 @@
-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;
Copied: stardict/repos/extra-x86_64/gcc46.patch (from rev 163463,
stardict/trunk/gcc46.patch)
===================================================================
--- extra-x86_64/gcc46.patch (rev 0)
+++ extra-x86_64/gcc46.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -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;
Copied: stardict/repos/extra-x86_64/glib2.patch (from rev 163463,
stardict/trunk/glib2.patch)
===================================================================
--- extra-x86_64/glib2.patch (rev 0)
+++ extra-x86_64/glib2.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -0,0 +1,36 @@
+diff -Naur old/dict/configure.ac new/dict/configure.ac
+--- old/dict/configure.ac 2011-07-03 16:58:40.000000000 +1000
++++ new/dict/configure.ac 2012-07-12 22:31:52.875176842 +1000
+@@ -266,6 +266,9 @@
+ fi
+ AC_SUBST(WIKI_PARSEDATA_PLUGIN_DIR)
+
++GMODULE2_LIBS=`pkg-config --libs gmodule-2.0`
++AC_SUBST([GMODULE2_LIBS])
++
+ dnl ================================================================
+ dnl main program checks.
+ dnl ================================================================
+diff -Naur old/dict/src/Makefile.am new/dict/src/Makefile.am
+--- old/dict/src/Makefile.am 2011-07-03 16:58:40.000000000 +1000
++++ new/dict/src/Makefile.am 2012-07-12 22:29:53.714870692 +1000
+@@ -33,7 +33,7 @@
+ stardict_DEPENDENCIES = lib/libstardict.la $(LOCAL_SIGCPP_LIBFILE)
+ stardict_LDFLAGS =
+ ## place libstardict.la before any system library, otherwise build with
--as-needed linker option may fail
+-stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE)
++stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE)
$(GMODULE2_LIBS)
+
+ if !GNOME_SUPPORT
+ if MAEMO_SUPPORT
+diff -Naur old/dict/src/tomboykeybinder.h new/dict/src/tomboykeybinder.h
+--- old/dict/src/tomboykeybinder.h 2011-07-03 16:58:40.000000000 +1000
++++ new/dict/src/tomboykeybinder.h 2012-07-12 22:28:04.337920391 +1000
+@@ -21,7 +21,6 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+
+-#include <glib/gtypes.h>
+
+ G_BEGIN_DECLS
+
Copied: stardict/repos/extra-x86_64/zlib.patch (from rev 163463,
stardict/trunk/zlib.patch)
===================================================================
--- extra-x86_64/zlib.patch (rev 0)
+++ extra-x86_64/zlib.patch 2012-07-12 12:42:33 UTC (rev 163464)
@@ -0,0 +1,35 @@
+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.
