From b1ede74de61415d481ef9d110e220dc60704abc1 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Fri, 17 Nov 2006 09:53:56 +0000 Subject: [PATCH] Stefan Fiedler: package/gnome2: remove several patches obsolete with the latest gnome2 update [2006100819560017931] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8013 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/gnome2/abiword/libxml-apichange.patch | 20 ----- .../gnome2/alleyoop/symtab-newbinutils.patch | 30 -------- package/gnome2/at-poke/gcc40.patch | 12 --- package/gnome2/devhelp/compile.patch | 58 --------------- .../gnome-applets/trashapplet-linkage.patch | 12 --- .../disable-mixer-applet-default.patch | 73 ------------------- .../gnome-spell/dont-disable-deprecated.patch | 29 -------- .../pc-file-need-gnome-keyring.patch | 30 -------- .../libgtop/no-pcfile-during-build.patch | 30 -------- .../memprof/cooked-size-newbinutils.patch | 30 -------- 10 files changed, 324 deletions(-) delete mode 100644 package/gnome2/abiword/libxml-apichange.patch delete mode 100644 package/gnome2/alleyoop/symtab-newbinutils.patch delete mode 100644 package/gnome2/at-poke/gcc40.patch delete mode 100644 package/gnome2/devhelp/compile.patch delete mode 100644 package/gnome2/gnome-applets/trashapplet-linkage.patch delete mode 100644 package/gnome2/gnome-panel/disable-mixer-applet-default.patch delete mode 100644 package/gnome2/gnome-spell/dont-disable-deprecated.patch delete mode 100644 package/gnome2/libgnomeui/pc-file-need-gnome-keyring.patch delete mode 100644 package/gnome2/libgtop/no-pcfile-during-build.patch delete mode 100644 package/gnome2/memprof/cooked-size-newbinutils.patch diff --git a/package/gnome2/abiword/libxml-apichange.patch b/package/gnome2/abiword/libxml-apichange.patch deleted file mode 100644 index 703a75187..000000000 --- a/package/gnome2/abiword/libxml-apichange.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./wv/wvConfig.c.orig 2006-07-23 19:48:19.000000000 +0200 -+++ ./wv/wvConfig.c 2006-07-23 19:48:44.000000000 +0200 -@@ -2129,7 +2129,7 @@ - - } - --static void -+void - startElement (void *userData, const XML_Char *name, const XML_Char **atts) - { - unsigned int nAtts = 0; -@@ -3093,7 +3093,7 @@ - } - } - --static void -+void - endElement (void *userData, const XML_Char *name) - { - state_data *mydata = (state_data *) userData; diff --git a/package/gnome2/alleyoop/symtab-newbinutils.patch b/package/gnome2/alleyoop/symtab-newbinutils.patch deleted file mode 100644 index e17a3ccf8..000000000 --- a/package/gnome2/alleyoop/symtab-newbinutils.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/alleyoop/symtab-newbinutils.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 --- - ---- ./src/symtab.c.orig 2004-09-07 00:09:57.175564888 +0200 -+++ ./src/symtab.c 2004-09-07 00:10:11.678360128 +0200 -@@ -115,7 +115,7 @@ - - map->text_section = section; - map->text_start = load_addr + bfd_section_vma (map->abfd, section); -- map->text_end = map->text_start + bfd_get_section_size_before_reloc (section); -+ map->text_end = map->text_start + bfd_get_section_size (section); - - map->filename = g_strdup (filename); - map->libname = g_strdup (libname); diff --git a/package/gnome2/at-poke/gcc40.patch b/package/gnome2/at-poke/gcc40.patch deleted file mode 100644 index 0aaf9565c..000000000 --- a/package/gnome2/at-poke/gcc40.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -dur at-poke-0.2.2/src/accessible-tree-model.c src.at-poke.1135212060.7536.238402817/at-poke-0.2.2/src/accessible-tree-model.c ---- at-poke-0.2.2/src/accessible-tree-model.c 2003-05-28 14:36:43.000000000 +0200 -+++ src.at-poke.1135212060.7536.238402817/at-poke-0.2.2/src/accessible-tree-model.c 2005-12-23 22:14:04.000000000 +0100 -@@ -113,7 +113,7 @@ - return make_iter_invalid (iter); - - iter->stamp = ACCESSIBLE_TREE_MODEL (model)->stamp; -- ITER_NODE (iter) = node; -+ iter->user_data = node; - iter->user_data2 = NULL; - iter->user_data3 = NULL; - diff --git a/package/gnome2/devhelp/compile.patch b/package/gnome2/devhelp/compile.patch deleted file mode 100644 index f75a14a54..000000000 --- a/package/gnome2/devhelp/compile.patch +++ /dev/null @@ -1,58 +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/devhelp/compile.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 --- - ---- ./libegg/menu/egg-action.c.orig 2004-05-14 10:36:25.076328384 +0200 -+++ ./libegg/menu/egg-action.c 2004-05-14 10:53:26.393064640 +0200 -@@ -1,6 +1,7 @@ - #include - #include "egg-action.h" - #include "../toolbar/eggtoolbutton.h" -+#include "../toolbar/eggtoolbar.h" - #include "../util/eggintl.h" - - //#ifndef _ -@@ -921,7 +922,7 @@ - /* gross hack!!! */ - for (tmp = GTK_TOOLBAR (button->parent)->children; tmp; tmp = tmp->next) - { -- GtkToolbarChild *tool_child = tmp->data; -+ EggToolbarChild *tool_child = tmp->data; - - if (tool_child->widget == button) - { ---- ./libegg/toolbar/eggtoolbar.c.orig 2004-05-14 10:32:25.233789992 +0200 -+++ ./libegg/toolbar/eggtoolbar.c 2004-05-14 10:32:51.857742536 +0200 -@@ -2570,7 +2570,7 @@ - - GtkWidget* - egg_toolbar_append_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, -@@ -2587,7 +2587,7 @@ - - GtkWidget * - egg_toolbar_prepend_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, diff --git a/package/gnome2/gnome-applets/trashapplet-linkage.patch b/package/gnome2/gnome-applets/trashapplet-linkage.patch deleted file mode 100644 index a364c8f60..000000000 --- a/package/gnome2/gnome-applets/trashapplet-linkage.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gnome-applets-2.13.1/trashapplet/src/Makefile.in~ 2006-01-15 02:03:55.000000000 +0100 -+++ gnome-applets-2.13.1/trashapplet/src/Makefile.in 2006-01-15 02:04:36.000000000 +0100 -@@ -337,7 +337,8 @@ - xstuff.h - - trashapplet_LDADD = \ -- $(GNOME_APPLETS_LIBS) -+ $(GNOME_APPLETS_LIBS) \ -+ $(LIBGLADE_LIBS) - - all: all-am - diff --git a/package/gnome2/gnome-panel/disable-mixer-applet-default.patch b/package/gnome2/gnome-panel/disable-mixer-applet-default.patch deleted file mode 100644 index 10c493c3e..000000000 --- a/package/gnome2/gnome-panel/disable-mixer-applet-default.patch +++ /dev/null @@ -1,73 +0,0 @@ ---- ./gnome-panel/panel-default-setup.entries.in.orig 2006-07-24 01:41:02.000000000 +0200 -+++ ./gnome-panel/panel-default-setup.entries.in 2006-07-24 01:43:12.000000000 +0200 -@@ -50,9 +50,6 @@ - window_menu - - -- mixer -- -- - clock - - -@@ -373,60 +370,6 @@ - applets/window_menu/launcher_location/schemas/apps/panel/objects/launcher_location - applets/window_menu/action_type/schemas/apps/panel/objects/action_type - -- -- -- -- applets/mixer/object_type -- /schemas/apps/panel/objects/object_type -- -- bonobo-applet -- -- -- -- applets/mixer/toplevel_id -- /schemas/apps/panel/objects/toplevel_id -- -- top_panel -- -- -- -- applets/mixer/position -- /schemas/apps/panel/objects/position -- -- 1 -- -- -- -- applets/mixer/panel_right_stick -- /schemas/apps/panel/objects/panel_right_stick -- -- true -- -- -- -- applets/mixer/locked -- /schemas/apps/panel/objects/locked -- -- true -- -- -- -- applets/mixer/bonobo_iid -- /schemas/apps/panel/objects/bonobo_iid -- -- OAFIID:GNOME_MixerApplet -- -- -- -- applets/mixer/attached_toplevel_id/schemas/apps/panel/objects/attached_toplevel_id -- applets/mixer/tooltip/schemas/apps/panel/objects/tooltip -- applets/mixer/use_custom_icon/schemas/apps/panel/objects/use_custom_icon -- applets/mixer/custom_icon/schemas/apps/panel/objects/custom_icon -- applets/mixer/use_menu_path/schemas/apps/panel/objects/use_menu_path -- applets/mixer/menu_path/schemas/apps/panel/objects/menu_path -- applets/mixer/launcher_location/schemas/apps/panel/objects/launcher_location -- applets/mixer/action_type/schemas/apps/panel/objects/action_type -- - - - diff --git a/package/gnome2/gnome-spell/dont-disable-deprecated.patch b/package/gnome2/gnome-spell/dont-disable-deprecated.patch deleted file mode 100644 index e75c51434..000000000 --- a/package/gnome2/gnome-spell/dont-disable-deprecated.patch +++ /dev/null @@ -1,29 +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-spell/dont-disable-deprecated.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 --- - ---- gnome-spell-1.0.5/gnome-spell/Makefile.in 2003-07-30 08:45:02.000000000 -0700 -+++ gnome-spell-1.0.5/gnome-spell/Makefile.in 2004-04-12 20:43:11.000000000 -0700 -@@ -138,7 +138,6 @@ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ - -DGLADE_DATADIR=\"$(gladedir)\" \ - -DPLUGIN_DIR=\""$(PLUGIN_DIR)"\" \ -- -DGTK_DISABLE_DEPRECATED=1 \ - -DASPELL_DICT=\""$(ASPELL_DICT)"\" \ - $(GNOME_SPELL_CFLAGS) \ - $(END) diff --git a/package/gnome2/libgnomeui/pc-file-need-gnome-keyring.patch b/package/gnome2/libgnomeui/pc-file-need-gnome-keyring.patch deleted file mode 100644 index 975ec5fd1..000000000 --- a/package/gnome2/libgnomeui/pc-file-need-gnome-keyring.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/libgnomeui/pc-file-need-gnome-keyring.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 --- - ---- ./libgnomeui/libgnomeui-2.0.pc.in.orig 2004-12-04 21:11:03.097157568 +0100 -+++ ./libgnomeui/libgnomeui-2.0.pc.in 2004-12-04 21:11:17.713935480 +0100 -@@ -6,7 +6,7 @@ - - Name: libgnomeui - Description: libgnomeui --Requires: libgnome-2.0 libgnomecanvas-2.0 gtk+-2.0 gdk-pixbuf-2.0 libart-2.0 gconf-2.0 libbonoboui-2.0 -+Requires: libgnome-2.0 libgnomecanvas-2.0 gtk+-2.0 gdk-pixbuf-2.0 libart-2.0 gconf-2.0 libbonoboui-2.0 gnome-keyring-1 - Version: @VERSION@ - Libs: -L${libdir} -lgnomeui-2 @SM_LIBS@ - Cflags: -I${includedir}/libgnomeui-2.0 diff --git a/package/gnome2/libgtop/no-pcfile-during-build.patch b/package/gnome2/libgtop/no-pcfile-during-build.patch deleted file mode 100644 index 71b067a66..000000000 --- a/package/gnome2/libgtop/no-pcfile-during-build.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/libgtop/no-pcfile-during-build.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 --- - ---- ./examples/Makefile.in.orig 2004-12-04 21:33:52.452983840 +0100 -+++ ./examples/Makefile.in 2004-12-04 21:36:44.784785424 +0100 -@@ -253,7 +253,7 @@ - - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ $(GLIB_LIBS) - X_CFLAGS = @X_CFLAGS@ - X_LIBS = @X_LIBS@ - X_EXTRA_LIBS = @X_EXTRA_LIBS@ diff --git a/package/gnome2/memprof/cooked-size-newbinutils.patch b/package/gnome2/memprof/cooked-size-newbinutils.patch deleted file mode 100644 index 772067751..000000000 --- a/package/gnome2/memprof/cooked-size-newbinutils.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/memprof/cooked-size-newbinutils.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 --- - ---- ./bfdutils.c.orig 2004-09-07 18:10:27.670831536 +0200 -+++ ./bfdutils.c 2004-09-07 18:10:39.396049032 +0200 -@@ -164,7 +164,7 @@ - * into the internals instead. :-( - */ - /* (*func) (addr, bfd_section_size (map->abfd, section), user_data); */ -- (*func) (addr, section->_cooked_size, user_data); -+ (*func) (addr, section->size, user_data); - } - } - }