Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4820
Modified Files:
libgnome2.info libgnome2.patch
Log Message:
repair of patch enables building with gcc4
Index: libgnome2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/libgnome2.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libgnome2.info 23 Jan 2006 06:16:39 -0000 1.2
+++ libgnome2.info 19 Feb 2006 14:52:18 -0000 1.3
@@ -1,20 +1,15 @@
Package: libgnome2
Version: 2.6.1.2
-Revision: 1021
-Architecture: powerpc
+Revision: 1022
Source: mirror:gnome:sources/libgnome/2.6/libgnome-%v.tar.bz2
Source-MD5: 5970203d9f6822652cc95bdd72082bfb
Depends: %N-shlibs (= %v-%r), audiofile-bin (>= 0.2.5-1), audiofile-shlibs (>=
0.2.5-1), esound (>= 0.2.34-1), gconf2 (>= 2.6.0-1), gettext, glib2 (>=
2.6.6-1111), gnome-vfs2 (>= 2.6.0-1) | gnome-vfs2-ssl (>= 2.6.0-1), libbonobo2
(>= 2.6.0-1), libiconv, libxml2-shlibs (>= 2.6.7-1), orbit2 (>= 2.10.0-1),
popt-shlibs
Conflicts: nautilus (<< 1.0.6-3)
-BuildDepends: glib2-dev (>= 2.6.6-1111), orbit2-dev (>= 2.10.0-1),
libbonobo2-dev (>= 2.6.0-1), gconf2-dev (>= 2.6.0-1), gnome-vfs2-dev (>=
2.6.0-1) | gnome-vfs2-ssl-dev (>= 2.6.0-1), libxml2 (>= 2.6.7-1), libxslt (>=
1.0.18), audiofile (>= 0.2.5), esound (>= 0.2.34), gtk-doc (>= 1.2-1),
intltool, pkgconfig, gettext-dev, gettext-bin, gettext-tools, libiconv-dev,
gcc3.3, popt
+BuildDepends: glib2-dev (>= 2.6.6-1111), orbit2-dev (>= 2.10.0-1),
libbonobo2-dev (>= 2.6.0-1), gconf2-dev (>= 2.6.0-1), gnome-vfs2-dev (>=
2.6.0-1) | gnome-vfs2-ssl-dev (>= 2.6.0-1), libxml2 (>= 2.6.7-1), libxslt (>=
1.0.18), audiofile (>= 0.2.5), esound (>= 0.2.34), gtk-doc (>= 1.2-1),
intltool, pkgconfig, gettext-dev, gettext-bin, gettext-tools, libiconv-dev, popt
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
ConfigureParams: --libexecdir=%p/lib/%n
-CompileScript: <<
- export CC=gcc-3.3; export CXX=g++-3.3; ./configure %c
- make CC=gcc-3.3 CXX=g++-3.3
-<<
InstallScript: <<
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d
<<
@@ -82,6 +77,8 @@
<<
DescPort: <<
Account for Mac OS X's mkdir failing when there's a trailing slash.
+
+New patch inspired by https://launchpad.net/distros/ubuntu/+bug/15331
<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: libgnome2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/gnome/libgnome2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libgnome2.patch 20 Jan 2006 20:12:53 -0000 1.1
+++ libgnome2.patch 19 Feb 2006 14:52:18 -0000 1.2
@@ -1,38 +1,3 @@
-diff -Naur libgnome-2.5.92-old/libgnome/gnome-config.c
libgnome-2.5.92/libgnome/gnome-config.c
---- libgnome-2.5.92-old/libgnome/gnome-config.c Thu May 1 07:31:38 2003
-+++ libgnome-2.5.92/libgnome/gnome-config.c Sun Mar 21 12:06:44 2004
-@@ -100,6 +100,31 @@
-
- static TProfile *Current = 0;
-
-+#ifndef HAVE_STRTOK_R
-+static char *
-+strtok_r (char *s, const char *delim, char **save_ptr)
-+{
-+ char *token;
-+
-+ if (s == NULL)
-+ s = *save_ptr;
-+
-+ s += strspn (s, delim);
-+ if (*s == '\0')
-+ return NULL;
-+
-+ token = s;
-+ s = strpbrk (token, delim);
-+ if (s == NULL) {
-+ *save_ptr = strchr (token, '\0');
-+ } else {
-+ *s = '\0';
-+ *save_ptr = s + 1;
-+ }
-+ return token;
-+}
-+#endif
-+
- /*
- * This one keeps track of all of the opened files
- */
diff -Naur libgnome-2.5.92-old/libgnome/gnome-init.h
libgnome-2.5.92/libgnome/gnome-init.h
--- libgnome-2.5.92-old/libgnome/gnome-init.h Thu Nov 14 23:11:46 2002
+++ libgnome-2.5.92/libgnome/gnome-init.h Sun Mar 21 12:06:44 2004
@@ -47,41 +12,6 @@
#define LIBGNOME_MODULE libgnome_module_info_get()
const GnomeModuleInfo *libgnome_module_info_get (void) G_GNUC_CONST;
-diff -Naur libgnome-2.5.92-old/libgnome/gnome-score.c
libgnome-2.5.92/libgnome/gnome-score.c
---- libgnome-2.5.92-old/libgnome/gnome-score.c Thu Jul 10 14:33:28 2003
-+++ libgnome-2.5.92/libgnome/gnome-score.c Sun Mar 21 12:06:44 2004
-@@ -73,6 +73,31 @@
-
- /********************** internal functions
***********************************/
-
-+#ifndef HAVE_STRTOK_R
-+static char *
-+strtok_r (char *s, const char *delim, char **save_ptr)
-+{
-+ char *token;
-+
-+ if (s == NULL)
-+ s = *save_ptr;
-+
-+ s += strspn (s, delim);
-+ if (*s == '\0')
-+ return NULL;
-+
-+ token = s;
-+ s = strpbrk (token, delim);
-+ if (s == NULL) {
-+ *save_ptr = strchr (token, '\0');
-+ } else {
-+ *s = '\0';
-+ *save_ptr = s + 1;
-+ }
-+ return token;
-+}
-+#endif
-+
- static gchar *
- gnome_get_score_file_name (const gchar * progname, const gchar * level)
- {
diff -Naur libgnome-2.5.92-old/libgnome/gnome-util.c
libgnome-2.5.92/libgnome/gnome-util.c
--- libgnome-2.5.92-old/libgnome/gnome-util.c Tue Jun 24 05:27:46 2003
+++ libgnome-2.5.92/libgnome/gnome-util.c Sun Mar 21 12:06:44 2004
@@ -139,3 +69,14 @@
done
fi
+diff -ruN libgnome-2.6.1.2/libgnome/gnome-gconf.c
libgnome-2.6.1.2-patched/libgnome/gnome-gconf.c
+--- libgnome-2.6.1.2/libgnome/gnome-gconf.c 2002-05-31 20:14:47.000000000
-0700
++++ libgnome-2.6.1.2-patched/libgnome/gnome-gconf.c 2006-02-19
06:35:45.000000000 -0800
+@@ -30,6 +30,7 @@
+ #define GCONF_ENABLE_INTERNALS
+ #include <gconf/gconf.h>
+ #include <gconf/gconf-client.h>
++#include <popt.h>
+ extern struct poptOption gconf_options[];
+
+ #include "gnome-i18nP.h"
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
