Date: Mon, 18 Mar 2002 18:04:04 -0500 (EST) From: Joe Marcus Clarke <marcus@marcuscom.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/36064: [PATCH] Remove nl_langinfo() hack from nautilus on recent -stable Message-ID: <200203182304.g2IN44j88379@gyros.marcuscom.com>
next in thread | raw e-mail | index | archive | help
>Number: 36064
>Category: ports
>Synopsis: [PATCH] Remove nl_langinfo() hack from nautilus on recent -stable
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 18 15:10:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Joe Marcus Clarke
>Release: FreeBSD 4.5-STABLE i386
>Organization:
MarcusCom, Inc.
>Environment:
System: FreeBSD gyros.marcuscom.com 4.5-STABLE FreeBSD 4.5-STABLE #0: Thu Mar 14 01:33:12 EST 2002 marcus@gyros.marcuscom.com:/usr/obj/usr/src/sys/GYROS i386
>Description:
Recent versions of -stable have nl_langinfo(), thus this hack in nautilus
is no longer required.
>How-To-Repeat:
>Fix:
--- patch-libnautilus-private::nautilus-desktop-file-loader.c.patch begins here ---
--- files/patch-libnautilus-private::nautilus-desktop-file-loader.c.orig Mon Mar 18 17:55:42 2002
+++ files/patch-libnautilus-private::nautilus-desktop-file-loader.c Mon Mar 18 17:55:10 2002
@@ -7,9 +7,8 @@
#include <errno.h>
#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 +18,7 @@
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) {
--- patch-libnautilus-private::nautilus-desktop-file-loader.c.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203182304.g2IN44j88379>