diff options
| -rw-r--r-- | extra/gconf/.footprint | 10 | ||||
| -rw-r--r-- | extra/gconf/.md5sum | 4 | ||||
| -rwxr-xr-x | extra/gconf/GConf-2.26.2-sysconfdir-1.patch | 31 | ||||
| -rw-r--r-- | extra/gconf/Pkgfile | 19 |
4 files changed, 51 insertions, 13 deletions
diff --git a/extra/gconf/.footprint b/extra/gconf/.footprint index da9c542a0..bd6150d18 100644 --- a/extra/gconf/.footprint +++ b/extra/gconf/.footprint @@ -1,4 +1,7 @@ drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/dbus-1/ +drwxr-xr-x root/root etc/dbus-1/system.d/ +-rw-r--r-- root/root etc/dbus-1/system.d/org.gnome.GConf.Defaults.conf drwxr-xr-x root/root etc/gconf/ drwxr-xr-x root/root etc/gconf/2/ -rw-r--r-- root/root etc/gconf/2/path @@ -30,6 +33,8 @@ drwxr-xr-x root/root usr/lib/GConf/2/ -rw-r--r-- root/root usr/lib/GConf/2/libgconfbackend-xml.a -rwxr-xr-x root/root usr/lib/GConf/2/libgconfbackend-xml.la -rwxr-xr-x root/root usr/lib/GConf/2/libgconfbackend-xml.so +-rwxr-xr-x root/root usr/lib/GConf/gconf-defaults-mechanism +-rwxr-xr-x root/root usr/lib/GConf/gconf-sanity-check-2 -rwxr-xr-x root/root usr/lib/GConf/gconfd-2 -rw-r--r-- root/root usr/lib/libgconf-2.a -rwxr-xr-x root/root usr/lib/libgconf-2.la @@ -39,11 +44,16 @@ lrwxrwxrwx root/root usr/lib/libgconf-2.so.4 -> libgconf-2.so.4.1.5 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gconf-2.0.pc drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/PolicyKit/ +drwxr-xr-x root/root usr/share/PolicyKit/policy/ +-rw-r--r-- root/root usr/share/PolicyKit/policy/org.gnome.gconf.defaults.policy drwxr-xr-x root/root usr/share/aclocal/ -rw-r--r-- root/root usr/share/aclocal/gconf-2.m4 drwxr-xr-x root/root usr/share/dbus-1/ drwxr-xr-x root/root usr/share/dbus-1/services/ -rw-r--r-- root/root usr/share/dbus-1/services/org.gnome.GConf.service +drwxr-xr-x root/root usr/share/dbus-1/system-services/ +-rw-r--r-- root/root usr/share/dbus-1/system-services/org.gnome.GConf.Defaults.service drwxr-xr-x root/root usr/share/locale/ drwxr-xr-x root/root usr/share/locale/fr/ drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/ diff --git a/extra/gconf/.md5sum b/extra/gconf/.md5sum index 9546de1ea..a012553bd 100644 --- a/extra/gconf/.md5sum +++ b/extra/gconf/.md5sum @@ -1,2 +1,2 @@ -4971d96f5ba94fe4a69396267bd5afe8 GConf-2.24.0.tar.bz2 -2475a03e5ad358537b4a6ce99681ebd2 gconf-reload.patch +8670a7156807c867e153617db91b6e5d GConf-2.26.2-sysconfdir-1.patch +8b55d58dab13e821e048627aa4f92b8b GConf-2.26.2.tar.bz2 diff --git a/extra/gconf/GConf-2.26.2-sysconfdir-1.patch b/extra/gconf/GConf-2.26.2-sysconfdir-1.patch new file mode 100755 index 000000000..7a0009be6 --- /dev/null +++ b/extra/gconf/GConf-2.26.2-sysconfdir-1.patch @@ -0,0 +1,31 @@ +Submitted By: Wayne Blaszczyk +Date: 2009-09-06 +Initial Package Version: 2.26.2 +Origin: Wayne Blaszczyk +Upstream Status: Unknown +Description: Removed hardcoded /etc/gconf paths. + +diff -Naur a/gconf/default.path.in b/gconf/default.path.in +--- a/gconf/default.path.in 2009-04-25 16:44:06.000000000 +1000 ++++ b/gconf/default.path.in 2009-09-06 12:32:07.000000000 +1000 +@@ -21,7 +21,7 @@ + xml:readwrite:$(HOME)/.gconf + + # Location for system-wide settings that are set by the defaults mechanism +-xml:readonly:/etc/gconf/gconf.xml.system ++xml:readonly:@sysgconfdir@/gconf.xml.system + + # To read in any defaults settings that the Sys Admin may have created + # prior to a desktop system upgrade. The SysAdmin can stick default values +diff -Naur a/gconf/gconfd.c b/gconf/gconfd.c +--- a/gconf/gconfd.c 2009-04-25 16:44:06.000000000 +1000 ++++ b/gconf/gconfd.c 2009-09-06 12:29:41.000000000 +1000 +@@ -655,7 +655,7 @@ + + gconf_log (GCL_DEBUG, "System defaults changed. Notifying."); + +- addresses.data = "xml:merged:/etc/gconf/gconf.xml.system"; ++ addresses.data = g_strconcat("xml:merged:", GCONF_ETCDIR, "/gconf.xml.system", NULL); + addresses.next = NULL; + system_sources = gconf_sources_new_from_addresses (&addresses, NULL); + diff --git a/extra/gconf/Pkgfile b/extra/gconf/Pkgfile index 14092baf5..2027c2a44 100644 --- a/extra/gconf/Pkgfile +++ b/extra/gconf/Pkgfile @@ -2,25 +2,22 @@ # URL: http://www.gnome.org/ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -# Depends on: orbit2 +# Depends on: orbit2, policykit, glib, gtk name=gconf -version=2.24.0 +version=2.26.2 release=1 -source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.24/GConf-$version.tar.bz2\ - gconf-reload.patch) +source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.26/GConf-$version.tar.bz2\ + GConf-$version-sysconfdir-1.patch) build() { cd GConf-$version - patch -Np1 -i ../gconf-reload.patch + patch -Np1 -i ../GConf-$version-sysconfdir-1.patch ./configure --prefix=$GNOME_PREFIX\ --sysconfdir=/etc \ - --libexecdir=$(pkg-config \ - --variable=prefix ORBit-2.0)/lib/GConf \ + --libexecdir=$GNOME_PREFIX/lib/GConf \ --with-dbus-service-dir=/usr/share/dbus-1/services \ - --mandir=$(pkg-config \ - --variable=prefix ORBit-2.0)/share/man + --mandir=$GNOME_PREFIX/share/man make make DESTDIR=$PKG install - rm -r $PKG/$(pkg-config \ - --variable=prefix ORBit-2.0)/share/gtk-doc + rm -r $PKG/$GNOME_PREFIX/share/gtk-doc } |