cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Take into account that not only -current, but the -stable as well now has

Browse Source 
nl_langinfo() interface. Also remove iconv->giconv hack while I here.

PR:		36064
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>
This commit is contained in:
Maxim Sobolev 2002-03-29 13:01:03 +00:00
parent 8bb66e82a0
commit 43acaf0eaa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=56868
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11-fm/nautilus/files/patch-libnautilus-private::nautilus-desktop-file-loader.c
View File

@ -1,15 +1,13 @@
$FreeBSD$
--- libnautilus-private/nautilus-desktop-file-loader.c.orig Wed Sep 26 16:37:15 2001
+++ libnautilus-private/nautilus-desktop-file-loader.c Tue Oct 30 09:33:26 2001
@@ -38,8 +38,10 @@
#include <errno.h>
--- libnautilus-private/nautilus-desktop-file-loader.c.orig Wed Sep 26 19:37:15 2001
+++ libnautilus-private/nautilus-desktop-file-loader.c Fri Mar 29 14:58:54 2002
@@ -39,7 +39,9 @@
#include <ctype.h>
#include <locale.h>
-#include <iconv.h>
+#include <giconv.h>
+#if (defined __FreeBSD__) && (__FreeBSD_version > 500000)
#include <iconv.h>
+#if (defined __FreeBSD__) && (__FreeBSD_version > 450001)
#include <langinfo.h>
+#endif
@ -19,7 +17,7 @@ $FreeBSD$
const char *value);
static void addition_free (NautilusDesktopFileAddition *addition);
+#if (defined __FreeBSD__) && (__FreeBSD_version < 500000)
+#if (defined __FreeBSD__) && (__FreeBSD_version < 450001)
+/* Quick and dirty implementation of nl_langinfo(CODESET) */
+static char *
+nl_langinfo(void) {

14
x11-fm/nautilus2/files/patch-libnautilus-private::nautilus-desktop-file-loader.c
View File

@ -1,15 +1,13 @@
$FreeBSD$
--- libnautilus-private/nautilus-desktop-file-loader.c.orig Wed Sep 26 16:37:15 2001
+++ libnautilus-private/nautilus-desktop-file-loader.c Tue Oct 30 09:33:26 2001
@@ -38,8 +38,10 @@
#include <errno.h>
--- libnautilus-private/nautilus-desktop-file-loader.c.orig Wed Sep 26 19:37:15 2001
+++ libnautilus-private/nautilus-desktop-file-loader.c Fri Mar 29 14:58:54 2002
@@ -39,7 +39,9 @@
#include <ctype.h>
#include <locale.h>
-#include <iconv.h>
+#include <giconv.h>
+#if (defined __FreeBSD__) && (__FreeBSD_version > 500000)
#include <iconv.h>
+#if (defined __FreeBSD__) && (__FreeBSD_version > 450001)
#include <langinfo.h>
+#endif
@ -19,7 +17,7 @@ $FreeBSD$
const char *value);
static void addition_free (NautilusDesktopFileAddition *addition);
+#if (defined __FreeBSD__) && (__FreeBSD_version < 500000)
+#if (defined __FreeBSD__) && (__FreeBSD_version < 450001)
+/* Quick and dirty implementation of nl_langinfo(CODESET) */
+static char *
+nl_langinfo(void) {