diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-27 13:35:40 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-27 13:38:22 +0000 |
| commit | 687eb6d7542443fa3a1f3c89bd71e2572d59610f (patch) | |
| tree | 8dd32c0e03837295bff9e910d20ad9e1804e4d59 | |
| parent | 63c90766750c4a2e51a44937857f60bed207ea00 (diff) | |
| download | aports-687eb6d7542443fa3a1f3c89bd71e2572d59610f.tar.bz2 aports-687eb6d7542443fa3a1f3c89bd71e2572d59610f.tar.xz | |
main/libglade: fix libgmodule underlinking
| -rw-r--r-- | main/libglade/APKBUILD | 28 | ||||
| -rw-r--r-- | main/libglade/libglade-gmodule.patch | 12 |
2 files changed, 32 insertions, 8 deletions
diff --git a/main/libglade/APKBUILD b/main/libglade/APKBUILD index aba553fcbd..b18d93c472 100644 --- a/main/libglade/APKBUILD +++ b/main/libglade/APKBUILD @@ -1,34 +1,39 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libglade pkgver=2.6.4 -pkgrel=10 +pkgrel=11 pkgdesc="Allows you to load glade interface files in a program at runtime" url="http://www.gnome.org" arch="all" license="LGPL" subpackages="$pkgname-dev $pkgname-doc" depends="libxml2-utils" -makedepends="python pkgconfig gtk+-dev libxml2-dev" +depends_dev="gtk+-dev libxml2-dev" +makedepends="$depends_dev python autoconf automake libtool" install="$pkgname.post-install $pkgname.pre-upgrade $pkgname.post-upgrade $pkgname.post-deinstall" source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/2.6/$pkgname-$pkgver.tar.bz2 $pkgname-2.0.1-nowarning.patch + libglade-gmodule.patch " -depends_dev="gtk+-dev libxml2-dev" _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" update_config_sub || return 1 -} -package() { - cd "$_builddir" - patch -Np1 -i "$srcdir"/libglade-2.0.1-nowarning.patch || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac + done + libtoolize --force && aclocal && autoheader && autoconf \ + && automake --add-missing || return 1 } build() { cd "$_builddir" + sed -i '/DG_DISABLE_DEPRECATED/d' glade/Makefile.in || return 1 ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -48,4 +53,11 @@ package() { } md5sums="d1776b40f4e166b5e9c107f1c8fe4139 libglade-2.6.4.tar.bz2 -4f879c0ce550004905aa0fb24f25c353 libglade-2.0.1-nowarning.patch" +4f879c0ce550004905aa0fb24f25c353 libglade-2.0.1-nowarning.patch +324c7f96579f0675c37c9f83be7289a1 libglade-gmodule.patch" +sha256sums="64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec libglade-2.6.4.tar.bz2 +423c12af1c73442caa851a0b8db33b00fa4b778b1b422a4e8ac33d121d043008 libglade-2.0.1-nowarning.patch +7d13443662bbfc2e12a717a050657e054f5eced46fa75f33fc083be65bf4f285 libglade-gmodule.patch" +sha512sums="b725842febaf4c1f0d305a629ae1c61ea2de24dd6f41937e806c078fada2cea483195ef40f5238ce2045e47130c92559e984f677de667b840dd7fff0f8559735 libglade-2.6.4.tar.bz2 +5ab9dfb85938fb7e9ec637a9d68f3db961f3986e1eb9eec0d684af4ce2361c83d6998283b2bd5b4e1bd7950ca456cc3ea7fae567ac52ae391f6c9d5456c6dd2e libglade-2.0.1-nowarning.patch +8ab898ca484ebcf2fbb39a9f6e59f214f8c378f1b50c9abd1553a8dfb1e087f4bd7c90d74b5a02d2f92994707fcb3c351203669193b6511c493486e676023224 libglade-gmodule.patch" diff --git a/main/libglade/libglade-gmodule.patch b/main/libglade/libglade-gmodule.patch new file mode 100644 index 0000000000..2bf5e37243 --- /dev/null +++ b/main/libglade/libglade-gmodule.patch @@ -0,0 +1,12 @@ +--- a/configure.in 2009-03-17 07:19:01.000000000 -0700 ++++ b/configure.in 2013-02-20 14:27:10.000000000 -0800 +@@ -46,7 +46,8 @@ + libxml-2.0 >= required_libxml_version dnl + atk >= required_atk_version dnl + gtk+-2.0 >= required_gtk_version dnl +- glib-2.0 >= required_glib_version]) ++ glib-2.0 >= required_glib_version dnl ++ gmodule-2.0]) + + AC_MSG_CHECKING([for native Win32]) + case "$host" in |