--- a/ChangeLog	Sun Jun 10 11:48:31 2007 +0000
+++ b/ChangeLog	Mon Jun 11 13:25:33 2007 +0000
@@ -1,3 +1,15 @@
+2007-06-11  Damien Carbery <[email protected]>
+
+	* SFEgnome-commander.spec: Added, along with multiple patches.
+	* patches/gnome-commander-01-Wall.diff,
+	patches/gnome-commander-02-empty-struct.diff,
+	patches/gnome-commander-03-fnmatch-extension.diff
+	patches/gnome-commander-04-obsolete-mmap-opt.diff
+	patches/gnome-commander-05-void-return.diff
+	patches/gnome-commander-06-bad-ternary-code.diff
+	patches/gnome-commander-07-typedef-comma.diff: Added for bugzilla
+	365227 and 446361. Doesn't fully build because of C++ template issue.
+
 2007-06-10  Halton Huo  <[email protected]>
 
 	* SFEwv.spec: Add defattr root:bin to -devel package.
@@ -22,9 +34,10 @@
 	  remove patch hal-01-configure.diff.
 	* patches/hal-01-configure.diff: removed.
 
-2007-06-05  JerryYu  <[email protected]>
-
-	* SFElibopensync-plugin-file.spec: Splitted from SFElibopensync-plugin.spec and bumped to 0.30
+2007-06-05  Jerry Yu  <[email protected]>
+
+	* SFElibopensync-plugin-file.spec: Split from
+	  SFElibopensync-plugin.spec and bumped to 0.30.
 	* linux-specs/libopensync-plugin-file.spec: Bump to 0.30
 	* patches/libopensync-plugin-file-02-null-crash.diff:Removed.
 	
@@ -49,6 +62,7 @@
 	* SFEimagemagick.spec: new - SFW imagemagick gets too old
 
 2007-06-05  JerryYu  <[email protected]>
+
 	* SFElibopensync.spec
 	  linux-specs/libopensync.spec: Bump to 0.30
 	* patches/libopensync-01-forte-wall.diff: removed
@@ -57,8 +71,10 @@
 	* patches/libopensync-04-null-crash.diff: removed
 	* patches/libopensync-01-add-glib.diff: added
 	* linux-specs/msynctool.spec: Bump to 0.30
-	* SFEmultisync.spec was splitted into SFEmultisync.spec and SFEmsynctool.spec
-	* patches/msynctool-01-forte-wall.diff: Modified since msynctool was bumped to 0.30
+	* SFEmultisync.spec was split into SFEmultisync.spec and
+	  SFEmsynctool.spec
+	* patches/msynctool-01-forte-wall.diff: Modified since msynctool was
+	  bumped to 0.30
 
 2007-06-05  Doug Scott  <[email protected]>
 
@@ -93,26 +109,26 @@
 2007-06-04  Thomas Wagner <[email protected]>
 
         * SFEmpd.spec: bump to 0.13.0, re- --enable-flac --enable-oggflac
-                       mpd now compiles with newer flac versions
-                       (new feature) --enable-shout for streaming:t
-                       "the net is the music"
-                       if SFEavahi is present, mpd resources will
-                       be announced with zeroconf/avahi/mDNS broadcasts
-                       patch3: make id3_charset in mpdconf.example
-                       default to UTF-8
+          mpd now compiles with newer flac versions
+	  (new feature) --enable-shout for streaming:t
+          "the net is the music"
+          if SFEavahi is present, mpd resources will
+          be announced with zeroconf/avahi/mDNS broadcasts
+          patch3: make id3_charset in mpdconf.example
+          default to UTF-8
 
         * SFEavahi.spec: (new) implemetation of service discovery in
-                       local LAN (see Rendezvous/Bonjour/Zeroconf and ...
-                       nwam in the future)
+          local LAN (see Rendezvous/Bonjour/Zeroconf and ...
+          nwam in the future)
         * SFElibdaemon.spec: (new) library for building daemons (for avahi)
 
         * SFEgmpc.spec: (new feature) AVAHI zeroconf support
-                        (new feature) icecast/shout stream to local client (needs: ogg123)
-                        bump to 0.15.0, set compiler to gcc
+          (new feature) icecast/shout stream to local client (needs: ogg123)
+          bump to 0.15.0, set compiler to gcc
         * SFEgmpc-(lyrics|serverstats|coveramazon|autoplaylist|qosd|stopbutton|lastfm|magnatune|osd|mdcover).spec
