diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-18 06:49:37 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2003-09-18 06:49:37 +0000 |
commit | 9c0caae1c20155b432bb0feb074a8fd9cc1c12bc (patch) | |
tree | 534d0190982c831de589344c3003940ec6f2d6b1 /x11/gnomepanel/files/patch-applets_clock_clock.c | |
parent | Followup commit: Unbreak XFree86-4-Server-snap on -stable -- gcc 2 has no (diff) |
Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,
future plans, etc., please see http://www.gnome.org/start/2.4/.
This commit represents work done by adamw, bland, and myself as well as
many other contributers:
Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>
Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.
Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon). The
best way to upgrade so that you get all shared library dependencies is:
portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2
Approved by: portmgr (kris, will, myself implicitly)
Requested by: re as well as many other users
Diffstat (limited to 'x11/gnomepanel/files/patch-applets_clock_clock.c')
-rw-r--r-- | x11/gnomepanel/files/patch-applets_clock_clock.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/x11/gnomepanel/files/patch-applets_clock_clock.c b/x11/gnomepanel/files/patch-applets_clock_clock.c new file mode 100644 index 000000000000..976764570ff1 --- /dev/null +++ b/x11/gnomepanel/files/patch-applets_clock_clock.c @@ -0,0 +1,27 @@ + +$FreeBSD$ + +--- applets/clock/clock.c 2002/05/14 14:08:16 1.1 ++++ applets/clock/clock.c 2002/05/14 14:12:56 +@@ -14,7 +14,9 @@ + #include <dirent.h> + #include <string.h> + #include <time.h> ++#ifdef HAVE_LANGINFO_H + #include <langinfo.h> ++#endif + + #include <panel-applet.h> + #include <panel-applet-gconf.h> +@@ -684,7 +686,11 @@ + cd->hourformat = panel_applet_gconf_get_int (applet, KEY_HOUR_FORMAT, &error); + if (error || (cd->hourformat != 12 && cd->hourformat != 24)) { + /* if value is not valid, set it according to locale */ ++#ifdef HAVE_LANGINFO_H + const char *am = nl_langinfo (AM_STR); ++#else ++ const char *am = "AM"; ++#endif + cd->hourformat = (am[0] == '\0') ? 24 : 12; + + if (error) |