diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-25 10:52:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-04-25 10:53:24 +0000 |
| commit | eafb25d93e2a0189eee37cb308a718e6f9f9f584 (patch) | |
| tree | 405608f088913c9ff6eed18dc794913a624da93f /main/libbonobo | |
| parent | ea32cee8ba718275c154e77e62b4f03ba6f43901 (diff) | |
| download | aports-eafb25d93e2a0189eee37cb308a718e6f9f9f584.tar.bz2 aports-eafb25d93e2a0189eee37cb308a718e6f9f9f584.tar.xz | |
main/libbonobo: build fix for glib-2.36
Diffstat (limited to 'main/libbonobo')
| -rw-r--r-- | main/libbonobo/APKBUILD | 14 | ||||
| -rw-r--r-- | main/libbonobo/glib-2.36.patch | 16 |
2 files changed, 26 insertions, 4 deletions
diff --git a/main/libbonobo/APKBUILD b/main/libbonobo/APKBUILD index 1349a9ce04..e1150894c7 100644 --- a/main/libbonobo/APKBUILD +++ b/main/libbonobo/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libbonobo pkgver=2.32.1 -pkgrel=4 +pkgrel=5 pkgdesc="GNOME base library" url="http://www.gnome.org/" arch="all" @@ -12,7 +12,8 @@ depends_dev="gtk+-dev libidl-dev orbit2-dev popt-dev libxml2-dev" makedepends="$depends_dev flex bison" install= subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="http://ftp.acc.umu.se/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2" +source="http://ftp.acc.umu.se/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 + glib-2.36.patch" _builddir="${srcdir}/${pkgname}-${pkgver}" prepare() { @@ -33,7 +34,7 @@ build() { cd "$_builddir" ./configure --prefix=/usr \ --sysconfdir=/etc \ - --disable-scrollkeeper + || return 1 make || return 1 } @@ -44,4 +45,9 @@ package() { find "$pkgdir" -name '*.la' -delete } -md5sums="27fa902d4fdf6762ee010e7053aaf77b libbonobo-2.32.1.tar.bz2" +md5sums="27fa902d4fdf6762ee010e7053aaf77b libbonobo-2.32.1.tar.bz2 +350a8e151bd1118f29e603fc5446ff5a glib-2.36.patch" +sha256sums="9160d4f277646400d3bb6b4fa73636cc6d1a865a32b9d0760e1e9e6ee624976b libbonobo-2.32.1.tar.bz2 +24b83c948e99dc600c91fc64aafa874422629f1dd42f7085c7f205d5cd8a9808 glib-2.36.patch" +sha512sums="271e34ddb16a1ef756064c062e29bac333f3e109e3efd6db43857db3b2b4259c0c53d2480ac4945cd511b10bc7a1b770a966421bf80655bbfd301f565622c69a libbonobo-2.32.1.tar.bz2 +a810e84c35daa5816cc535ab378eef4502516a6f1e3dc41f603ab24b614adf18362f1ce0282b1e38a5220894fb937f51de9a39c6b0e3b5dbb5a2aacb58215f8d glib-2.36.patch" diff --git a/main/libbonobo/glib-2.36.patch b/main/libbonobo/glib-2.36.patch new file mode 100644 index 0000000000..14980b19eb --- /dev/null +++ b/main/libbonobo/glib-2.36.patch @@ -0,0 +1,16 @@ +$NetBSD: patch-activation-server_Makefile.in,v 1.1 2013/04/19 14:56:20 prlw1 Exp $ + +Avoid compilation error caused by use of GStaticRecMutex which was +deprecated in GLib 2.32 - needed for a successful compile with +GLib 2.36. + +--- a/activation-server/Makefile.in.orig 2013-04-19 14:38:19.000000000 +0000 ++++ b/activation-server/Makefile.in +@@ -341,7 +341,6 @@ INCLUDES = \ + $(SERVER_CFLAGS) \ + $(WARN_CFLAGS) \ + -DSERVER_CONFDIR=\"$(sysconfdir)\" \ +- -DG_DISABLE_DEPRECATED \ + -DG_LOG_DOMAIN=\"Bonobo-Activation-Server\" \ + $(NULL) + |