1 files changed, 103 insertions, 0 deletions
diff --git a/gnome-base/gnome-panel/files/gnome-panel-intlclock.patch b/gnome-base/gnome-panel/files/gnome-panel-intlclock.patch
new file mode 100644
index 0000000..2a89177
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-intlclock.patch
@@ -0,0 +1,103 @@
+Index: configure.in
+===================================================================
+--- configure.in	(revision 10212)
++++ configure.in	(working copy)
+@@ -64,6 +64,7 @@
+ LIBEDATASERVERUI_REQUIRED=1.2.0
+ CAIRO_REQUIRED=1.0.0
+ DBUS_GLIB_REQUIRED=0.60
++LIBRSVG_REQUIRED=2.12.0
+ 
+ dnl pkg-config dependency checks
+ 
+@@ -108,6 +108,8 @@
+ fi
+ AM_CONDITIONAL(HAVE_LIBECAL, test -n "$LIBECAL_REQUIREMENT")
+ AC_SUBST(CLOCK_EDS_ICONDIR)
++
++AC_SUBST(LIBRSVG_REQUIRED)
+ 
+ PKG_CHECK_MODULES(CLOCK, pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED $LIBECAL_REQUIREMENT libglade-2.0 >= $LIBGLADE_REQUIRED)
+ AC_SUBST(CLOCK_CFLAGS)
+@@ -124,6 +126,20 @@ PKG_CHECK_MODULES(FISH, gtk+-2.0 >= $GTK
+ AC_SUBST(FISH_CFLAGS)
+ AC_SUBST(FISH_LIBS)
+ 
++PKG_CHECK_MODULES(INTLCLOCK, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED librsvg-2.0 >= $LIBRSVG_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED $LIBECAL_REQUIREMENT)
++AC_SUBST(INTLCLOCK_CFLAGS)
++AC_SUBST(INTLCLOCK_LIBS)
++
++# Check for system zone.tab file for intlclock
++AC_ARG_WITH([system-zonetab],
++        AC_HELP_STRING([--with-system-zoneinfo=DIR],
++                [Path to system zoneinfo directory]),
++        [SYSTEM_ZONEINFODIR=$withval],
++        [AC_PATH_PROG(SYSTEM_ZONEINFODIR, zone.tab, [/usr/share/zoneinfo/zone.tab], [/usr/share/zoneinfo/zone.tab:/usr/local/share/zoneinfo/zone.tab])])
++if echo $SYSTEM_ZONEINFODIR |grep "/zone.tab$" >/dev/null 2>&1; then
++        SYSTEM_ZONEINFODIR=`dirname $SYSTEM_ZONEINFODIR`
++fi
++
+ # For the run dialog
+ gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE
+ 
+@@ -228,6 +244,7 @@ po/Makefile.in
+ applets/Makefile
+ applets/clock/Makefile
+ applets/fish/Makefile
++applets/intlclock/Makefile
+ applets/notification_area/Makefile
+ applets/wncklet/Makefile
+ doc/Makefile
+Index: applets/Makefile.am
+===================================================================
+--- applets/Makefile.am	(revision 10212)
++++ applets/Makefile.am	(working copy)
+@@ -1,6 +1,7 @@
+ SUBDIRS =		\
+ 	clock		\
+ 	fish		\
++	intlclock	\
+ 	notification_area \
+ 	wncklet
+ 
+Index: applets/clock/GNOME_ClockApplet_Factory.server.in.in
+===================================================================
+--- applets/clock/GNOME_ClockApplet_Factory.server.in.in	(revision 10212)
++++ applets/clock/GNOME_ClockApplet_Factory.server.in.in	(working copy)
+@@ -13,7 +13,7 @@
+ 
+ </oaf_server>
+ 
+-<oaf_server iid="OAFIID:GNOME_ClockApplet"
++<oaf_server iid="OAFIID:GNOME_ClassicClockApplet"
+ 	    type="factory" 
+ 	    location="OAFIID:GNOME_ClockApplet_Factory">
+ 
+Index: applets/clock/clock.c
+===================================================================
+--- applets/clock/clock.c	(revision 10212)
++++ applets/clock/clock.c	(working copy)
+@@ -2756,7 +2756,7 @@ clock_factory (PanelApplet *applet,
+ {
+ 	gboolean retval = FALSE;
+ 
+-	if (!strcmp (iid, "OAFIID:GNOME_ClockApplet"))
++	if (!strcmp (iid, "OAFIID:GNOME_ClassicClockApplet"))
+ 		retval = fill_clock_applet (applet);
+ 
+ 	return retval;
+Index: po/POTFILES.in
+===================================================================
+--- po/POTFILES.in	(revision 10212)
++++ po/POTFILES.in	(working copy)
+@@ -11,6 +11,10 @@ applets/fish/GNOME_FishApplet_Factory.se
+ applets/fish/fish.c
+ applets/fish/fish.glade
+ applets/fish/fish.schemas.in
++applets/intlclock/intlclock.c
++applets/intlclock/intlclock.glade
++applets/intlclock/intlclock-location-tile.c
++applets/intlclock/intlclock-ui.c
+ applets/notification_area/GNOME_NotificationAreaApplet.server.in.in
+ applets/notification_area/GNOME_NotificationAreaApplet.xml
+ applets/notification_area/eggtraymanager.c