From fb31cbbdf67256609487aa42bdda09af4fc242ee Mon Sep 17 00:00:00 2001 From: jmmv Date: Tue, 18 Feb 2003 20:52:05 +0000 Subject: GConf2's buildlink2.mk now creates a gconftool-2 wrapper which prevents the configuration database from beeing modified by packages that do not honour the --disable-schemas-install option. There is no need to patch these broken packages any more. Okay'ed by wiz. --- x11/gnome-panel/distinfo | 8 ++++---- x11/gnome-panel/patches/patch-ac | 11 +---------- x11/gnome-panel/patches/patch-ad | 11 +---------- x11/gnome-panel/patches/patch-ag | 11 +---------- x11/gnome-session/distinfo | 3 +-- x11/gnome-session/patches/patch-aa | 13 ------------- x11/gnome2-control-center/distinfo | 3 +-- x11/gnome2-control-center/patches/patch-aa | 13 ------------- x11/gnome2-terminal/distinfo | 4 ++-- x11/gnome2-terminal/patches/patch-aa | 10 +--------- 10 files changed, 12 insertions(+), 75 deletions(-) delete mode 100644 x11/gnome-session/patches/patch-aa delete mode 100644 x11/gnome2-control-center/patches/patch-aa (limited to 'x11') diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index 61271397449..c4c6dcb6b18 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.4 2003/02/15 12:02:34 jmmv Exp $ +$NetBSD: distinfo,v 1.5 2003/02/18 20:52:08 jmmv Exp $ SHA1 (gnome-panel-2.2.0.1.tar.bz2) = 5da094f37dfb5433bcd7eba42ceea9c86e11e586 Size (gnome-panel-2.2.0.1.tar.bz2) = 1775486 bytes SHA1 (patch-ab) = 4673a6b83dc31e129e81419275fe3f60ad7b7eda -SHA1 (patch-ac) = 01ee6684dca4076384c96d869e7e77ff68e55f2a -SHA1 (patch-ad) = 137b18f7fcbebbe12126278e94c85a281a5d80ca +SHA1 (patch-ac) = fbf30d038322cd2366bcd2c67088d5a5369edd03 +SHA1 (patch-ad) = 68ef55c876e70fb6e8b20eb415e0e31aa111da28 SHA1 (patch-ae) = 0e2b0efbce597d5517b05216ed3eaaa5ae5b7351 SHA1 (patch-af) = 78d8cecec09db1743b640b9b516033b1fc8f96d4 -SHA1 (patch-ag) = be9305fbaa08a946b2850bde2e69aed9dd5a55d9 +SHA1 (patch-ag) = 6f039752a72d21ae3ad38673c10937adbf403141 diff --git a/x11/gnome-panel/patches/patch-ac b/x11/gnome-panel/patches/patch-ac index 2dc0e202aa7..981b81015ab 100644 --- a/x11/gnome-panel/patches/patch-ac +++ b/x11/gnome-panel/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.3 2003/02/15 12:02:34 jmmv Exp $ +$NetBSD: patch-ac,v 1.4 2003/02/18 20:52:09 jmmv Exp $ --- applets/gen_util/Makefile.in.orig 2003-02-04 00:29:54.000000000 +0100 +++ applets/gen_util/Makefile.in @@ -40,12 +40,3 @@ $NetBSD: patch-ac,v 1.3 2003/02/15 12:02:34 jmmv Exp $ fi; fi; \ done -@@ -641,7 +642,7 @@ GNOME_GenUtilApplet_Factory.server.in: G - - # don't do this if we are building in eg. rpm - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -+ if false; then \ - for p in $(schemas_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/gen_util/$$p ; \ - done \ diff --git a/x11/gnome-panel/patches/patch-ad b/x11/gnome-panel/patches/patch-ad index 0bace0bd3a5..106955aed38 100644 --- a/x11/gnome-panel/patches/patch-ad +++ b/x11/gnome-panel/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.2 2003/02/14 21:05:28 jmmv Exp $ +$NetBSD: patch-ad,v 1.3 2003/02/18 20:52:09 jmmv Exp $ --- applets/fish/Makefile.in.orig 2003-02-04 00:29:54.000000000 +0100 +++ applets/fish/Makefile.in @@ -33,12 +33,3 @@ $NetBSD: patch-ad,v 1.2 2003/02/14 21:05:28 jmmv Exp $ else :; fi; \ done -@@ -574,7 +575,7 @@ $(server_in_files): $(server_in_files).i - - # don't do this if we are building in eg. rpm - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -+ if false; then \ - for p in $(schemas_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/applets/fish/$$p ; \ - done \ diff --git a/x11/gnome-panel/patches/patch-ag b/x11/gnome-panel/patches/patch-ag index 87a1e381daa..3a77bd7e69b 100644 --- a/x11/gnome-panel/patches/patch-ag +++ b/x11/gnome-panel/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1 2003/02/14 21:05:28 jmmv Exp $ +$NetBSD: patch-ag,v 1.2 2003/02/18 20:52:09 jmmv Exp $ --- gnome-panel/Makefile.in.orig 2003-02-04 00:29:51.000000000 +0100 +++ gnome-panel/Makefile.in @@ -11,12 +11,3 @@ $NetBSD: patch-ag,v 1.1 2003/02/14 21:05:28 jmmv Exp $ schemas_in_files = panel-global-config.schemas.in panel-per-panel-config.schemas.in gnome-panel-screenshot.schemas.in $(NULL) schemas_DATA = $(schemas_in_files:.schemas.in=.schemas) -@@ -959,7 +959,7 @@ panel-typebuiltins.h: @REBUILD@ $(panel_ - @INTLTOOL_SCHEMAS_RULE@ - - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -+ if false; then \ - for p in $(schemas_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-panel/$$p ; \ - done \ diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 4c0a378f56d..d11209a9507 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.3 2003/02/14 21:08:39 jmmv Exp $ +$NetBSD: distinfo,v 1.4 2003/02/18 20:52:09 jmmv Exp $ SHA1 (gnome-session-2.2.0.2.tar.bz2) = 7a40ddad89135a5bcd26d54e71871d3531040229 Size (gnome-session-2.2.0.2.tar.bz2) = 736370 bytes -SHA1 (patch-aa) = 74b3ecc90f529c070826de2de7c29652e5980967 SHA1 (patch-ab) = 6a7b9394c41442c4181f4efb33f7ea7c61ee6f6b SHA1 (patch-ac) = 2b467144bbf8f42a7a0796840c42ba8537aa8634 SHA1 (patch-ad) = 24901462a72294008ef4f219668323fc159eaea0 diff --git a/x11/gnome-session/patches/patch-aa b/x11/gnome-session/patches/patch-aa deleted file mode 100644 index 14b68fb1d09..00000000000 --- a/x11/gnome-session/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2003/02/14 21:08:39 jmmv Exp $ - ---- gnome-session/Makefile.in.orig 2003-02-04 00:00:04.000000000 +0100 -+++ gnome-session/Makefile.in -@@ -658,7 +658,7 @@ default.wm: default.wm.in ../config.stat - - # don't do this if we are building in eg. rpm - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -+ if false; then \ - for p in $(schemas_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/gnome-session/$$p ; \ - done \ diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo index ca1875aea63..0e9bbea0b0b 100644 --- a/x11/gnome2-control-center/distinfo +++ b/x11/gnome2-control-center/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.2 2003/02/14 21:03:41 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2003/02/18 20:52:09 jmmv Exp $ SHA1 (control-center-2.2.0.1.tar.bz2) = 620dab3ee2e17124dff948cd362d83ca0ef28135 Size (control-center-2.2.0.1.tar.bz2) = 1462388 bytes -SHA1 (patch-aa) = 7e84fc5046e6e2401f40004ddf2aea69b13dd4a6 diff --git a/x11/gnome2-control-center/patches/patch-aa b/x11/gnome2-control-center/patches/patch-aa deleted file mode 100644 index d95dee8d882..00000000000 --- a/x11/gnome2-control-center/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2003/02/14 21:03:41 jmmv Exp $ - ---- schemas/Makefile.in.orig 2003-02-14 15:11:06.000000000 +0100 -+++ schemas/Makefile.in -@@ -280,7 +280,7 @@ maintainer-clean - - # don't do this if we are building in eg. rpm - install-data-local: -- if test -z "$(DESTDIR)" ; then \ -+ if false; then \ - for p in $(schema_DATA) ; do \ - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \ - done \ diff --git a/x11/gnome2-terminal/distinfo b/x11/gnome2-terminal/distinfo index 81e5f8750be..0b3075501d0 100644 --- a/x11/gnome2-terminal/distinfo +++ b/x11/gnome2-terminal/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2003/02/14 21:13:35 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2003/02/18 20:52:10 jmmv Exp $ SHA1 (gnome-terminal-2.0.1.tar.bz2) = 514a21a00f9a6b87161f4b90acc553ec3ede02a1 Size (gnome-terminal-2.0.1.tar.bz2) = 616470 bytes -SHA1 (patch-aa) = 45f8eb55e2ecaaf36ad580c325cf42a146f30f1f +SHA1 (patch-aa) = f87211a54c16b23730566c8149a1b3f5efbd6acd diff --git a/x11/gnome2-terminal/patches/patch-aa b/x11/gnome2-terminal/patches/patch-aa index 6a408de3347..0b622ed6cdb 100644 --- a/x11/gnome2-terminal/patches/patch-aa +++ b/x11/gnome2-terminal/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2003/02/14 21:13:35 jmmv Exp $ +$NetBSD: patch-aa,v 1.3 2003/02/18 20:52:10 jmmv Exp $ --- src/Makefile.in.orig Mon Aug 5 03:05:07 2002 +++ src/Makefile.in @@ -11,11 +11,3 @@ $NetBSD: patch-aa,v 1.2 2003/02/14 21:13:35 jmmv Exp $ else :; fi; \ done -@@ -603,7 +603,6 @@ maintainer-clean-generic clean mostlycle - - - install-data-local: -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA) - - regenerate-built-sources: - EGGFILES="$(EGGFILES)" EGGDIR="$(EGGDIR)" $(srcdir)/update-from-egg.sh -- cgit v1.2.3