[pkgsrc/trunk]: pkgsrc/x11/gnome-panel update to 2.22.1.3

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1af8ff4ea3e
branches:  trunk
changeset: 541210:b1af8ff4ea3e
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Wed Apr 16 16:48:25 2008 +0000

description:
update to 2.22.1.3
changes:
-some fixes to the clock applet
-forward compatibility for gnome-2.24

pkgsrc change: re-applied the old pkgsrc fix for gnome bug #372155
(Calendar opens Evolution on the wrong day), because the fix which
was applied upstream is incorrect

diffstat:

 x11/gnome-panel/Makefile         |   4 ++--
 x11/gnome-panel/distinfo         |   9 +++++----
 x11/gnome-panel/patches/patch-aa |  40 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 6 deletions(-)

diffs (73 lines):

diff -r 2473200567cc -r b1af8ff4ea3e x11/gnome-panel/Makefile
--- a/x11/gnome-panel/Makefile  Wed Apr 16 16:45:23 2008 +0000
+++ b/x11/gnome-panel/Makefile  Wed Apr 16 16:48:25 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2008/04/15 17:52:40 drochner Exp $
+# $NetBSD: Makefile,v 1.97 2008/04/16 16:48:25 drochner Exp $
 #
 
-DISTNAME=              gnome-panel-2.22.1.2
+DISTNAME=              gnome-panel-2.22.1.3
 CATEGORIES=            x11 gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-panel/2.22/}
 EXTRACT_SUFX=          .tar.bz2
diff -r 2473200567cc -r b1af8ff4ea3e x11/gnome-panel/distinfo
--- a/x11/gnome-panel/distinfo  Wed Apr 16 16:45:23 2008 +0000
+++ b/x11/gnome-panel/distinfo  Wed Apr 16 16:48:25 2008 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.42 2008/04/15 17:52:40 drochner Exp $
+$NetBSD: distinfo,v 1.43 2008/04/16 16:48:25 drochner Exp $
 
-SHA1 (gnome-panel-2.22.1.2.tar.bz2) = 4f51f732d8162aa8f462e38458e3c8569f834222
-RMD160 (gnome-panel-2.22.1.2.tar.bz2) = 9fd7ed7282fa04569ff8f908d3c5f2faea73c89a
-Size (gnome-panel-2.22.1.2.tar.bz2) = 3248915 bytes
+SHA1 (gnome-panel-2.22.1.3.tar.bz2) = 28a81f4e59a32295d2dfdc52f4becb7ce539ee3c
+RMD160 (gnome-panel-2.22.1.3.tar.bz2) = a0c5149c48152d5a78a905112ddaaac511b7c75e
+Size (gnome-panel-2.22.1.3.tar.bz2) = 3251621 bytes
+SHA1 (patch-aa) = 192ebd41ddcca1d6db8898b7b65e3acfb200ce00
 SHA1 (patch-ab) = 961186c5db258557294fae4a280d13efdcfe1de1
 SHA1 (patch-ac) = 266fbb403a11c4776a17cd257d3f577b97f01c66
diff -r 2473200567cc -r b1af8ff4ea3e x11/gnome-panel/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-panel/patches/patch-aa  Wed Apr 16 16:48:25 2008 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.7 2008/04/16 16:48:25 drochner Exp $
+
+--- applets/clock/calendar-window.c.orig       2008-04-15 22:58:01.000000000 +0200
++++ applets/clock/calendar-window.c
+@@ -1161,22 +1161,28 @@ calendar_day_activated (GtkCalendar    *
+       time_t        now;
+       struct tm     utc_tm;
+       struct tm     local_tm;
++      time_t        daystart;
+       char         *argument;
+ 
+       gtk_calendar_get_date (calendar, &year, &month, &day);
+ 
+-      time (&now);
+-      gmtime_r (&now, &utc_tm);
+-      localtime_r (&now, &local_tm);
++      bzero(&local_tm, sizeof(local_tm));
++      local_tm.tm_mday = day;
++      local_tm.tm_mon = month;
++      local_tm.tm_year = year - 1900;
++      local_tm.tm_isdst = -1;
++      daystart = mktime(&local_tm);
++      gmtime_r (&daystart, &utc_tm);
+ 
+       /* FIXME: once bug 409200 is fixed, we'll have to make this hh:mm:ss
+        * instead of hhmmss */
+       argument = g_strdup_printf ("calendar:///?startdate="
+                                   "%.4d%.2d%.2dT%.2d%.2d%.2dZ",
+-                                  year, month + 1, day,
+-                                  12 + utc_tm.tm_hour - local_tm.tm_hour,
+-                                  0  + utc_tm.tm_min  - local_tm.tm_min,
+-                                  0);
++                                  utc_tm.tm_year + 1900, utc_tm.tm_mon + 1,
++                                  utc_tm.tm_mday,
++                                  utc_tm.tm_hour,
++                                  utc_tm.tm_min,
++                                  utc_tm.tm_sec);
+ 
+       clock_launch_evolution (calwin, argument);
+