[arch-commits] Commit in gconf-perl/trunk (PKGBUILD disable-orbit.patch)

[Jan de Groot]

    Date: Monday, November 28, 2011 @ 08:19:53
  Author: jgc
Revision: 143699

upgpkg: gconf-perl 1.044-6

Disable gconf_engine_key_is_writable: not available when GConf is compiled without ORBit

Added:
  gconf-perl/trunk/disable-orbit.patch
Modified:
  gconf-perl/trunk/PKGBUILD

---------------------+
 PKGBUILD            |   18 ++++++++++--------
 disable-orbit.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-11-28 13:17:55 UTC (rev 143698)
+++ PKGBUILD	2011-11-28 13:19:53 UTC (rev 143699)
@@ -2,31 +2,33 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=gconf-perl
-_realname=Gnome2-GConf
 pkgver=1.044
-pkgrel=5
+pkgrel=6
 pkgdesc="Gnome2-GConf perl bindings for gconf"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://gtk2-perl.sourceforge.net/"
 makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends')
-depends=('glib-perl' 'gconf' 'perl>=5.14')
+depends=('glib-perl' 'gconf' 'perl')
 options=(!emptydirs)
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-md5sums=('ea386003b18f067524833b0eeb271330')
+source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gnome2-GConf-${pkgver}.tar.gz
+        disable-orbit.patch)
+md5sums=('ea386003b18f067524833b0eeb271330'
+         '14852fc936ce7b552eb204913d55fd1c')
 
 build() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/Gnome2-GConf-${pkgver}"
+  patch -Np1 -i "${srcdir}/disable-orbit.patch"
   perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/Gnome2-GConf-${pkgver}"
   dbus-launch --exit-with-session make test
 }
 
 package() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/Gnome2-GConf-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }

Added: disable-orbit.patch
===================================================================
--- disable-orbit.patch	                        (rev 0)
+++ disable-orbit.patch	2011-11-28 13:19:53 UTC (rev 143699)
@@ -0,0 +1,30 @@
+Description: Disable gconf_engine_key_is_writable
+ This symbol is not available in libgconf when it is configured without
+ ORBit support, which is currently the case in Debian.
+Author: Colin Watson <cjwatson at ubuntu.com>
+Bug-Debian: http://bugs.debian.org/649055
+Forwarded: no
+Last-Update: 2011-11-17
+
+Index: b/xs/GConfEngine.xs
+===================================================================
+--- a/xs/GConfEngine.xs
++++ b/xs/GConfEngine.xs
+@@ -350,6 +350,8 @@
+ 	if (err)
+ 		gperl_croak_gerror (NULL, err);
+ 
++#if 0 /* requires gconf to be configured with ORBit support */
++
+ ##gboolean gconf_engine_key_is_writable  (GConfEngine *conf,
+ ##                                        const gchar *key,
+ ##                                        GError     **err);
+@@ -366,6 +368,8 @@
+     OUTPUT:
+         RETVAL
+ 
++#endif
++
+ guint
+ gconf_engine_notify_add (engine, namespace_section, func, data=NULL)
+ 	GConfEngine * engine