Use gconf-merge-schema in pkgs installing gconf schema files.

--HG-- branch : gnome3
2011-03-04 14:38:01 +01:00 · 2011-03-04 14:38:01 +01:00 · fb09b8d4d4
commit fb09b8d4d4
parent 1d60222203
13 changed files with 103 additions and 3 deletions
--- a/srcpkgs/gdm/template
+++ b/srcpkgs/gdm/template
@ -1,6 +1,7 @@
 # Template file for 'gdm'
 pkgname=gdm
 version=2.91.91
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
@ -93,4 +94,8 @@ post_install()
 	# Transform ${exec_prefix} to start at-spi-registryd!
 	sed -i -e "s|\${exec_prefix}|/usr|" \
 		${DESTDIR}//usr/share/gdm/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
+
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname} ${wrksrc}/*.schemas
 }
--- a/srcpkgs/gnome-control-center/template
+++ b/srcpkgs/gnome-control-center/template
@ -1,6 +1,7 @@
 # Template file for 'gnome-control-center'
 pkgname=gnome-control-center
 version=2.91.90
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
@ -79,4 +80,8 @@ post_install()
 {
 	rm -f ${DESTDIR}//usr/share/applications/mimeinfo.cache
 	mv ${DESTDIR}/usr/share/pkgconfig/* ${DESTDIR}/usr/lib/pkgconfig
+
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname}-2.0 ${wrksrc}/*.schemas
 }
--- a/srcpkgs/gnome-panel/template
+++ b/srcpkgs/gnome-panel/template
@ -1,6 +1,7 @@
 # Template file for 'gnome-panel'
 pkgname=gnome-panel
 version=2.91.90
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
@ -83,3 +84,14 @@ Add_dependency build libXau-devel

 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils
+
+post_install()
+{
+	local f
+
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	for f in ${gconf_schemas}; do
+		gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${f} \
+                	--domain ${pkgname}-3.0 ${wrksrc}/${f}
+	done
+}
--- a/srcpkgs/gnome-shell/template
+++ b/srcpkgs/gnome-shell/template
@ -1,6 +1,7 @@
 # Template file for 'gnome-shell'
 pkgname=gnome-shell
 version=2.91.90
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-schemas-compile
@ -126,3 +127,11 @@ pre_configure()
 	export LDFLAGS="-Wl,-R/usr/lib/xulrunner-1.9.2 -Wl,-R/usr/lib/gnome-bluetooth"
 	export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ldlibpaths"
 }
+
+post_install()
+{
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname} ${wrksrc}/*.schemas
+}
+
--- a/srcpkgs/gnome-terminal/template
+++ b/srcpkgs/gnome-terminal/template
@ -1,6 +1,7 @@
 # Template file for 'gnome-terminal'
 pkgname=gnome-terminal
 version=2.33.90
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.33/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
@ -57,3 +58,12 @@ Add_dependency build libX11-devel
 Add_dependency build gtk+-devel
 Add_dependency build vte-devel		">=0.26"
 Add_dependency build GConf-devel
+
+Add_dependency full desktop-file-utils
+
+post_install()
+{
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname} ${wrksrc}/*.schemas
+}
--- a/srcpkgs/gnome-utils/template
+++ b/srcpkgs/gnome-utils/template
@ -1,6 +1,7 @@
 # Template file for 'gnome-utils'
 pkgname=gnome-utils
 version=2.91.90
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
@ -59,3 +60,10 @@ Add_dependency build fontconfig-devel

 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils
+
+post_install()
+{
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname}-2.0 ${wrksrc}/*.schemas
+}
--- a/srcpkgs/gst-plugins-good/template
+++ b/srcpkgs/gst-plugins-good/template
@ -1,6 +1,7 @@
 # Template file for 'gst-plugins-good'.
 pkgname=gst-plugins-good
 version=0.10.27
+revision=1
 distfiles="http://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-gudev --with-libv4l2 --enable-experimental
@ -86,7 +87,9 @@ Add_dependency build wavpack-devel
 Add_dependency build coreutils
 Add_dependency build diffutils

-pre_configure()
+post_install()
 {
-	export PATH="/bin:/usr/bin:$PATH"
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname}-0.10 ${wrksrc}/*.schemas
 }
--- a/srcpkgs/gucharmap/template
+++ b/srcpkgs/gucharmap/template
@ -1,6 +1,7 @@
 # Template file for 'gucharmap'
 pkgname=gucharmap
 version=2.33.2
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.33/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --disable-scrollkeeper
@ -45,3 +46,10 @@ Add_dependency build GConf-devel

 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils
+
+post_install()
+{
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname} ${wrksrc}/*.schemas
+}
--- a/srcpkgs/libgweather/template
+++ b/srcpkgs/libgweather/template
@ -1,6 +1,7 @@
 # Template file for 'libgweather'
 pkgname=libgweather
 version=2.91.6
+revision=1
 patch_args="-Np1"
 distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@ -50,3 +51,10 @@ Add_dependency build libsoup-gnome-devel
 Add_dependency build GConf-devel

 Add_dependency full gnome-icon-theme
+
+post_install()
+{
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname}-3.0 ${wrksrc}/*.schemas
+}
--- a/srcpkgs/metacity/template
+++ b/srcpkgs/metacity/template
@ -1,6 +1,7 @@
 # Template file for 'metacity'
 pkgname=metacity
 version=2.30.3
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.30/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --localstatedir=/var
@ -67,3 +68,10 @@ Add_dependency build libX11-devel
 Add_dependency build libXext-devel
 Add_dependency build libXinerama-devel
 Add_dependency full zenity
+
+post_install()
+{
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname} ${wrksrc}/*.schemas
+}
--- a/srcpkgs/mutter/template
+++ b/srcpkgs/mutter/template
@ -1,6 +1,7 @@
 # Template file for 'mutter'
 pkgname=mutter
 version=2.91.90
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --disable-scrollkeeper
@ -86,3 +87,10 @@ Add_dependency build fontconfig-devel
 Add_dependency build libffi-devel

 Add_dependency full desktop-file-utils
+
+post_install()
+{
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname} ${wrksrc}/*.schemas
+}
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@ -1,6 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=0.8.3.997
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --localstatedir=/var
@ -71,3 +72,11 @@ Add_dependency build gnome-bluetooth-devel
 Add_dependency full notification-daemon
 Add_dependency full hicolor-icon-theme
 Add_dependency full polkit-gnome
+
+post_install()
+{
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain nm-applet ${wrksrc}/*.schemas
+}
+
--- a/srcpkgs/seahorse/template
+++ b/srcpkgs/seahorse/template
@ -1,6 +1,7 @@
 # Template file for 'seahorse'
 pkgname=seahorse
 version=2.91.4
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/2.91/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --disable-scrollkeeper --with-gtk=3.0
@ -72,7 +73,13 @@ Add_dependency build avahi-glib-libs-devel
 Add_dependency build gnome-keyring-devel
 Add_dependency build libnotify-devel

-
 Add_dependency full openssh-client
 Add_dependency full hicolor-icon-theme
 Add_dependency full desktop-file-utils
+
+post_install()
+{
+	mv ${DESTDIR}/usr/share/gconf/schemas/*.schemas ${wrksrc}
+	gconf-merge-schema ${DESTDIR}/usr/share/gconf/schemas/${gconf_schemas} \
+		--domain ${pkgname} ${wrksrc}/*.schemas
+}