diff options
author | Mike Gardiner <obz@gentoo.org> | 2004-02-23 16:56:38 +0000 |
---|---|---|
committer | Mike Gardiner <obz@gentoo.org> | 2004-02-23 16:56:38 +0000 |
commit | 04f222fa510dc178a796c21891db41bf646e70c4 (patch) | |
tree | cb89cb7605935b2a162f2506869c0ebaa8acb047 /gnome-base | |
parent | Version bumped. Closes 42590 (Manifest recommit) (diff) | |
download | gentoo-2-04f222fa510dc178a796c21891db41bf646e70c4.tar.gz gentoo-2-04f222fa510dc178a796c21891db41bf646e70c4.tar.bz2 gentoo-2-04f222fa510dc178a796c21891db41bf646e70c4.zip |
Applied patch to fix the calendar/clock applet localisation issues, see bug #38672
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gnome-panel/ChangeLog | 8 | ||||
-rw-r--r-- | gnome-base/gnome-panel/files/gnome-panel-calendar-l10n.patch | 43 | ||||
-rw-r--r-- | gnome-base/gnome-panel/gnome-panel-1.4.1.ebuild | 4 | ||||
-rw-r--r-- | gnome-base/gnome-panel/gnome-panel-2.4.0-r1.ebuild | 4 | ||||
-rw-r--r-- | gnome-base/gnome-panel/gnome-panel-2.4.0-r2.ebuild | 4 | ||||
-rw-r--r-- | gnome-base/gnome-panel/gnome-panel-2.4.2.ebuild | 6 |
6 files changed, 61 insertions, 8 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/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 |