Date: Wednesday, January 16, 2019 @ 16:31:04 Author: felixonmars Revision: 423660
archrelease: copy trunk to community-staging-x86_64 Added: stardict/repos/community-staging-x86_64/ stardict/repos/community-staging-x86_64/PKGBUILD (from rev 423659, stardict/trunk/PKGBUILD) stardict/repos/community-staging-x86_64/gcc46.patch (from rev 423659, stardict/trunk/gcc46.patch) stardict/repos/community-staging-x86_64/glib2.patch (from rev 423659, stardict/trunk/glib2.patch) stardict/repos/community-staging-x86_64/mariadb.patch (from rev 423659, stardict/trunk/mariadb.patch) ---------------+ PKGBUILD | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ gcc46.patch | 11 ++++++++++ glib2.patch | 36 +++++++++++++++++++++++++++++++++ mariadb.patch | 15 ++++++++++++++ 4 files changed, 122 insertions(+) Copied: stardict/repos/community-staging-x86_64/PKGBUILD (from rev 423659, stardict/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2019-01-16 16:31:04 UTC (rev 423660) @@ -0,0 +1,60 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Aaron Griffin <aa...@archlinux.org> +# Contributor: Neil Lin <n...@vip.url.com.tw> +# Contributor: Cravix < dr dot neemous at gmail dot com > + +pkgname=stardict +pkgver=3.0.6 +pkgrel=7 +pkgdesc='International dictionary software' +arch=('x86_64') +url='http://stardict-4.sourceforge.net/' +license=('GPL') +depends=('gtk2' 'libsigc++') +makedepends=('enchant' 'espeak' 'mariadb-libs' 'gnome-common' 'gnome-doc-utils') +optdepends=('enchant: spell checker plugin' + 'espeak: text to speech plugin') +options=('!emptydirs') +source=("http://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgname-$pkgver.tar.bz2" + 'gcc46.patch' + 'glib2.patch' + 'mariadb.patch') +sha256sums=('6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7' + '207dc727b69ee8552372d5551f54a638b472703aeb13a64cdfee6bad00dc380d' + '5be4d0468f6089b760924a5d25030110ca62869b4611afb46a411cd4eb59b832' + 'f66b916c358bddf48fcb91a7d0190a7109fe92a1388ec982c47dfa9ac1ee69cf') + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../gcc46.patch + patch -p1 -i ../glib2.patch + patch -p1 -i ../mariadb.patch + + sed -i 's/, enchant/, enchant-2/' dict/configure.ac + sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac + + ./autogen.sh +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + CXXFLAGS+=" -std=gnu++11" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --disable-gnome-support \ + --disable-gucharmap \ + --disable-festival \ + --disable-updateinfo + sed -e 's/ -shared / -Wl,-O1,--as-needed\0/g' -i {dict,lib,tools}/libtool + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: stardict/repos/community-staging-x86_64/gcc46.patch (from rev 423659, stardict/trunk/gcc46.patch) =================================================================== --- community-staging-x86_64/gcc46.patch (rev 0) +++ community-staging-x86_64/gcc46.patch 2019-01-16 16:31:04 UTC (rev 423660) @@ -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/community-staging-x86_64/glib2.patch (from rev 423659, stardict/trunk/glib2.patch) =================================================================== --- community-staging-x86_64/glib2.patch (rev 0) +++ community-staging-x86_64/glib2.patch 2019-01-16 16:31:04 UTC (rev 423660) @@ -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.h> + + G_BEGIN_DECLS + Copied: stardict/repos/community-staging-x86_64/mariadb.patch (from rev 423659, stardict/trunk/mariadb.patch) =================================================================== --- community-staging-x86_64/mariadb.patch (rev 0) +++ community-staging-x86_64/mariadb.patch 2019-01-16 16:31:04 UTC (rev 423660) @@ -0,0 +1,15 @@ +diff --git a/tools/src/wikipediaImage.cpp b/tools/src/wikipediaImage.cpp +index ff38f50..2fa5712 100644 +--- a/tools/src/wikipediaImage.cpp ++++ b/tools/src/wikipediaImage.cpp +@@ -25,6 +25,10 @@ + #define CONN_PASS "123" + #define CONN_DB "wikidb" + ++/* MariaDB >= 10.2 client does not set MYSQL_PORT */ ++#ifndef MYSQL_PORT ++# define MYSQL_PORT 3306 ++#endif + + void dump_file() + {