2007-06-11 Damien Carbery <
[email protected]>
* SFEgnome-commander.spec: Update %files and %install now that build
is working.
* patches/gnome-commander-01-Wall.diff: Update with better solution to
removing -Wall (use configure.in check and Makefile.am variables).
* patches/gnome-commander-08-warnx.diff,
patches/gnome-commander-09-other.diff: Added to fix more build issues.
--- a/ChangeLog Mon Jun 11 13:25:33 2007 +0000
+++ b/ChangeLog Tue Jun 12 11:13:39 2007 +0000
@@ -1,3 +1,12 @@
+2007-06-11 Damien Carbery <[email protected]>
+
+ * SFEgnome-commander.spec: Update %files and %install now that build
+ is working.
+ * patches/gnome-commander-01-Wall.diff: Update with better solution to
+ removing -Wall (use configure.in check and Makefile.am variables).
+ * patches/gnome-commander-08-warnx.diff,
+ patches/gnome-commander-09-other.diff: Added to fix more build issues.
+
2007-06-11 Damien Carbery <[email protected]>
* SFEgnome-commander.spec: Added, along with multiple patches.
--- a/SFEgnome-commander.spec Mon Jun 11 13:25:33 2007 +0000
+++ b/SFEgnome-commander.spec Tue Jun 12 11:13:39 2007 +0000
@@ -117,5 +117,8 @@
%endif
%changelog
+* Tue Jun 12 2007 - [email protected]
+- Update %files and %install now that build is working.
+
* Mon Jun 11 2007 - [email protected]
- Initial version
--- a/patches/gnome-commander-01-Wall.diff Mon Jun 11 13:25:33 2007 +0000
+++ b/patches/gnome-commander-01-Wall.diff Tue Jun 12 11:13:39 2007 +0000
@@ -1,96 +1,122 @@
---- gnome-commander-1.2.4/plugins/cvs/Makefile.am.orig 2007-06-11 13:47:15.859986065 +0100
-+++ gnome-commander-1.2.4/plugins/cvs/Makefile.am 2007-06-11 13:47:26.412585981 +0100
-@@ -3,8 +3,7 @@
+--- gnome-commander-1.2.4/configure.in.orig 2007-06-12 10:43:09.594467068 +0100
++++ gnome-commander-1.2.4/configure.in 2007-06-12 10:44:53.690289562 +0100
+@@ -19,6 +19,13 @@
+ AC_SUBST(ACLOCAL_AMFLAGS, "$ACLOCAL_FLAGS -I m4")
+
+
++dnl Add -Wall to CFLAGS when using gcc
++AC_SUBST(GCC_WARNINGS)
++GCC_WARNINGS=
++if test "x$GCC" = "xyes"; then
++ GCC_WARNINGS="-Wall"
++fi
++
+ dnl ===================
+ dnl Gettext stuff
+ dnl ===================
+--- gnome-commander-1.2.4/libgcmd/Makefile.am.orig 2007-06-12 10:48:00.522639516 +0100
++++ gnome-commander-1.2.4/libgcmd/Makefile.am 2007-06-12 10:48:05.639412425 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-AM_CPPFLAGS = -Wall \
++AM_CPPFLAGS = $(GCC_WARNINGS) \
+ $(GNOMEUI_CFLAGS) \
+ $(GNOMEVFS_CFLAGS)
+
+--- gnome-commander-1.2.4/plugins/cvs/Makefile.am.orig 2007-06-12 10:47:22.046730441 +0100
++++ gnome-commander-1.2.4/plugins/cvs/Makefile.am 2007-06-12 10:47:27.314987728 +0100
+@@ -3,7 +3,7 @@
.l.c:
$(LEXCOMPILE) $<
-AM_CPPFLAGS = -Wall \
-- -I$(top_srcdir) \
-+AM_CPPFLAGS = -I$(top_srcdir) \
++AM_CPPFLAGS = $(GCC_WARNINGS) \
+ -I$(top_srcdir) \
$(GNOMEUI_CFLAGS) \
$(GNOMEVFS_CFLAGS)
-
---- gnome-commander-1.2.4/plugins/test/Makefile.am.orig 2007-06-11 13:47:32.372820596 +0100
-+++ gnome-commander-1.2.4/plugins/test/Makefile.am 2007-06-11 13:47:39.295461801 +0100
-@@ -1,7 +1,6 @@
- ## Process this file with automake to produce Makefile.in
-
--AM_CPPFLAGS = -Wall \
-- -I$(top_srcdir) \
-+AM_CPPFLAGS = -I$(top_srcdir) \
- $(GNOMEUI_CFLAGS) \
- $(GNOMEVFS_CFLAGS)
-
---- gnome-commander-1.2.4/plugins/fileroller/Makefile.am.orig 2007-06-11 13:47:40.547751889 +0100
-+++ gnome-commander-1.2.4/plugins/fileroller/Makefile.am 2007-06-11 13:47:45.470753418 +0100
-@@ -1,7 +1,6 @@
+--- gnome-commander-1.2.4/plugins/fileroller/Makefile.am.orig 2007-06-12 10:47:15.349813052 +0100
++++ gnome-commander-1.2.4/plugins/fileroller/Makefile.am 2007-06-12 10:47:20.930556232 +0100
+@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-AM_CPPFLAGS = -Wall \
-- -I$(top_srcdir) \
-+AM_CPPFLAGS = -I$(top_srcdir) \
++AM_CPPFLAGS = $(GCC_WARNINGS) \
+ -I$(top_srcdir) \
$(GNOMEUI_CFLAGS) \
$(GNOMEVFS_CFLAGS)
-
---- gnome-commander-1.2.4/libgcmd/Makefile.am.orig 2007-06-11 13:47:48.325985541 +0100
-+++ gnome-commander-1.2.4/libgcmd/Makefile.am 2007-06-11 13:47:53.252430408 +0100
-@@ -1,7 +1,6 @@
+--- gnome-commander-1.2.4/plugins/test/Makefile.am.orig 2007-06-12 10:46:47.005255804 +0100
++++ gnome-commander-1.2.4/plugins/test/Makefile.am 2007-06-12 10:47:12.465542914 +0100
+@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-AM_CPPFLAGS = -Wall \
-- $(GNOMEUI_CFLAGS) \
-+AM_CPPFLAGS = $(GNOMEUI_CFLAGS) \
- $(GNOMEVFS_CFLAGS)
-
- pkglib_LTLIBRARIES = libgcmd.la
---- gnome-commander-1.2.4/tests/gviewer/Makefile.am.orig 2007-06-11 13:47:53.945315955 +0100
-+++ gnome-commander-1.2.4/tests/gviewer/Makefile.am 2007-06-11 13:47:59.840804480 +0100
-@@ -1,6 +1,5 @@
- ## Process this file with automake to produce Makefile.in
--AM_CPPFLAGS = -Wall \
-- $(GLIB_CFLAGS) \
-+AM_CPPFLAGS = $(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
++AM_CPPFLAGS = $(GCC_WARNINGS) \
+ -I$(top_srcdir) \
$(GNOMEUI_CFLAGS) \
- -I$(top_builddir)/src
---- gnome-commander-1.2.4/src/libgviewer/Makefile.am.orig 2007-06-11 13:48:03.033563417 +0100
-+++ gnome-commander-1.2.4/src/libgviewer/Makefile.am 2007-06-11 13:48:07.404887251 +0100
-@@ -1,7 +1,6 @@
- ## Process this file with automake to produce Makefile.in
-
--AM_CPPFLAGS = -Wall \
-- -I$(top_srcdir) \
-+AM_CPPFLAGS = -I$(top_srcdir) \
- -I.. \
- $(GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
---- gnome-commander-1.2.4/src/Makefile.am.orig 2007-06-11 13:48:08.362972920 +0100
-+++ gnome-commander-1.2.4/src/Makefile.am 2007-06-11 13:48:13.182518062 +0100
-@@ -3,7 +3,6 @@
+ $(GNOMEVFS_CFLAGS)
+--- gnome-commander-1.2.4/src/Makefile.am.orig 2007-06-12 10:47:40.808431486 +0100
++++ gnome-commander-1.2.4/src/Makefile.am 2007-06-12 10:47:45.981793262 +0100
+@@ -3,7 +3,7 @@
SUBDIRS = tags libgviewer
AM_CPPFLAGS = \
- -Wall \
++ $(GCC_WARNINGS) \
-I$(top_srcdir) \
$(GNOMEUI_CFLAGS) \
$(GNOMEVFS_CFLAGS) \
---- gnome-commander-1.2.4/src/tags/id3lib/Makefile.am.orig 2007-06-11 13:48:14.880165480 +0100
-+++ gnome-commander-1.2.4/src/tags/id3lib/Makefile.am 2007-06-11 13:48:18.339860707 +0100
-@@ -1,7 +1,6 @@
+--- gnome-commander-1.2.4/src/libgviewer/Makefile.am.orig 2007-06-12 10:47:46.769065861 +0100
++++ gnome-commander-1.2.4/src/libgviewer/Makefile.am 2007-06-12 10:47:52.125803870 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-AM_CPPFLAGS = -Wall \
++AM_CPPFLAGS = $(GCC_WARNINGS) \
+ -I$(top_srcdir) \
+ -I.. \
+ $(GLIB_CFLAGS) \
+--- gnome-commander-1.2.4/src/tags/Makefile.am.orig 2007-06-12 10:47:27.895246409 +0100
++++ gnome-commander-1.2.4/src/tags/Makefile.am 2007-06-12 10:47:33.860231054 +0100
+@@ -3,7 +3,7 @@
+ noinst_LIBRARIES = libgcmd-tags.a
+
+ AM_CPPFLAGS = \
+- -Wall \
++ $(GCC_WARNINGS) \
+ -I$(top_srcdir) \
+ -I.. \
+ $(GNOMEUI_CFLAGS) \
+--- gnome-commander-1.2.4/src/tags/id3lib/Makefile.am.orig 2007-06-12 10:47:35.048056852 +0100
++++ gnome-commander-1.2.4/src/tags/id3lib/Makefile.am 2007-06-12 10:47:40.228433542 +0100
+@@ -1,7 +1,7 @@
noinst_LIBRARIES = libgcmd-id3lib.a
AM_CPPFLAGS = \
- -Wall \
++ $(GCC_WARNINGS) \
-I$(top_srcdir) \
$(GNOMEUI_CFLAGS)
---- gnome-commander-1.2.4/src/tags/Makefile.am.orig 2007-06-11 13:48:19.404274398 +0100
-+++ gnome-commander-1.2.4/src/tags/Makefile.am 2007-06-11 13:48:21.921997737 +0100
-@@ -3,7 +3,6 @@
- noinst_LIBRARIES = libgcmd-tags.a
+--- gnome-commander-1.2.4/tests/gviewer/Makefile.am.orig 2007-06-12 10:47:52.897904911 +0100
++++ gnome-commander-1.2.4/tests/gviewer/Makefile.am 2007-06-12 10:47:59.254254337 +0100
+@@ -1,5 +1,5 @@
+ ## Process this file with automake to produce Makefile.in
+-AM_CPPFLAGS = -Wall \
++AM_CPPFLAGS = $(GCC_WARNINGS) \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(GNOMEUI_CFLAGS) \
+--- trunk/src/dict.h 2007/04/16 20:48:43 858
++++ trunk/src/dict.h 2007/06/11 22:08:01 972
+@@ -54,8 +54,8 @@
+ template <typename KEY, typename VAL>
+ inline void DICT<KEY,VAL>::add(const KEY k, const VAL &v)
+ {
+- std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(VAL *) NULL));
+- std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(KEY *) NULL));
++ std::pair<typename KEY_COLL::iterator,bool> k_pos = k_coll.insert(make_pair(k,(const VAL *) NULL));
++ std::pair<typename VAL_COLL::iterator,bool> v_pos = v_coll.insert(make_pair(v,(const KEY *) NULL));
- AM_CPPFLAGS = \
-- -Wall \
- -I$(top_srcdir) \
- -I.. \
- $(GNOMEUI_CFLAGS) \
+ if (k_pos.second)
+ k_pos.first->second = &v_pos.first->first;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-commander-08-warnx.diff Tue Jun 12 11:13:39 2007 +0000
@@ -0,0 +1,223 @@
+--- gnome-commander-1.2.4/tests/gviewer/search_dlg_test.c.orig 2007-06-12 12:19:25.657304404 +0100
++++ gnome-commander-1.2.4/tests/gviewer/search_dlg_test.c 2007-06-12 12:19:39.735544131 +0100
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <err.h>
+
+ #include <glib.h>
+ #include <gtk/gtk.h>
+--- gnome-commander-1.2.4/tests/gviewer/imagerenderer.c.orig 2007-06-12 12:17:31.884860379 +0100
++++ gnome-commander-1.2.4/tests/gviewer/imagerenderer.c 2007-06-12 12:17:47.347215289 +0100
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <err.h>
+
+ #include <glib.h>
+ #include <gtk/gtk.h>
+@@ -61,7 +60,7 @@
+ best_fit = FALSE;
+ scale_factor = atof(optarg);
+ if (scale_factor<0.1 || scale_factor>3.0) {
+- warnx("Invalid scale factor \"%f\".\n", scale_factor);
++ g_warning("Invalid scale factor \"%f\".\n", scale_factor);
+ usage();
+ }
+ break;
+@@ -73,7 +72,7 @@
+ }
+
+ if (optind == argc) {
+- warnx("Need file name to work with...\n");
++ g_warning("Need file name to work with...\n");
+ usage();
+ }
+ filename = g_strdup(argv[optind++]);
+--- gnome-commander-1.2.4/tests/gviewer/viewerwindow.c.orig 2007-06-12 12:19:02.270560442 +0100
++++ gnome-commander-1.2.4/tests/gviewer/viewerwindow.c 2007-06-12 12:19:11.996222845 +0100
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <err.h>
+
+ #include <glib.h>
+ #include <gtk/gtk.h>
+--- gnome-commander-1.2.4/tests/gviewer/dualrenderer.c.orig 2007-06-12 12:17:55.855405530 +0100
++++ gnome-commander-1.2.4/tests/gviewer/dualrenderer.c 2007-06-12 12:18:05.021337366 +0100
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <err.h>
+
+ #include <glib.h>
+ #include <gtk/gtk.h>
+--- gnome-commander-1.2.4/tests/gviewer/textrenderer.c.orig 2007-06-12 12:08:35.611104637 +0100
++++ gnome-commander-1.2.4/tests/gviewer/textrenderer.c 2007-06-12 12:17:20.864556060 +0100
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <err.h>
+
+ #include <glib.h>
+ #include <gtk/gtk.h>
+@@ -86,7 +85,7 @@
+ dispmode = TR_DISP_MODE_HEXDUMP;
+ else
+ {
+- warnx("Invalid display mode \"%s\".\n", optarg);
++ g_warning("Invalid display mode \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -95,7 +94,7 @@
+ tab_size = atoi(optarg);
+ if (tab_size <=0)
+ {
+- warnx("Invalid tab size \"%s\".\n", optarg);
++ g_warning("Invalid tab size \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -103,7 +102,7 @@
+ case 'f':
+ fixed_limit = atoi(optarg);
+ if (fixed_limit<=0) {
+- warnx("Invalid fixed limit \"%s\".\n", optarg);
++ g_warning("Invalid fixed limit \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -116,7 +115,7 @@
+
+ if (optind == argc)
+ {
+- warnx("Need file name to work with...\n");
++ g_warning("Need file name to work with...\n");
+ usage();
+ }
+ filename = g_strdup(argv[optind++]);
+--- gnome-commander-1.2.4/tests/gviewer/datapresentation.c.orig 2007-06-12 11:45:15.019894887 +0100
++++ gnome-commander-1.2.4/tests/gviewer/datapresentation.c 2007-06-12 12:16:51.677632193 +0100
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <err.h>
+
+ #include <libgviewer/libgviewer.h>
+ #include <libgviewer/gvtypes.h>
+@@ -98,7 +97,7 @@
+ else if (g_ascii_strcasecmp(optarg,"FIXED")==0)
+ presentation = PRSNT_BIN_FIXED;
+ else {
+- warnx("Invalid presentation mode \"%s\".\n", optarg);
++ g_warning("Invalid presentation mode \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -106,7 +105,7 @@
+ case 'w':
+ wrap_limit = atoi(optarg);
+ if (wrap_limit<=0) {
+- warnx("Invalid wrap limit \"%s\".\n", optarg);
++ g_warning("Invalid wrap limit \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -114,7 +113,7 @@
+ case 't':
+ tab_size = atoi(optarg);
+ if (tab_size <=0) {
+- warnx("Invalid tab size \"%s\".\n", optarg);
++ g_warning("Invalid tab size \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -122,7 +121,7 @@
+ case 'f':
+ fixed_limit = atoi(optarg);
+ if (fixed_limit<=0) {
+- warnx("Invalid fixed limit \"%s\".\n", optarg);
++ g_warning("Invalid fixed limit \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -130,7 +129,7 @@
+ }
+
+ if (hexdump && (g_ascii_strcasecmp(encoding, "UTF8")==0)) {
+- warnx("Can't use HexDump mode with UTF8 encoding. (Hexdump requires each character to be one byte exactly)\n");
++ g_warning("Can't use HexDump mode with UTF8 encoding. (Hexdump requires each character to be one byte exactly)\n");
+ exit(0);
+ }
+
+@@ -140,7 +139,7 @@
+ }
+
+ if (optind == argc) {
+- warnx("Need file name to work with...\n");
++ g_warning("Need file name to work with...\n");
+ usage();
+ }
+ filename = g_strdup(argv[optind++]);
+--- gnome-commander-1.2.4/tests/gviewer/viewerwidget.c.orig 2007-06-12 12:18:16.346462976 +0100
++++ gnome-commander-1.2.4/tests/gviewer/viewerwidget.c 2007-06-12 12:18:47.273649967 +0100
+@@ -23,7 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+-#include <err.h>
+
+ #include <glib.h>
+ #include <gtk/gtk.h>
+@@ -78,7 +77,7 @@
+ best_fit = FALSE;
+ scale_factor = atof(optarg);
+ if (scale_factor<0.1 || scale_factor>3.0) {
+- warnx("Invalid scale factor \"%f\".\n", scale_factor);
++ g_warning("Invalid scale factor \"%f\".\n", scale_factor);
+ usage();
+ }
+ break;
+@@ -105,7 +104,7 @@
+ else if (g_ascii_strcasecmp(optarg,"auto")==0)
+ auto_detect_display_mode = TRUE;
+ else {
+- warnx("Invalid display mode \"%s\".\n", optarg);
++ g_warning("Invalid display mode \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -113,7 +112,7 @@
+ case 't':
+ tab_size = atoi(optarg);
+ if (tab_size <=0) {
+- warnx("Invalid tab size \"%s\".\n", optarg);
++ g_warning("Invalid tab size \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -121,7 +120,7 @@
+ case 'f':
+ fixed_limit = atoi(optarg);
+ if (fixed_limit<=0) {
+- warnx("Invalid fixed limit \"%s\".\n", optarg);
++ g_warning("Invalid fixed limit \"%s\".\n", optarg);
+ usage();
+ }
+ break;
+@@ -133,7 +132,7 @@
+ }
+
+ if (optind == argc) {
+- warnx("Need file name to work with...\n");
++ g_warning("Need file name to work with...\n");
+ usage();
+ }
+ filename = g_strdup(argv[optind++]);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-commander-09-other.diff Tue Jun 12 11:13:39 2007 +0000
@@ -0,0 +1,42 @@
+--- gnome-commander-1.2.4/src/utils.cc.orig 2007-06-12 11:33:38.649097000 +0100
++++ gnome-commander-1.2.4/src/utils.cc 2007-06-12 11:34:28.691277289 +0100
+@@ -1283,7 +1283,12 @@
+ gboolean patlist_matches (GList *pattern_list, const gchar *s)
+ {
+ for (GList *tmp = pattern_list; tmp; tmp = tmp->next)
++#ifdef _GNUC
+ if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE|FNM_CASEFOLD) == 0)
++#else
++ // Omit FNM_CASEFOLD as it is a GNU extension.
++ if (fnmatch ((gchar *) tmp->data, s, FNM_NOESCAPE) == 0)
++#endif
+ return TRUE;
+
+ return FALSE;
+--- gnome-commander-1.2.4/src/gnome-cmd-file-popmenu.cc.orig 2007-06-12 11:29:14.440296820 +0100
++++ gnome-commander-1.2.4/src/gnome-cmd-file-popmenu.cc 2007-06-12 11:32:06.691964917 +0100
+@@ -283,7 +283,12 @@
+ for (; files; files = files->next)
+ {
+ gboolean ok = FALSE;
++#ifdef _GNUC
+ gint fn_flags = FNM_NOESCAPE | FNM_CASEFOLD;
++#else
++ // Omit FNM_CASEFOLD as it is a GNU extension.
++ gint fn_flags = FNM_NOESCAPE;
++#endif
+
+ GnomeCmdFile *finfo = (GnomeCmdFile *) files->data;
+ if (finfo->info->type != GNOME_VFS_FILE_TYPE_REGULAR)
+--- gnome-commander-1.2.4/plugins/test/test-plugin.c.orig 2007-06-12 11:43:07.654477136 +0100
++++ gnome-commander-1.2.4/plugins/test/test-plugin.c 2007-06-12 11:44:06.081892357 +0100
+@@ -43,6 +43,9 @@
+
+ struct _TestPluginPrivate
+ {
++#ifdef __sun
++ char x; /* Sun's forte compiler does not line empty structs. */
++#endif
+ };
+
+ static GnomeCmdPluginClass *parent_class = NULL;