[perl-Gnome2-GConf] Remove support for gconf_engine_key_is_writable() which has been removed from GConf2

Petr Pisar ppisar at fedoraproject.org
Mon Mar 9 15:35:50 UTC 2015


commit 249f05a2ffce26e36ee1c209a57e981210b9fd42
Author: Petr Písař <ppisar at redhat.com>
Date:   Mon Mar 9 16:27:37 2015 +0100

    Remove support for gconf_engine_key_is_writable() which has been removed from GConf2

 Gnome2-GConf-1.044-disable-orbit.patch | 33 +++++++++++++++++++++++++++++++++
 perl-Gnome2-GConf.spec                 | 10 +++++++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
---
diff --git a/Gnome2-GConf-1.044-disable-orbit.patch b/Gnome2-GConf-1.044-disable-orbit.patch
new file mode 100644
index 0000000..16dc85e
--- /dev/null
+++ b/Gnome2-GConf-1.044-disable-orbit.patch
@@ -0,0 +1,33 @@
+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>
+Forwarded: no
+Last-Update: 2011-11-17
+
+<https://bugzilla.redhat.com/show_bug.cgi?id=1197692>
+CPAN RT#91577
+
+
+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-Gnome2-GConf.spec b/perl-Gnome2-GConf.spec
index 78bc31d..a62c729 100644
--- a/perl-Gnome2-GConf.spec
+++ b/perl-Gnome2-GConf.spec
@@ -1,11 +1,14 @@
 Name:           perl-Gnome2-GConf
 Version:        1.044
-Release:        21%{?dist}
+Release:        22%{?dist}
 Summary:        Perl wrappers for the GConf configuration engine
 License:        LGPLv2+
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Gnome2-GConf/
 Source0:        http://www.cpan.org/modules/by-module/Gnome2/Gnome2-GConf-%{version}.tar.gz
+# Remove support for gconf_engine_key_is_writable() which has been removed
+# from GConf2, bug #1197692, CPAN RT#91577
+Patch0:         Gnome2-GConf-1.044-disable-orbit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## core
@@ -30,6 +33,7 @@ that monitors those keys. GConf is used by GNOME 2.x.
 
 %prep
 %setup -q -n Gnome2-GConf-%{version}
+%patch0 -p1
 
 
 %build
@@ -67,6 +71,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Mar 09 2015 Petr Pisar <ppisar at redhat.com> - 1.044-22
+- Remove support for gconf_engine_key_is_writable() which has been removed from
+  GConf2 (bug #1197692)
+
 * Mon Sep 01 2014 Jitka Plesnikova <jplesnik at redhat.com> - 1.044-21
 - Perl 5.20 rebuild
 


More information about the scm-commits mailing list