From a40a0c843cf7397bbbc1b84da819ad087174a18d Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 17 Nov 2006 09:55:54 +0000 Subject: [PATCH] Stefan Fiedler: change build order of various files evolution, evolution-data-server: build with nspr seahorse: downgrade to 0.8.5 gst-plugins-{base,good}: downgrade to gnome 2.16 version fix some .conf files [2006102019333627760] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8040 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/gnome2/gtkextra/fix_autogen.patch | 31 --------------- .../gnome2/gtkextra/fix_configure_in.patch | 39 ------------------- package/gnome2/gtkextra/gtkextra.conf | 2 - .../gnome2/gtkextra/gtkpsfont-hotfix.patch | 30 -------------- .../hicolor-icon-theme-pkg.conf | 26 +++++++++++++ .../icon-naming-utils/icon-naming-utils.desc | 2 +- package/gnome2/iso-codes/iso-codes.desc | 2 +- package/gnome2/pygobject/pygobject.conf | 4 +- package/gnome2/pygobject/pygobject.desc | 2 +- package/gnome2/seahorse/seahorse.desc | 4 +- package/gnome2/totem/totem.desc | 2 +- package/import/cpan/hosted_cpan.cfg | 2 +- package/import/cpan/hosted_cpan.txt | 2 +- 13 files changed, 37 insertions(+), 111 deletions(-) delete mode 100644 package/gnome2/gtkextra/fix_autogen.patch delete mode 100644 package/gnome2/gtkextra/fix_configure_in.patch delete mode 100644 package/gnome2/gtkextra/gtkpsfont-hotfix.patch create mode 100644 package/gnome2/hicolor-icon-theme/hicolor-icon-theme-pkg.conf diff --git a/package/gnome2/gtkextra/fix_autogen.patch b/package/gnome2/gtkextra/fix_autogen.patch deleted file mode 100644 index 3714e3473..000000000 --- a/package/gnome2/gtkextra/fix_autogen.patch +++ /dev/null @@ -1,31 +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/gtkextra/fix_autogen.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 --- - ---- ./autogen.sh.old Thu Jul 18 20:55:51 2002 -+++ ./autogen.sh Sun Feb 2 22:41:49 2003 -@@ -50,7 +50,8 @@ - if ( aclocal --version ) /dev/null 2>&1; then - rm -f aclocal.m4 - echo -n "Building aclocal.m4... " -- ${ACLOCAL} -+ ${ACLOCAL} -I /opt/gnome2/share/aclocal -+ ${ACLOCAL} -I /opt/gnome24/share/aclocal - echo "done." - else - echo "aclocal not found -- aborting `basename $0`" diff --git a/package/gnome2/gtkextra/fix_configure_in.patch b/package/gnome2/gtkextra/fix_configure_in.patch deleted file mode 100644 index f47c7ebe1..000000000 --- a/package/gnome2/gtkextra/fix_configure_in.patch +++ /dev/null @@ -1,39 +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/gtkextra/fix_configure_in.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 --- - ---- ./configure.in.old Mon Jul 22 19:09:14 2002 -+++ ./configure.in Sun Feb 2 22:46:21 2003 -@@ -4,7 +4,7 @@ - # Save this value here, since automake will set cflags later - cflags_set=${CFLAGS+set} - --AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl -+AC_DIVERT_PUSH(NOTICE)dnl - # Making releases: - # GTK_EXTRA_MICRO_VERSION += 1; - # GTK_EXTRA_INTERFACE_AGE += 1; -@@ -20,7 +20,7 @@ - GTK_EXTRA_BINARY_AGE=0 - GTK_EXTRA_VERSION=$GTK_EXTRA_MAJOR_VERSION.$GTK_EXTRA_MINOR_VERSION.$GTK_EXTRA_MICRO_VERSION - dnl --AC_DIVERT_POP()dnl -+AC_DIVERT_POP()dnl - - AC_SUBST(GTK_EXTRA_MAJOR_VERSION) - AC_SUBST(GTK_EXTRA_MINOR_VERSION) diff --git a/package/gnome2/gtkextra/gtkextra.conf b/package/gnome2/gtkextra/gtkextra.conf index 54028256b..b95bc0111 100644 --- a/package/gnome2/gtkextra/gtkextra.conf +++ b/package/gnome2/gtkextra/gtkextra.conf @@ -21,5 +21,3 @@ # --- ROCK-COPYRIGHT-NOTE-END --- . $base/package/gnome2/gnome-2.conf - -preconf="./autogen.sh" diff --git a/package/gnome2/gtkextra/gtkpsfont-hotfix.patch b/package/gnome2/gtkextra/gtkpsfont-hotfix.patch deleted file mode 100644 index 433ee896f..000000000 --- a/package/gnome2/gtkextra/gtkpsfont-hotfix.patch +++ /dev/null @@ -1,30 +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/gtkextra/gtkpsfont-hotfix.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 --- - ---- gtkextra-2-20031116/gtkextra/gtkpsfont.c.orig 2003-11-27 06:25:54.000000000 +0100 -+++ gtkextra-2-20031116/gtkextra/gtkpsfont.c 2003-11-27 06:26:36.000000000 +0100 -@@ -357,7 +357,7 @@ - { - GList *list; - -- if(psfont_refcont <= 0) return; -+ if(psfont_refcount <= 0) return; - - psfont_refcount--; - diff --git a/package/gnome2/hicolor-icon-theme/hicolor-icon-theme-pkg.conf b/package/gnome2/hicolor-icon-theme/hicolor-icon-theme-pkg.conf new file mode 100644 index 000000000..7c8a2010c --- /dev/null +++ b/package/gnome2/hicolor-icon-theme/hicolor-icon-theme-pkg.conf @@ -0,0 +1,26 @@ +# --- 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/scrollkeeper/scrollkeeper-pkg.conf +# ROCK Linux is Copyright (C) 1998 - 2006 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 --- + +# exclude some hicolor-icon-theme files - so we do not need to patch every +# single package ... +var_append flistdel '|' \ + "$ROCKCFG_PKG_GNOME2_CORE_PREFIX/share/icons/hicolor/icon-theme.cache" diff --git a/package/gnome2/icon-naming-utils/icon-naming-utils.desc b/package/gnome2/icon-naming-utils/icon-naming-utils.desc index 043bd4fb1..10fc595ba 100644 --- a/package/gnome2/icon-naming-utils/icon-naming-utils.desc +++ b/package/gnome2/icon-naming-utils/icon-naming-utils.desc @@ -36,7 +36,7 @@ [L] GPL [S] Stable [V] 0.8.1 -[P] X -----5---9 800.000 +[P] X -----5---9 144.500 [D] 4128380951 icon-naming-utils-0.8.1.tar.gz http://tango-project.org/releases/ diff --git a/package/gnome2/iso-codes/iso-codes.desc b/package/gnome2/iso-codes/iso-codes.desc index efb034071..aa10d0059 100644 --- a/package/gnome2/iso-codes/iso-codes.desc +++ b/package/gnome2/iso-codes/iso-codes.desc @@ -50,7 +50,7 @@ [L] LGPL [S] Beta [V] 0.55 -[P] X -?---5---9 208.600 +[P] X -?---5---9 180.100 [D] 3119000820 iso-codes_0.55-1.tar.gz http://ftp.debian.org/debian/pool/main/i/iso-codes/ diff --git a/package/gnome2/pygobject/pygobject.conf b/package/gnome2/pygobject/pygobject.conf index 964bc4a92..21943d371 100644 --- a/package/gnome2/pygobject/pygobject.conf +++ b/package/gnome2/pygobject/pygobject.conf @@ -1 +1,3 @@ -. /package/gnome2/gnome-2.conf +. $base/package/gnome2/gnome-2.conf + +runpysetup=0 diff --git a/package/gnome2/pygobject/pygobject.desc b/package/gnome2/pygobject/pygobject.desc index afee05076..f17db6401 100644 --- a/package/gnome2/pygobject/pygobject.desc +++ b/package/gnome2/pygobject/pygobject.desc @@ -37,7 +37,7 @@ [L] LGPL [S] Stable [V] 2.12.1 -[P] X -----5---9 800.000 +[P] X -----5---9 139.800 [D] 3365273811 pygobject-2.12.1.tar.bz2 http://ftp.gnome.org/pub/GNOME/bindings/2.16/2.16.0/sources/python/ diff --git a/package/gnome2/seahorse/seahorse.desc b/package/gnome2/seahorse/seahorse.desc index cd7d928f3..44ad21f25 100644 --- a/package/gnome2/seahorse/seahorse.desc +++ b/package/gnome2/seahorse/seahorse.desc @@ -41,7 +41,7 @@ [L] GPL [S] Beta -[V] 0.9.5 +[V] 0.8.2 [P] X -?---5---9 213.500 -[D] 1531057926 seahorse-0.9.5.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.9/ +[D] 33441630 seahorse-0.8.2.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/seahorse/0.8/ diff --git a/package/gnome2/totem/totem.desc b/package/gnome2/totem/totem.desc index d86ecc888..c18c2e3d4 100644 --- a/package/gnome2/totem/totem.desc +++ b/package/gnome2/totem/totem.desc @@ -39,6 +39,6 @@ [L] GPL [S] Beta [V] 2.16.0 -[P] X -?---5---9 232.600 +[P] X -?---5---9 180.200 [D] 1734808563 totem-2.16.0.tar.bz2 http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.0/sources/ diff --git a/package/import/cpan/hosted_cpan.cfg b/package/import/cpan/hosted_cpan.cfg index 7a6147d3e..753d9ca19 100644 --- a/package/import/cpan/hosted_cpan.cfg +++ b/package/import/cpan/hosted_cpan.cfg @@ -57,7 +57,7 @@ pkgfork cpan cpan-xml-namespacesupport status X priority 140.620 pkgfork cpan cpan-xml-nodefilter status X priority 140.720 pkgfork cpan cpan-xml-parser status X priority 138.890 flag CORE pkgfork cpan cpan-xml-sax status X priority 140.650 -pkgfork cpan cpan-xml-simple status X priority 148.450 +pkgfork cpan cpan-xml-simple status X priority 144.450 pkgfork cpan cpan-xml-twig status X priority 200.250 pkgfork cpan cpan-xml-writer status X priority 200.260 pkgfork cpan cpan-yaml status X priority 200.270 diff --git a/package/import/cpan/hosted_cpan.txt b/package/import/cpan/hosted_cpan.txt index 0133f3353..a3f119351 100644 --- a/package/import/cpan/hosted_cpan.txt +++ b/package/import/cpan/hosted_cpan.txt @@ -14,7 +14,7 @@ 140.720 XML::NodeFilter 148.250 Getopt::Mixed 148.350 Unicode::String -148.450 XML::Simple +144.450 XML::Simple 148.550 MP3::Info 174.050 Net::SNMP 175.550 DBI