From fc46ab8e2f991f8636f77f666e3c37bf4a285f9d Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Fri, 31 Oct 2003 21:17:14 +0000 Subject: [PATCH] fixup the gtk+ code-path: - the flistdel code is now present in the normal gctk+.conf (like done in apache) and only this part is active for sourcing packages this completes the set of gnome24 cleanups commit (untested) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1658 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 2 ++ package/gnome24/gconf/gconf.conf | 4 +-- package/gnome24/glib/gnome-24.conf | 4 +-- package/gnome24/gtk+/gnome-24.gtk+.conf | 23 --------------- package/gnome24/gtk+/gtk+.conf | 28 +++++++++++-------- .../gnome24/scrollkeeper/scrollkeeper.conf | 2 ++ 6 files changed, 25 insertions(+), 38 deletions(-) delete mode 100644 package/gnome24/gtk+/gnome-24.gtk+.conf diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 47b909d13..d5b70022a 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -6,6 +6,8 @@ stand-alone - fixed the svnserve.init script - Chris Sirkull: Apache + - cleanup of the gnome24 sub config script gconf.conf, scrollkeeper.conf and + gtk+.conf *) 2003-10-30 (2.0.0-rc2 - 2.0.0-rc3) diff --git a/package/gnome24/gconf/gconf.conf b/package/gnome24/gconf/gconf.conf index 89dc04f7e..9d1c82715 100644 --- a/package/gnome24/gconf/gconf.conf +++ b/package/gnome24/gconf/gconf.conf @@ -20,9 +20,9 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-24.conf - if [ $pkg = "scrollkeeper" ] ; then + . $base/package/*/*/gnome-24.conf + gconf_pm() { echo "Installing cron script ..." rock_substitute $confdir/gconf.cron > $root/etc/cron.d/80-gconf diff --git a/package/gnome24/glib/gnome-24.conf b/package/gnome24/glib/gnome-24.conf index c6cf621a4..582ce5624 100644 --- a/package/gnome24/glib/gnome-24.conf +++ b/package/gnome24/glib/gnome-24.conf @@ -52,9 +52,9 @@ configure_features() { [ -z "$SHOW_CONFIG_HELP" ] && hook_add preconf 3 "configure_features" -. package/*/gconf/gconf.conf -. package/*/gtk+/gnome-24.gtk+.conf . package/*/scrollkeeper/scrollkeeper.conf +. package/*/gconf/gconf.conf +. package/*/gtk+/gtk+.conf #@FIXME temporary solution until xrender stuff is sorted out: # pkgconfig path in gnome24 must be first diff --git a/package/gnome24/gtk+/gnome-24.gtk+.conf b/package/gnome24/gtk+/gnome-24.gtk+.conf deleted file mode 100644 index 2d7bdfffb..000000000 --- a/package/gnome24/gtk+/gnome-24.gtk+.conf +++ /dev/null @@ -1,23 +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/gnome24/gtk+/gnome-24-gdkpixbuf.conf -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - -flistdel="$flistdel|etc/$prefix/gtk-2.0/gdk-pixbuf.loaders" diff --git a/package/gnome24/gtk+/gtk+.conf b/package/gnome24/gtk+/gtk+.conf index 61c386c13..c54ea82db 100644 --- a/package/gnome24/gtk+/gtk+.conf +++ b/package/gnome24/gtk+/gtk+.conf @@ -20,17 +20,23 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -. $base/package/*/*/gnome-24.conf +if [ $pkg = "gtk+" ] ; then + . $base/package/*/*/gnome-24.conf -# --enable-debug=no/minimum/yes turn on debugging [default=minimum] -# --enable-fbmanager enable framebuffer manager support (GtkFB) -var_append confopt ' ' "--with-xinput=yes" + # --enable-debug=no/minimum/yes turn on debugging [default=minimum] + # --enable-fbmanager enable framebuffer manager support (GtkFB) + var_append confopt ' ' "--with-xinput=yes" -gdkpixbuf_pm() { - echo "Installing cron script ..." - rock_substitute $confdir/gdkpixbuf.cron \ - > $root/etc/cron.d/82-gdkpixbuf - chmod +x $root/etc/cron.d/82-gdkpixbuf -} + gdkpixbuf_pm() { + echo "Installing cron script ..." + rock_substitute $confdir/gdkpixbuf.cron \ + > $root/etc/cron.d/82-gdkpixbuf + chmod +x $root/etc/cron.d/82-gdkpixbuf + } -var_append postinstall ' ' 'gdkpixbuf_pm' + var_append postinstall ' ' 'gdkpixbuf_pm' +else + # exclude some gconf files - so we do not need to patch every + # single package ... + flistdel="$flistdel|etc/$prefix/gtk-2.0/gdk-pixbuf.loaders" +fi diff --git a/package/gnome24/scrollkeeper/scrollkeeper.conf b/package/gnome24/scrollkeeper/scrollkeeper.conf index d38b40242..d50931988 100644 --- a/package/gnome24/scrollkeeper/scrollkeeper.conf +++ b/package/gnome24/scrollkeeper/scrollkeeper.conf @@ -21,6 +21,8 @@ # --- ROCK-COPYRIGHT-NOTE-END --- if [ $pkg = "scrollkeeper" ] ; then + . $base/package/*/*/gnome-24.conf + confopt="$confopt --with-omfdirs=/usr/share/omf:/usr/local/share/omf:/opt/gnome/share/omf:/$prefix/share/omf:/opt/kde31/omf" scrollkeeper_pm() {