-                        bump to 0.15.0, set compiler to gcc
+          bump to 0.15.0, set compiler to gcc
         * SFElibmpd.spec: bump to 0.14.0
-                        temporary patch libmpd-01-libmpdclient-include-limits.h.diff
+          temporary patch libmpd-01-libmpdclient-include-limits.h.diff
 
         * SFExosd.spec: set compiler to gcc
 
@@ -121,8 +137,8 @@
         * SFEcurl.spec: bump to 7.16.2, --disable-static
 
         * SFExchat.spec: bump to 2.8.2
-                         /usr/bin/msgfmt errors, use /opt/sfw/bin/msgfmt
-                         reworked patch for 2.8.2
+          /usr/bin/msgfmt errors, use /opt/sfw/bin/msgfmt
+          reworked patch for 2.8.2
 
         * SFEicecast.spec: (new) stream musik over http to the LAN/WAN network
         * SFElibshout.spec: (new) Support Library for icecast audio streaming
@@ -133,7 +149,8 @@
 
         * SFEfont-terminus.spec: (new) nice readably font
 
-        * SFElynx.spec: bump to 2.8.6, new download-URL since not in /current/-diry
+        * SFElynx.spec: bump to 2.8.6, new download-URL since not in
+	  /current/-diry
 
 2007-06-03  Dick Hoogendijk
 
@@ -175,12 +192,14 @@
 	* SFEscons.spec: Bump to 0.97
 
 2007-05-21  Dick Hoogendijk  <[email protected]>
+
 	* SFEmutt.spec: (new) The Mutt E-mail client (original)
 	* SFEmuttng.spec: Forced dependency from libcurses to slang;
 	  changed some compilerflags to get good SSL support
 	* SFEslang.spec: Bump to v2.0.7
 
 2007-05-20  Dick Hoogendijk  <[email protected]>
+
 	* SFEmplayer-plugin: Bump to v3.40 and up
 	  Patchfiles changed to support newest code
   	  mpplugin-01-makefile.diff ADDED
@@ -266,6 +285,7 @@
 	* SFEsdl-gfx.spec: Added libSDL graphics library
 
 2007-05-05  Thomas Wagner <[email protected]>
+
         * SFEre2c.spec: Added re2c for generating high efficient code
           for regular expression matching
 
@@ -331,6 +351,7 @@
 	* SFEjam.spec: Added jam (a make lookalike)
 
 2007-05-05  Thomas Wagner <[email protected]>
+
         * SFEphp.spec: Bump: to 5.2.2 (mainly security fixes)
 
 2007-05-04  Halton Huo  <[email protected]>
@@ -447,10 +468,11 @@
 	Bump to version 2.18.2. Rework the patch.
 
 2007-04-26  Thomas Wagner <[email protected]>
+
         * SFEmpd.spec: --disable-flac, --disable-oggflac
           mpd possibly has to be updated to reflect new libFLAC includes
-          does not compile with libflac from vermillion_64 (sorry, 62 was a typo)
-          you may enable *flac if using older libFLAC versions
+          does not compile with libflac from vermillion_64 (sorry, 62 was a
+	  typo) you may enable *flac if using older libFLAC versions
 
 2007-04-26 Erwann Chenede - <[email protected]>
 
@@ -458,6 +480,7 @@
 	  the rest of solaris packages
 
 2007-04-26  Thomas Wagner <[email protected]>
+
         * SFEmpd.spec: Patch2: make filesystem_charset in mpdconf.example UTF-8
           NOTE: If directories/files with UTF-8 names missing in the 
           database, then update your existing /etc/mpd.conf|~/.mpd.conf 
@@ -752,8 +775,8 @@
 2007-03-31  Thomas Wagner <[email protected]>
 
         * SFEgd.spec: split into SFEgd SFEgd-devel
