Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29202/10.3/unstable/main/finkinfo/gnome
Modified Files:
libgnome2.info libgnome2.patch
Log Message:
Sync w/10.4T's latest rendition of gcc4 funny business.
Index: libgnome2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/libgnome2.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- libgnome2.info 22 Jun 2005 06:13:55 -0000 1.10
+++ libgnome2.info 22 Sep 2005 20:45:16 -0000 1.11
@@ -5,14 +5,14 @@
Source-MD5: f8e1225d96126f5139232821a6723d15
Depends: %N-shlibs (= %v-%r), audiofile-bin (>= 0.2.5-1), audiofile-shlibs (>=
0.2.5-1), esound-shlibs (>= 0.2.34-1), gconf2 (>= 2.6.0-1), libgettext3-shlibs,
glib2 (>= 2.4.0-1), gnome-vfs2-ssl (>= 2.6.0-1) | gnome-vfs2 (>= 2.6.0-1),
libbonobo2 (>= 2.6.0-1), libiconv, libxml2-shlibs (>= 2.6.7-1), orbit2 (>=
2.10.0-1), popt-shlibs (>= 1.5)
Conflicts: nautilus (<< 1.0.6-3)
-BuildDepends: glib2-dev (>= 2.4.0-1), orbit2-dev (>= 2.10.0-1), libbonobo2-dev
(>= 2.6.0-1), gconf2-dev (>= 2.6.0-1), gnome-vfs2-ssl-dev (>= 2.6.0-1) |
gnome-vfs2-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 (>=
0.21), pkgconfig, libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev,
gcc3.3, popt (>= 1.5)
+BuildDepends: glib2-dev (>= 2.4.0-1), orbit2-dev (>= 2.10.0-1), libbonobo2-dev
(>= 2.6.0-1), gconf2-dev (>= 2.6.0-1), gnome-vfs2-ssl-dev (>= 2.6.0-1) |
gnome-vfs2-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 (>=
0.21), pkgconfig, libgettext3-dev, gettext-bin, gettext-tools, libiconv-dev,
popt (>= 1.5)
Patch: %n.patch
SetCPPFLAGS: -no-cpp-precomp
SetCFLAGS: -O3 -funroll-loops -fstrict-aliasing
ConfigureParams: --libexecdir=%p/lib/%n --disable-dependency-tracking
CompileScript: <<
- export CC=gcc-3.3; export CXX=g++-3.3; F77=no ./configure %c
- make CC=gcc-3.3 CXX=g++-3.3
+ F77=no ./configure %c
+ make
<<
InstallScript: <<
GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=%d
@@ -84,6 +84,8 @@
Had to add F77=no to configure to get around a weird libtool thing
when "fort77" is installed.
+
+Include popt.h in gnome-gconf.c to allow compilation with GCC 4, see
http://cvs.gnome.org/viewcvs/libgnome/libgnome/gnome-gconf.c?r1=1.48&r2=1.49
and http://bugs.gnome.org/show_bug.cgi?id=302071 .
<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
Index: libgnome2.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/libgnome2.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- libgnome2.patch 18 Jun 2005 05:56:09 -0000 1.4
+++ libgnome2.patch 22 Sep 2005 20:45:16 -0000 1.5
@@ -1,6 +1,17 @@
-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
+diff -Naur libgnome-2.10.0/libgnome/gnome-gconf.c
libgnome-new/libgnome/gnome-gconf.c
+--- libgnome-2.10.0/libgnome/gnome-gconf.c 2004-10-10 11:04:30.000000000
-0400
++++ libgnome-new/libgnome/gnome-gconf.c 2005-07-01 02:05:46.000000000
-0400
+@@ -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"
+diff -Naur libgnome-2.10.0/libgnome/gnome-init.h
libgnome-new/libgnome/gnome-init.h
+--- libgnome-2.10.0/libgnome/gnome-init.h 2002-11-14 23:11:46.000000000
-0500
++++ libgnome-new/libgnome/gnome-init.h 2005-07-01 02:05:20.000000000 -0400
@@ -36,8 +36,8 @@
* to override .gnome2 via environment variable and this is
* an important feature for environments that mix GNOME versions)
@@ -12,9 +23,9 @@
#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-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
+diff -Naur libgnome-2.10.0/libgnome/gnome-util.c
libgnome-new/libgnome/gnome-util.c
+--- libgnome-2.10.0/libgnome/gnome-util.c 2005-03-05 05:00:09.000000000
-0500
++++ libgnome-new/libgnome/gnome-util.c 2005-07-01 02:05:20.000000000 -0400
@@ -39,6 +39,10 @@
#endif
#include <sys/types.h>
@@ -26,9 +37,9 @@
#include <errno.h>
#include <stdarg.h>
#include <stdlib.h>
-diff -Naur libgnome-2.5.92-old/libgnome/gnome-util.h
libgnome-2.5.92/libgnome/gnome-util.h
---- libgnome-2.5.92-old/libgnome/gnome-util.h Sat Jun 1 21:41:45 2002
-+++ libgnome-2.5.92/libgnome/gnome-util.h Sun Mar 21 12:06:44 2004
+diff -Naur libgnome-2.10.0/libgnome/gnome-util.h
libgnome-new/libgnome/gnome-util.h
+--- libgnome-2.10.0/libgnome/gnome-util.h 2002-06-01 21:41:45.000000000
-0400
++++ libgnome-new/libgnome/gnome-util.h 2005-07-01 02:05:20.000000000 -0400
@@ -49,7 +49,7 @@
/* very similar to above, but adds $HOME/.gnome2/ to beginning
* This is meant to be the most useful version.
@@ -38,10 +49,10 @@
/* Find the name of the user's shell. */
char *gnome_util_user_shell (void);
-diff -Naur libgnome-2.5.92-old/ltmain.sh libgnome-2.5.92/ltmain.sh
---- libgnome-2.5.92-old/ltmain.sh Fri Mar 5 00:22:34 2004
-+++ libgnome-2.5.92/ltmain.sh Sun Mar 21 12:10:42 2004
-@@ -3745,6 +3745,12 @@
+diff -Naur libgnome-2.10.0/ltmain.sh libgnome-new/ltmain.sh
+--- libgnome-2.10.0/ltmain.sh 2005-03-07 04:53:21.000000000 -0500
++++ libgnome-new/ltmain.sh 2005-07-01 02:05:20.000000000 -0400
+@@ -3763,6 +3763,12 @@
eval test_cmds=\"$archive_expsym_cmds\"
cmds=$archive_expsym_cmds
else
@@ -54,7 +65,7 @@
eval test_cmds=\"$archive_cmds\"
cmds=$archive_cmds
fi
-@@ -5247,10 +5253,10 @@
+@@ -5266,10 +5272,10 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server.
Download it for free - -and be entered to win a 42" plasma tv or your very
own Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
