Applied patch to fix the calendar/clock applet localisation issues, see bug #38672

7 files changed, 76 insertions, 22 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 9b23be9ec8f9..bd98f1777167 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.74 2004/02/10 14:14:35 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.75 2004/02/23 16:56:38 obz Exp $
+
+  24 Feb 2004; Mike Gardiner <obz@gentoo.org> gnome-panel-1.4.1.ebuild,
+  gnome-panel-2.4.0-r1.ebuild, gnome-panel-2.4.0-r2.ebuild,
+  gnome-panel-2.4.2.ebuild, files/gnome-panel-calendar-l10n.patch:
+  Applied patch to fix the calendar/clock applet with localisation issues, see
+  bug #38672
 
   10 Feb 2004; <gustavoz@gentoo.org> gnome-panel-2.4.2.ebuild:
   stable on hppa and sparc
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index a16b92eb577a..7b1e9383a84f 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,20 +1,21 @@
-MD5 f64b0632542f25312ae5add4fb3a355a gnome-panel-1.4.1.ebuild 1773
-MD5 63bde3a9d5a5918d40c386f14a9a71b7 gnome-panel-2.4.2.ebuild 1596
-MD5 2453bec9a88fa17e750f6b9a0b4251be ChangeLog 9830
+MD5 812ccfad6763843f4c37efc6d8354614 gnome-panel-2.4.0-r2.ebuild 1872
+MD5 c6dbe3b7b6a797c903d6712f5490e392 gnome-panel-2.4.2.ebuild 1742
 MD5 f47c4c717069b1543c5c8207724849e1 gnome-panel-1.4.2-r2.ebuild 2021
-MD5 d327e216eac270f85dccca930b54646b gnome-panel-2.4.0-r2.ebuild 1875
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 d004297b7c3cb5cb005fa94cd96d1144 gnome-panel-2.4.0-r1.ebuild 1617
+MD5 c74e4abdc06344fc7adbe9beccc58568 gnome-panel-1.4.1.ebuild 1768
+MD5 05dbdbfe52729cd2e88c928fcea1300d gnome-panel-2.4.0-r1.ebuild 1615
 MD5 be5a4394cce5405549468e73cd56a186 gnome-panel-2.4.1.ebuild 1754
-MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
-MD5 7a56d7cd6b8d36c12f13018f16a7d1a5 files/digest-gnome-panel-2.4.2 71
+MD5 2d946988deb3e2fa90d00cefda46faf8 ChangeLog 10117
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 1bb4e04fb5577b5f7ffee6c5ef2855b2 files/gnome-panel-2.4.0-drawers_fix.patch 6205
+MD5 08d08fb07508d922ef40625fd41d53d6 files/gnome-panel-2.4.0-drawers_expanding_fix.patch 639
+MD5 e32de20a66c2dddfb1a4178bbce00e28 files/gnome-panel-2.4.0-autohide_fix.patch 2873
+MD5 1fda29dc30f730bf7f916139db8e8844 files/menu-2.4.0.patch 1663
+MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r1 71
 MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r2 71
+MD5 fd45982a0009ea6751868529516f641a files/gnome-panel-calendar-l10n.patch 1239
 MD5 dd9b1670052fcf124243fa8b0a6c6346 files/gnome-panel-2.4-panel_size.patch 597
-MD5 756269f1a3d35355c5fd61009b9f4831 files/digest-gnome-panel-2.4.1 71
 MD5 30ed8bbd528d5b284c0b489cd8c52210 files/digest-gnome-panel-1.4.2-r2 70
-MD5 cdb194bbe6f7f4e39ebd4cbd80a6bdd0 files/digest-gnome-panel-2.4.0-r1 71
-MD5 1fda29dc30f730bf7f916139db8e8844 files/menu-2.4.0.patch 1663
-MD5 1bb4e04fb5577b5f7ffee6c5ef2855b2 files/gnome-panel-2.4.0-drawers_fix.patch 6205
-MD5 e32de20a66c2dddfb1a4178bbce00e28 files/gnome-panel-2.4.0-autohide_fix.patch 2873
-MD5 08d08fb07508d922ef40625fd41d53d6 files/gnome-panel-2.4.0-drawers_expanding_fix.patch 639
 MD5 9696dc7286c62ec7105c7d927be6b4dc files/gnome-panel-2.4.1-drawers_expanding_fix.patch 639
+MD5 fae3355b5d711fc7eb4d3e3428a6b2ae files/digest-gnome-panel-1.4.1 70
+MD5 756269f1a3d35355c5fd61009b9f4831 files/digest-gnome-panel-2.4.1 71
+MD5 7a56d7cd6b8d36c12f13018f16a7d1a5 files/digest-gnome-panel-2.4.2 71
diff --git a/gnome-base/gnome-panel/files/gnome-panel-calendar-l10n.patch b/gnome-base/gnome-panel/files/gnome-panel-calendar-l10n.patch
new file mode 100644
index 000000000000..31d0deba6ef1
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-calendar-l10n.patch
@@ -0,0 +1,43 @@
+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);
+ 
diff --git a/gnome-base/gnome-panel/gnome-panel-1.4.1.ebuild b/gnome-base/gnome-panel/gnome-panel-1.4.1.ebuild
index 4e038df3bdd5..2ea7e05f8d0e 100644
--- a/gnome-base/gnome-panel/gnome-panel-1.4.1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-1.4.1.ebuild,v 1.14 2004/02/22 20:47:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-1.4.1.ebuild,v 1.15 2004/02/23 16:56:38 obz Exp $
 
 IUSE="kde nls"
 
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild
index eeac12ea0f13..61bcf0144cc9 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild,v 1.9 2003/11/10 00:01:35 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild,v 1.10 2004/02/23 16:56:38 obz Exp $
 
 inherit gnome2 eutils
 
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild
index 84638a904fc8..abc6edea6287 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild,v 1.8 2003/12/13 00:33:10 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild,v 1.9 2004/02/23 16:56:38 obz Exp $
 
 inherit gnome2 eutils
 
diff --git a/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
index 7f3abbbcc99d..a2aae608feb4 100644
--- a/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
+++ b/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild,v 1.6 2004/02/14 18:43:49 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild,v 1.7 2004/02/23 16:56:38 obz Exp $
 
 inherit gnome2 eutils
 
@@ -43,6 +43,10 @@ src_unpack() {
 	cd ${S}
 	# use menu && epatch ${FILESDIR}/menu-${PV}.patch
 
+	# fix calendar day-of-week for l10n, see bug #38672
+	# consider clean/removing for gtk+-2.4/gnome-2.6
+	epatch ${FILESDIR}/${PN}-calendar-l10n.patch
+
 	# fix initial menu size
 	epatch ${FILESDIR}/${PN}-2.4-panel_size.patch