diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-14 14:32:33 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-05-14 14:32:33 +0000 |
| commit | 5c588543ac25c7b39339f17a43069e9b9e6d72b1 (patch) | |
| tree | 848181e651dd610fbdd54b328ccc8283cec00c06 /x11/gnome-panel | |
| parent | Oops, last commit was an old version, this one is at least able to link (diff) | |
Fix on systems without langinfo.h header.
Submitted by: bento
Diffstat (limited to 'x11/gnome-panel')
| -rw-r--r-- | x11/gnome-panel/files/patch-applets::gen_util::clock.c | 27 | ||||
| -rw-r--r-- | x11/gnome-panel/files/patch-config.h.in | 14 | ||||
| -rw-r--r-- | x11/gnome-panel/files/patch-configure | 16 |
3 files changed, 55 insertions, 2 deletions
diff --git a/x11/gnome-panel/files/patch-applets::gen_util::clock.c b/x11/gnome-panel/files/patch-applets::gen_util::clock.c new file mode 100644 index 000000000000..96f5d3f44c48 --- /dev/null +++ b/x11/gnome-panel/files/patch-applets::gen_util::clock.c @@ -0,0 +1,27 @@ + +$FreeBSD$ + +--- applets/gen_util/clock.c 2002/05/14 14:08:16 1.1 ++++ applets/gen_util/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) diff --git a/x11/gnome-panel/files/patch-config.h.in b/x11/gnome-panel/files/patch-config.h.in new file mode 100644 index 000000000000..cb37ef76389a --- /dev/null +++ b/x11/gnome-panel/files/patch-config.h.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- config.h.in 2002/05/14 14:15:00 1.1 ++++ config.h.in 2002/05/14 14:15:35 +@@ -148,6 +148,8 @@ + /* Define if you have the `strdup' function. */ + #undef HAVE_STRDUP + ++#undef HAVE_LANGINFO_H ++ + /* Define if you have the <strings.h> header file. */ + #undef HAVE_STRINGS_H + diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure index 63f6b4544d5b..89007e07bc69 100644 --- a/x11/gnome-panel/files/patch-configure +++ b/x11/gnome-panel/files/patch-configure @@ -1,5 +1,8 @@ ---- configure.orig Mon Apr 29 01:16:38 2002 -+++ configure Mon Apr 29 01:17:04 2002 + +$FreeBSD$ + +--- configure.orig Tue May 14 17:16:32 2002 ++++ configure Tue May 14 17:17:03 2002 @@ -7232,6 +7232,7 @@ # This can be used to rebuild libtool when needed @@ -8,3 +11,12 @@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -9288,7 +9289,7 @@ + # On IRIX 5.3, sys/types and inttypes.h are conflicting. + + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +- inttypes.h stdint.h unistd.h ++ inttypes.h stdint.h unistd.h langinfo.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:9294: checking for $ac_header" >&5 |