[arch-commits] Commit in stardict/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sun Dec 6 19:58:52 UTC 2015
Date: Sunday, December 6, 2015 @ 20:58:52
Author: bpiotrowski
Revision: 149137
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
stardict/repos/community-staging-i686/
stardict/repos/community-staging-i686/PKGBUILD
(from rev 149136, stardict/trunk/PKGBUILD)
stardict/repos/community-staging-i686/gcc46.patch
(from rev 149136, stardict/trunk/gcc46.patch)
stardict/repos/community-staging-i686/glib2.patch
(from rev 149136, stardict/trunk/glib2.patch)
stardict/repos/community-staging-x86_64/
stardict/repos/community-staging-x86_64/PKGBUILD
(from rev 149136, stardict/trunk/PKGBUILD)
stardict/repos/community-staging-x86_64/gcc46.patch
(from rev 149136, stardict/trunk/gcc46.patch)
stardict/repos/community-staging-x86_64/glib2.patch
(from rev 149136, stardict/trunk/glib2.patch)
--------------------------------------+
community-staging-i686/PKGBUILD | 79 +++++++++++++++++++++++++++++++++
community-staging-i686/gcc46.patch | 11 ++++
community-staging-i686/glib2.patch | 36 +++++++++++++++
community-staging-x86_64/PKGBUILD | 79 +++++++++++++++++++++++++++++++++
community-staging-x86_64/gcc46.patch | 11 ++++
community-staging-x86_64/glib2.patch | 36 +++++++++++++++
6 files changed, 252 insertions(+)
Copied: stardict/repos/community-staging-i686/PKGBUILD (from rev 149136, stardict/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-06 19:58:52 UTC (rev 149137)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+# Contributor: Neil Lin <neil at vip.url.com.tw>
+# Contributor: Cravix < dr dot neemous at gmail dot com >
+
+pkgbase=stardict
+pkgname=(stardict stardict-lite)
+pkgver=3.0.6
+pkgrel=2
+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://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgbase-$pkgver.tar.bz2"
+ 'gcc46.patch'
+ 'glib2.patch')
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -p1 -i ../gcc46.patch
+ patch -p1 -i ../glib2.patch
+
+ cp -a "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/${pkgbase}-${pkgver}-lite"
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ CXXFLAGS+=" -std=gnu++11"
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --disable-schemas-install \
+ --disable-gucharmap \
+ --disable-festival \
+ --disable-updateinfo
+ make
+
+ cd "${srcdir}/${pkgbase}-${pkgver}-lite"
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --disable-gnome-support \
+ --disable-schemas-install \
+ --disable-espeak \
+ --disable-gucharmap \
+ --disable-festival \
+ --disable-updateinfo
+ make
+}
+
+package_stardict() {
+ pkgdesc='International dictionary software'
+ depends=('enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
+
+package_stardict-lite() {
+ pkgdesc='International dictionary software - lite version without gnome and espeak support'
+ depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
+ provides=("stardict=$pkgver")
+ conflicts=(stardict)
+
+ cd "${srcdir}/${pkgbase}-${pkgver}-lite"
+ make DESTDIR="${pkgdir}" install
+}
+
+md5sums=('93371b35482e6380e8bd4ba5d256b864'
+ '52ff47441c503de07add4b7688510bc5'
+ 'b2f216897c9053c7e4666c3d78705cf1')
Copied: stardict/repos/community-staging-i686/gcc46.patch (from rev 149136, stardict/trunk/gcc46.patch)
===================================================================
--- community-staging-i686/gcc46.patch (rev 0)
+++ community-staging-i686/gcc46.patch 2015-12-06 19:58:52 UTC (rev 149137)
@@ -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-i686/glib2.patch (from rev 149136, stardict/trunk/glib2.patch)
===================================================================
--- community-staging-i686/glib2.patch (rev 0)
+++ community-staging-i686/glib2.patch 2015-12-06 19:58:52 UTC (rev 149137)
@@ -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/PKGBUILD (from rev 149136, stardict/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-06 19:58:52 UTC (rev 149137)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Aaron Griffin <aaron at archlinux.org>
+# Contributor: Neil Lin <neil at vip.url.com.tw>
+# Contributor: Cravix < dr dot neemous at gmail dot com >
+
+pkgbase=stardict
+pkgname=(stardict stardict-lite)
+pkgver=3.0.6
+pkgrel=2
+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://downloads.sourceforge.net/project/stardict-4/$pkgver/$pkgbase-$pkgver.tar.bz2"
+ 'gcc46.patch'
+ 'glib2.patch')
+
+prepare() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -p1 -i ../gcc46.patch
+ patch -p1 -i ../glib2.patch
+
+ cp -a "${srcdir}/${pkgbase}-${pkgver}" "${srcdir}/${pkgbase}-${pkgver}-lite"
+}
+
+build() {
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+
+ CXXFLAGS+=" -std=gnu++11"
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --disable-schemas-install \
+ --disable-gucharmap \
+ --disable-festival \
+ --disable-updateinfo
+ make
+
+ cd "${srcdir}/${pkgbase}-${pkgver}-lite"
+ ./autogen.sh
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --disable-gnome-support \
+ --disable-schemas-install \
+ --disable-espeak \
+ --disable-gucharmap \
+ --disable-festival \
+ --disable-updateinfo
+ make
+}
+
+package_stardict() {
+ pkgdesc='International dictionary software'
+ depends=('enchant' 'gtk2' 'libsigc++' 'libsm' 'espeak' 'libgnome')
+
+ cd "${srcdir}/${pkgbase}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
+
+package_stardict-lite() {
+ pkgdesc='International dictionary software - lite version without gnome and espeak support'
+ depends=('enchant' 'gtk2' 'libsigc++' 'libsm')
+ provides=("stardict=$pkgver")
+ conflicts=(stardict)
+
+ cd "${srcdir}/${pkgbase}-${pkgver}-lite"
+ make DESTDIR="${pkgdir}" install
+}
+
+md5sums=('93371b35482e6380e8bd4ba5d256b864'
+ '52ff47441c503de07add4b7688510bc5'
+ 'b2f216897c9053c7e4666c3d78705cf1')
Copied: stardict/repos/community-staging-x86_64/gcc46.patch (from rev 149136, stardict/trunk/gcc46.patch)
===================================================================
--- community-staging-x86_64/gcc46.patch (rev 0)
+++ community-staging-x86_64/gcc46.patch 2015-12-06 19:58:52 UTC (rev 149137)
@@ -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 149136, stardict/trunk/glib2.patch)
===================================================================
--- community-staging-x86_64/glib2.patch (rev 0)
+++ community-staging-x86_64/glib2.patch 2015-12-06 19:58:52 UTC (rev 149137)
@@ -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
+
More information about the arch-commits
mailing list