Date: Sun, 27 Jul 2008 11:04:29 +0000 From: Jens Rehsack <rehsack@web.de> To: FreeBSD GNOME Users <gnome@freebsd.org> Subject: Help required: how to add a patch to gnome-commmander2 port? Message-ID: <488C563D.2000203@web.de>
next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------060000080204070104000603
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Hi all,
I tried to update x11-fm/gnome-commander2/ to it's current version,
but there was an error in the ./configure script.
Piotr sent me a patch (modified version attached with applies cleanly
to the port), but it patched the configure.in and the port assumes
autoconf has been already run.
Is it enough to add autoconf to the USE_AUTOTOOLS line or do I have
check/add sth. else?
Thanks in advance,
Jens
--------------060000080204070104000603
Content-Type: text/plain;
name="gcmd-FNM_CASEFOLD.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="gcmd-FNM_CASEFOLD.patch"
diff -ru gnome-commander-1.2.6/configure.in gnome-commander-1.2.6-patch/configure.in
--- configure.in.orig 2008-06-01 16:44:26.000000000 +0200
+++ configure.in 2008-07-23 10:32:56.474220300 +0200
@@ -237,7 +237,6 @@
dnl Checks for library functions
dnl =============================
-AC_FUNC_FNMATCH_GNU
AC_FUNC_MMAP
dnl ================================================================
diff -ru gnome-commander-1.2.6/src/filter.cc gnome-commander-1.2.6-patch/src/filter.cc
--- src/filter.cc,orig 2008-06-01 16:44:26.000000000 +0200
+++ src/filter.cc 2008-07-23 10:32:56.489868100 +0200
@@ -25,10 +25,6 @@
#include "gnome-cmd-includes.h"
#include "filter.h"
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
using namespace std;
@@ -55,7 +51,7 @@
filter->fn_exp = g_strdup (exp);
filter->fn_flags = FNM_NOESCAPE;
-#ifdef _GNU_SOURCE
+#ifdef FNM_CASEFOLD
if (!case_sens)
filter->fn_flags |= FNM_CASEFOLD;
#endif
diff -ru gnome-commander-1.2.6/src/gnome-cmd-file-popmenu.cc gnome-commander-1.2.6-patch/src/gnome-cmd-file-popmenu.cc
--- src/gnome-cmd-file-popmenu.cc.orig 2008-06-01 16:44:26.000000000 +0200
+++ src/gnome-cmd-file-popmenu.cc 2008-07-23 10:32:56.505515900 +0200
@@ -30,9 +30,6 @@
#include "utils.h"
#include "cap.h"
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
#include <fnmatch.h>
using namespace std;
@@ -284,7 +281,7 @@
for (; files; files = files->next)
{
gboolean ok = FALSE;
-#ifdef _GNU_SOURCE
+#ifdef FNM_CASEFOLD
gint fn_flags = FNM_NOESCAPE | FNM_CASEFOLD;
#else
gint fn_flags = FNM_NOESCAPE;
diff -ru gnome-commander-1.2.6/src/utils.cc gnome-commander-1.2.6-patch/src/utils.cc
--- src/utils.cc.orig 2008-06-01 16:44:26.000000000 +0200
+++ src/utils.cc 2008-07-23 10:32:56.521163700 +0200
@@ -33,9 +33,6 @@
#include "gnome-cmd-con-list.h"
#include "gnome-cmd-xfer.h"
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
#include <fnmatch.h>
using namespace std;
@@ -1328,7 +1325,7 @@
gboolean patlist_matches (GList *pattern_list, const gchar *s)
{
for (GList *tmp = pattern_list; tmp; tmp = tmp->next)
-#ifdef _GNU_SOURCE
+#ifdef FNM_CASEFOLD
if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE|FNM_CASEFOLD) == 0)
#else
if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE) == 0) // omit FNM_CASEFOLD as it is a GNU extension.
--------------060000080204070104000603--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?488C563D.2000203>