diff --git a/package/gnome2/gnome-2.conf b/package/gnome2/gnome-2.conf index 5154e6d81..61bd56eeb 100644 --- a/package/gnome2/gnome-2.conf +++ b/package/gnome2/gnome-2.conf @@ -47,6 +47,9 @@ var_append confopt " " "--disable-gtk-doc" # the X server var_append confopt " " "--disable-gtktest" +# don't run scrollkeeper updates, they will be done in a postinstall script +var_append confopt " " "--disable-scrollkeeper" + # include sub-package definitions . package/*/gtk+/gtk+-pkg.conf . package/*/scrollkeeper/scrollkeeper-pkg.conf diff --git a/package/gnome2/gnome-doc-utils/no-scrollkeeper-update.patch b/package/gnome2/gnome-doc-utils/no-scrollkeeper-update.patch deleted file mode 100644 index f750a8b44..000000000 --- a/package/gnome2/gnome-doc-utils/no-scrollkeeper-update.patch +++ /dev/null @@ -1,59 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/gnome2/gnome-doc-utils/no-scrollkeeper-update.patch -# ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./doc/xslt/Makefile.in.orig 2005-03-24 18:42:07.000000000 +0100 -+++ ./doc/xslt/Makefile.in 2005-03-24 18:43:02.000000000 +0100 -@@ -755,7 +755,6 @@ - echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \ - done -- -scrollkeeper-update -p "$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)" - - install-dsk: - echo install-dsk ---- ./doc/gnome-doc-make/Makefile.in.orig 2005-03-24 18:42:17.000000000 +0100 -+++ ./doc/gnome-doc-make/Makefile.in 2005-03-24 18:43:16.000000000 +0100 -@@ -746,7 +746,6 @@ - echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \ - done -- -scrollkeeper-update -p "$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)" - - install-dsk: - echo install-dsk ---- ./Makefile.in.orig 2005-03-24 18:41:59.000000000 +0100 -+++ ./Makefile.in 2005-03-24 18:43:38.000000000 +0100 -@@ -1072,7 +1072,6 @@ - echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \ - done -- -scrollkeeper-update -p "$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)" - - install-dsk: - echo install-dsk ---- ./gnome-doc-utils.make.orig 2005-03-24 18:42:31.000000000 +0100 -+++ ./gnome-doc-utils.make 2005-03-24 18:43:50.000000000 +0100 -@@ -569,7 +569,6 @@ - echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \ - $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \ - done -- -scrollkeeper-update -p "$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)" - - install-dsk: - echo install-dsk