diff options
| author | Binh Nguyen <binhnguyen@fastmail.fm> | 2012-08-21 23:17:08 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2012-08-21 23:17:08 -0500 |
| commit | 7933b004fe0e3ccc3626e14a0f5c2f92883ef974 (patch) | |
| tree | a168783e8e6ad9ce01f5400af031eccf092847f4 | |
| parent | 6935f7aafc7545038071aebee7d430d491dbae5e (diff) | |
perl/perl-gnome2-gconf: Patched to build with GConf-3.x
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
| -rw-r--r-- | perl/perl-gnome2-gconf/README | 2 | ||||
| -rw-r--r-- | perl/perl-gnome2-gconf/disable-orbit.patch | 30 | ||||
| -rw-r--r-- | perl/perl-gnome2-gconf/perl-gnome2-gconf.SlackBuild | 8 |
3 files changed, 36 insertions, 4 deletions
diff --git a/perl/perl-gnome2-gconf/README b/perl/perl-gnome2-gconf/README index af2fa770ac9e0..063da9998e978 100644 --- a/perl/perl-gnome2-gconf/README +++ b/perl/perl-gnome2-gconf/README @@ -1,3 +1 @@ Perl bindings for GConf. - -This requires perl-glib. diff --git a/perl/perl-gnome2-gconf/disable-orbit.patch b/perl/perl-gnome2-gconf/disable-orbit.patch new file mode 100644 index 0000000000000..acee9fb3e6987 --- /dev/null +++ b/perl/perl-gnome2-gconf/disable-orbit.patch @@ -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@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 diff --git a/perl/perl-gnome2-gconf/perl-gnome2-gconf.SlackBuild b/perl/perl-gnome2-gconf/perl-gnome2-gconf.SlackBuild index 2edf5e8c96ec4..9885334ab4a7a 100644 --- a/perl/perl-gnome2-gconf/perl-gnome2-gconf.SlackBuild +++ b/perl/perl-gnome2-gconf/perl-gnome2-gconf.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for perl-gnome2-gconf -# Copyright 2010 Binh Nguyen <binhnguyen@fastmail.fm> +# Copyright 2010, 2012 Binh Nguyen <binhnguyen@fastmail.fm> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=perl-gnome2-gconf VERSION=${VERSION:-1.044} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} SRCNAM=Gnome2-GConf @@ -71,6 +71,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Apply a patch from Debian +# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649055 +patch -p1 < $CWD/disable-orbit.patch + perl Makefile.PL \ OPTIMIZE="$SLKCFLAGS" \ PREFIX=/usr \ |