-                      Bump to 2.0.34
-                      new Url / Source
+          Bump to 2.0.34
+          new Url / Source
         * SFElibmhash.spec: (new) for: SFEphp
         * SFElibmcrypt.spec: (new) for: SFEphp
         * SFEmcrypt.spec: (new) uses SFElibmcrypt and SFElibmhash

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SFEgnome-commander.spec	Mon Jun 11 13:25:33 2007 +0000
@@ -0,0 +1,121 @@
+#
+# spec file for package SFEgnome-commander
+#
+# includes module(s): gnome-commander
+#
+%include Solaris.inc
+
+Name:                    SFEgnome-commander
+Summary:                 Meld Diff and Merge Tool
+Version:                 1.2.4
+Source:                  http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/gnome-commander-%{version}.tar.bz2
+# owner:dcarbery type:bug bugzilla:446361
+Patch1:                  gnome-commander-01-Wall.diff
+# owner:dcarbery type:bug bugzilla:446361
+Patch2:                  gnome-commander-02-empty-struct.diff
+# owner:dcarbery type:bug bugzilla:446361
+Patch3:                  gnome-commander-03-fnmatch-extension.diff
+# owner:dcarbery type:bug bugzilla:365227
+Patch4:                  gnome-commander-04-obsolete-mmap-opt.diff
+# owner:dcarbery type:bug bugzilla:446361
+Patch5:                  gnome-commander-05-void-return.diff
+# owner:dcarbery type:bug bugzilla:446361
+Patch6:                  gnome-commander-06-bad-ternary-code.diff
+# owner:dcarbery type:bug bugzilla:446361
+Patch7:                  gnome-commander-07-typedef-comma.diff
+SUNW_BaseDir:            %{_basedir}
+BuildRoot:               %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+BuildRequires: SUNWgnome-libs-devel
+BuildRequires: SUNWPython
+BuildRequires: SUNWgnome-python-libs-devel
+Requires: SUNWgnome-libs
+Requires: SUNWgnome-python-libs
+
+%if %build_l10n
+%package l10n
+Summary:                 %{summary} - l10n files
+SUNW_BaseDir:            %{_basedir}
+%include default-depend.inc
+Requires:                %{name}
+%endif
+
+%prep
+%setup -q -n gnome-commander-%version
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+    CPUS=1
+fi
+export PYTHON="/usr/bin/python"
+export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP"
+export RPM_OPT_FLAGS="$CFLAGS"
+export ACLOCAL_FLAGS="-I %{_datadir}/aclocal"
+export CPPFLAGS="-I/usr/sfw/include"
+export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib"
+export MSGFMT="/usr/bin/msgfmt"
+
+aclocal $ACLOCAL_FLAGS -I m4
+automake -a -c -f
+autoconf
+./configure --prefix=%{_prefix}
+make prefix=%{_prefix} -j$CPUS 
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/help/*/[a-z]*
+rm -rf $RPM_BUILD_ROOT%{_datadir}/omf/*/*-[a-z]*.omf
+%endif
+
+# Delete unneeded scrollkeeper files.
+rm -rf $RPM_BUILD_ROOT%{_prefix}/var
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/omf/meld/meld-C.omf
+%dir %attr (0755, root, other) %{_datadir}/application-registry
+%{_datadir}/application-registry/*
+%dir %attr (0755, root, other) %{_datadir}/applications
+%{_datadir}/applications/*
+%dir %attr (0755, root, other) %{_datadir}/meld
+%{_datadir}/meld/*
+%dir %attr (0755, root, other) %{_datadir}/gnome
+%{_datadir}/gnome/help/*/C
+%dir %attr (0755, root, other) %{_datadir}/doc
+%{_datadir}/doc/*
+%dir %attr (0755, root, other) %{_datadir}/pixmaps
+%{_datadir}/pixmaps/*
+
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
+%changelog
+* Mon Jun 11 2007 - [email protected]
+- Initial version

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-commander-01-Wall.diff	Mon Jun 11 13:25:33 2007 +0000
@@ -0,0 +1,96 @@
+--- 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 @@
+ .l.c:
+ 	$(LEXCOMPILE) $<
+ 
+-AM_CPPFLAGS = -Wall \
+-	-I$(top_srcdir) \
++AM_CPPFLAGS = -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 @@
+ ## 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/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 @@
+ ## 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) \
+ 	$(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 @@
+ SUBDIRS = tags libgviewer
+ 
+ AM_CPPFLAGS = \
+-	-Wall \
+ 	-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 @@
+ noinst_LIBRARIES = libgcmd-id3lib.a
+ 
+ AM_CPPFLAGS = \
+-	-Wall \
+ 	-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
+ 
+ AM_CPPFLAGS = \
+-	-Wall \
+ 	-I$(top_srcdir) \
+ 	-I.. \
+ 	$(GNOMEUI_CFLAGS) \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-commander-02-empty-struct.diff	Mon Jun 11 13:25:33 2007 +0000
@@ -0,0 +1,12 @@
+--- gnome-commander-1.2.4/libgcmd/gnome-cmd-file-info.c.orig	2007-06-11 14:08:21.962806573 +0100
++++ gnome-commander-1.2.4/libgcmd/gnome-cmd-file-info.c	2007-06-11 14:09:05.115818235 +0100
+@@ -25,6 +25,9 @@
+ 
+ struct _GnomeCmdFileInfoPrivate
+ {
++#ifdef __sun
++  char x;  /* Sun's forte compiler does not line empty structs. */
++#endif
+ };
+ 
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-commander-03-fnmatch-extension.diff	Mon Jun 11 13:25:33 2007 +0000
@@ -0,0 +1,14 @@
+--- gnome-commander-1.2.4/src/filter.cc.orig	2007-06-11 14:20:00.411709383 +0100
++++ gnome-commander-1.2.4/src/filter.cc	2007-06-11 14:24:07.702213940 +0100
+@@ -56,8 +56,11 @@
+     filter->fn_exp = g_strdup (exp);
+     filter->fn_flags = FNM_NOESCAPE;
+ 
++#ifdef __GNUC
++    /* FNM_CASEFOLD is a GNU extension for fnmatch(). */
+     if (!case_sens)
+         filter->fn_flags |= FNM_CASEFOLD;
++#endif
+ 
+     return filter;
+ }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-commander-04-obsolete-mmap-opt.diff	Mon Jun 11 13:25:33 2007 +0000
@@ -0,0 +1,11 @@
+--- gnome-commander-1.2.4/src/libgviewer/fileops.c.orig	2007-06-11 14:15:40.150381589 +0100
++++ gnome-commander-1.2.4/src/libgviewer/fileops.c	2007-06-11 14:16:52.571323029 +0100
+@@ -238,7 +238,7 @@
+     }
+ #ifdef HAVE_MMAP
+     if ((size_t) ops->s.st_size == ops->s.st_size)
+-        ops->data = mmap (0, ops->s.st_size, PROT_READ, MAP_FILE | MAP_SHARED, ops->file, 0);
++        ops->data = mmap (0, ops->s.st_size, PROT_READ, MAP_SHARED, ops->file, 0);
+     else
+         ops->data = MAP_FAILED;
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-commander-05-void-return.diff	Mon Jun 11 13:25:33 2007 +0000
@@ -0,0 +1,11 @@
+--- gnome-commander-1.2.4/src/libgviewer/viewer-widget.c.orig	2007-06-11 14:18:48.051936526 +0100
++++ gnome-commander-1.2.4/src/libgviewer/viewer-widget.c	2007-06-11 14:18:59.250584656 +0100
+@@ -608,7 +608,7 @@
+     g_return_if_fail (IS_GVIEWER (obj));
+     g_return_if_fail (obj->priv->imgr);
+ 
+-    return image_render_operation(obj->priv->imgr, op);
++    image_render_operation(obj->priv->imgr, op);
+ }
+ 
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-commander-06-bad-ternary-code.diff	Mon Jun 11 13:25:33 2007 +0000
@@ -0,0 +1,11 @@
+--- gnome-commander-1.2.4/src/gnome-cmd-data.cc.orig	2007-06-11 14:25:41.116044934 +0100
++++ gnome-commander-1.2.4/src/gnome-cmd-data.cc	2007-06-11 14:26:06.817660346 +0100
+@@ -148,7 +148,7 @@
+                 gchar *pw    = gnome_vfs_escape_string (gnome_cmd_con_ftp_get_pw (server));
+                 GnomeCmdBookmarkGroup *bookmark_group = gnome_cmd_con_get_bookmarks (GNOME_CMD_CON (server));
+ 
+-                fprintf (fd, "C: %s %s %s %d %s %s %s\n", "ftp:", alias, hname, port, remote_dir, uname, pw?:"");
++                fprintf (fd, "C: %s %s %s %d %s %s %s\n", "ftp:", alias, hname, port, remote_dir, uname, pw?pw:"");
+ 
+                 g_free (alias);
+                 g_free (hname);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-commander-07-typedef-comma.diff	Mon Jun 11 13:25:33 2007 +0000
@@ -0,0 +1,11 @@
+--- gnome-commander-1.2.4/src/gnome-cmd-types.h.orig	2007-06-11 14:19:41.066772155 +0100
++++ gnome-commander-1.2.4/src/gnome-cmd-types.h	2007-06-11 14:19:51.670640598 +0100
+@@ -46,7 +46,7 @@
+ typedef enum
+ {
+     GNOME_CMD_PERM_DISP_MODE_TEXT,
+-    GNOME_CMD_PERM_DISP_MODE_NUMBER,
++    GNOME_CMD_PERM_DISP_MODE_NUMBER
+ } GnomeCmdPermDispMode;
+ 
+