diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-07-13 22:37:46 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-07-13 22:44:51 -0300 |
| commit | 5b54f2983832fbfc42047ec7fb5305d1ca922f6f (patch) | |
| tree | 025507428163b59cf498135e4719685a66944352 | |
| parent | c9f2a0c8deca5c9bba672a5924fbdd454bdf8cef (diff) | |
| download | aports-5b54f2983832fbfc42047ec7fb5305d1ca922f6f.tar.bz2 aports-5b54f2983832fbfc42047ec7fb5305d1ca922f6f.tar.xz | |
testing/stardict: drop gconf dependency
| -rw-r--r-- | testing/stardict/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/stardict/gconf.patch | 32 |
2 files changed, 39 insertions, 10 deletions
diff --git a/testing/stardict/APKBUILD b/testing/stardict/APKBUILD index e616e21461..369ea90ace 100644 --- a/testing/stardict/APKBUILD +++ b/testing/stardict/APKBUILD @@ -1,31 +1,29 @@ # Maintainer: Taner Tas <taner76@gmail.com> pkgname=stardict pkgver=3.0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Cross-platform and international dictionary software" url="http://stardict-4.sourceforge.net/" arch="all" -license="GPL" -depends="gtk+2.0 libsigc++ zlib" +license="GPL-3.0-or-later" makedepends="automake autoconf libtool gtk+2.0-dev libsigc++-dev libxml2-dev gnome-doc-utils - gnome-common enchant-dev espeak-dev zlib-dev mariadb-connector-c-dev gconf-dev" + gnome-common enchant-dev espeak-dev zlib-dev mariadb-connector-c-dev" subpackages="$pkgname-doc $pkgname-lang $pkgname-help::noarch" source="https://downloads.sourceforge.net/project/stardict-4/${pkgver}/${pkgname}-${pkgver}.tar.bz2 gcc46.patch glib2.patch mariadb.patch + gconf.patch " options="!check" prepare() { - cd "$builddir" default_prepare ./autogen.sh find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f } build() { - cd "$builddir" export CXXFLAGS="$CXXLAGS -std=gnu++11" ./configure \ --build=$CBUILD \ @@ -45,13 +43,11 @@ build() { make } -check(){ - cd "$builddir" +check() { make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } @@ -66,4 +62,5 @@ help() { sha512sums="81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658 stardict-3.0.6.tar.bz2 cc43b57cdf2e7fbd3e9c86acb4c8f9fef367d68f6f027e75774eec9cdf66b3fdd3b0bc58d373d076cb38671e09012ab69b8b7e81638a5be888af56372e65a838 gcc46.patch 4132eee58ab5dfb30105fd2c1a113d143528f7e904ededbb8de203bbb244377aed2c152aae7f383936e74005c2f4afa6128674a245d2a8083b2757b1ca90dd24 glib2.patch -4b47cd6beb425316cdbe45ec8b6b965521ba20a956fe6a39a49da0b5e774b3ff5bc8ade19aa03216d3405ec7fbee9ed37add0a7ec07c090a6872eb2ae2654db9 mariadb.patch" +4b47cd6beb425316cdbe45ec8b6b965521ba20a956fe6a39a49da0b5e774b3ff5bc8ade19aa03216d3405ec7fbee9ed37add0a7ec07c090a6872eb2ae2654db9 mariadb.patch +efa225a0ff285ee81788311c0ed9875ebc93d64fb4943b8de6ba27d945e781936eebcab4c742b29cb6c8c810f5fd3f478db98cb06128e7aa552fb8512838bad6 gconf.patch" diff --git a/testing/stardict/gconf.patch b/testing/stardict/gconf.patch new file mode 100644 index 0000000000..3c430ab67f --- /dev/null +++ b/testing/stardict/gconf.patch @@ -0,0 +1,32 @@ +From: Jeremy Bicha <jbicha@debian.org> +Date: Tue, 16 Oct 2018 22:55:32 -0400 +Subject: build without gconf + +dict/doc/Readme.mac recommends removing the AM_GCONF_SOURCE_2 lines + +which also makes autoreconf happy +--- + dict/configure.ac | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/dict/configure.ac b/dict/configure.ac +index 3225c6e..fc7101a 100644 +--- a/dict/configure.ac ++++ b/dict/configure.ac +@@ -318,7 +318,6 @@ elif test "x${enable_maemo_support}" = "xyes" ; then + if test x"$GCONFTOOL" = xno; then + AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) + fi +- AM_GCONF_SOURCE_2 + elif test "x${enable_darwin_support}" = "xyes" ; then + echo "Enable darwin suppport"; + AC_DEFINE([CONFIG_DARWIN],[], [Compile with darwin support]) +@@ -339,7 +338,6 @@ dnl ********************************************* + if test x"$GCONFTOOL" = xno; then + AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) + fi +- AM_GCONF_SOURCE_2 + + dnl ========================================================================== + dnl stuff for the CORBA interface + |