Removed unused patches

5 files changed, 8 insertions, 130 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 995f2595bfa5..e9c17b069e92 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.103 2004/11/25 04:09:10 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.104 2004/11/25 04:11:30 obz Exp $
+
+  25 Nov 2004; Mike Gardiner <obz@gentoo.org>
+  -files/gnome-panel-2.4-panel_size.patch,
+  -files/gnome-panel-2.6-parallel_install.patch,
+  -files/gnome-panel-2.6.1-parallel_install.patch,
+  -files/gnome-panel-calendar-l10n.patch:
+  Removed unused patches
 
 *gnome-panel-2.8.1 (25 Nov 2004)
 
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.4-panel_size.patch b/gnome-base/gnome-panel/files/gnome-panel-2.4-panel_size.patch
deleted file mode 100644
index 3625c88b3821..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.4-panel_size.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./gnome-panel/panel-default-setup.entries~	2003-07-01 15:29:54.000000000 +0100
-+++ ./gnome-panel/panel-default-setup.entries	2003-08-19 07:49:23.000000000 +0100
-@@ -98,7 +98,7 @@
-       <key>size</key>
-       <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
-       <value>
--        <int>32</int>
-+        <int>24</int>
-       </value>
-     </entry>
-   </entrylist>
-@@ -131,7 +131,7 @@
-       <key>size</key>
-       <schema_key>/schemas/apps/panel/toplevels/size</schema_key>
-       <value>
--        <int>32</int>
-+        <int>24</int>
-       </value>
-     </entry>
-   </entrylist>
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.6-parallel_install.patch b/gnome-base/gnome-panel/files/gnome-panel-2.6-parallel_install.patch
deleted file mode 100644
index f5f257f7240e..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.6-parallel_install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru gnome-panel-2.5.93/gnome-panel/Makefile.am gnome-panel-2.5.93-new/gnome-panel/Makefile.am
---- gnome-panel-2.5.93/gnome-panel/Makefile.am	2004-02-06 10:04:50.000000000 -0600
-+++ gnome-panel-2.5.93-new/gnome-panel/Makefile.am	2004-03-21 15:30:23.935813144 -0600
-@@ -43,7 +43,7 @@
- 	GNOME_Panel-stubs.c	\
- 	GNOME_Panel-skels.c	\
- 	GNOME_Panel-common.c	\
--	GNOME_Panel.h		\
-+	$(top_builddir)/gnome-panel/GNOME_Panel.h		\
- 	$(NULL)
- 
- $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
-diff -ru gnome-panel-2.5.93/gnome-panel/Makefile.in gnome-panel-2.5.93-new/gnome-panel/Makefile.in
---- gnome-panel-2.5.93/gnome-panel/Makefile.in	2004-03-15 05:47:50.000000000 -0600
-+++ gnome-panel-2.5.93-new/gnome-panel/Makefile.in	2004-03-21 15:30:33.409372944 -0600
-@@ -273,7 +273,7 @@
- 	GNOME_Panel-stubs.c	\
- 	GNOME_Panel-skels.c	\
- 	GNOME_Panel-common.c	\
--	GNOME_Panel.h		\
-+	$(top_builddir)/gnome-panel/GNOME_Panel.h		\
- 	$(NULL)
- 
- 
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch b/gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch
deleted file mode 100644
index 9fe5142b644f..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-2.6.1-parallel_install.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ru gnome-panel-2.6.1/gnome-panel/Makefile.am gnome-panel-2.6.1-new/gnome-panel/Makefile.am
---- gnome-panel-2.6.1/gnome-panel/Makefile.am	2004-04-19 10:16:02.000000000 -0500
-+++ gnome-panel-2.6.1-new/gnome-panel/Makefile.am	2004-04-22 14:30:37.002004640 -0500
-@@ -43,7 +43,7 @@
- 	GNOME_Panel-stubs.c	\
- 	GNOME_Panel-skels.c	\
- 	GNOME_Panel-common.c	\
--	GNOME_Panel.h		\
-+	$(top_builddir)/gnome-panel/GNOME_Panel.h		\
- 	$(NULL)
- 
- $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
-@@ -254,7 +254,7 @@
- panel_enum_headers =					\
- 	$(top_srcdir)/gnome-panel/panel-enums.h		\
- 	$(top_srcdir)/gnome-panel/panel-types.h		\
--	GNOME_Panel.h
-+	$(top_builddir)/gnome-panel/GNOME_Panel.h
- 
- panel-marshal.h: panel-marshal.list $(GLIB_GENMARSHAL)
- 	$(GLIB_GENMARSHAL) $< --header --prefix=panel_marshal > $@
-diff -ru gnome-panel-2.6.1/gnome-panel/Makefile.in gnome-panel-2.6.1-new/gnome-panel/Makefile.in
---- gnome-panel-2.6.1/gnome-panel/Makefile.in	2004-04-19 10:25:25.000000000 -0500
-+++ gnome-panel-2.6.1-new/gnome-panel/Makefile.in	2004-04-22 14:30:52.054716280 -0500
-@@ -273,7 +273,7 @@
- 	GNOME_Panel-stubs.c	\
- 	GNOME_Panel-skels.c	\
- 	GNOME_Panel-common.c	\
--	GNOME_Panel.h		\
-+	$(top_builddir)/gnome-panel/GNOME_Panel.h		\
- 	$(NULL)
- 
- 
-@@ -497,7 +497,7 @@
- panel_enum_headers = \
- 	$(top_srcdir)/gnome-panel/panel-enums.h		\
- 	$(top_srcdir)/gnome-panel/panel-types.h		\
--	GNOME_Panel.h
-+	$(top_builddir)/gnome-panel/GNOME_Panel.h
- 
- 
- uidir = $(datadir)/gnome-2.0/ui
diff --git a/gnome-base/gnome-panel/files/gnome-panel-calendar-l10n.patch b/gnome-base/gnome-panel/files/gnome-panel-calendar-l10n.patch
deleted file mode 100644
index 31d0deba6ef1..000000000000
--- a/gnome-base/gnome-panel/files/gnome-panel-calendar-l10n.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -u -r1.105 clock.c
---- clock.c	21 May 2003 08:11:52 -0000	1.105
-+++ applets/clock/clock.c	28 Jun 2003 17:48:37 -0000
-@@ -37,6 +37,7 @@
- #include <dirent.h>
- #include <string.h>
- #include <time.h>
-+#include <locale.h>
- #include <langinfo.h>
- 
- #include <panel-applet.h>
-@@ -55,6 +56,8 @@
- 
- #define NEVER_SENSITIVE "never_sensitive"
- 
-+#define FIRST_WEEKDAY_IS_MONDAY 1
-+
- static const char* KEY_HOUR_FORMAT   = "hour_format";
- static const char* KEY_SHOW_SECONDS  = "show_seconds";
- static const char* KEY_SHOW_DATE     = "show_date";
-@@ -482,6 +485,10 @@
- {
- 	GtkWindow *window;
- 	GtkWidget *calendar;
-+        gint first_day;
-+
-+        setlocale (LC_ALL, "");
-+        first_day = (int) *(nl_langinfo (_NL_TIME_FIRST_WEEKDAY));
- 
- 	window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL));
- 
-@@ -452,6 +459,11 @@
- 			  G_CALLBACK (close_on_escape), cd);
- 			
- 	calendar = gtk_calendar_new ();
-+
-+        if (first_day == FIRST_WEEKDAY_IS_MONDAY) {
-+                gtk_calendar_display_options (GTK_CALENDAR (calendar),
-+                                              GTK_CALENDAR_WEEK_START_MONDAY | GTK_CALENDAR_SHOW_HEADING | GTK_CALENDAR_SHOW_DAY_NAMES);
-+        }
- 
- 	gtk_container_add (GTK_CONTAINER (window), calendar);
-