Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19937
Modified Files:
Tag: pangocairo-branch
libgnome2.info
Added Files:
Tag: pangocairo-branch
libgnome2.patch
Log Message:
Sane gettext function calls and other minor fixes
Index: libgnome2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libgnome2.info,v
retrieving revision 1.5.2.24
retrieving revision 1.5.2.25
diff -u -d -r1.5.2.24 -r1.5.2.25
--- libgnome2.info 23 Jan 2008 02:30:29 -0000 1.5.2.24
+++ libgnome2.info 23 Jan 2008 06:19:43 -0000 1.5.2.25
@@ -1,6 +1,6 @@
Package: libgnome2
Version: 2.20.1.1
-Revision: 2
+Revision: 3
Source: mirror:gnome:sources/libgnome/2.20/libgnome-%v.tar.bz2
Source-MD5: cfab025a8b9a19cdae1c64f8b005c513
Depends: <<
@@ -33,6 +33,8 @@
pkgconfig (>= 0.21-1),
popt (>= 1.5)
<<
+PatchFile: %n.patch
+PatchFile-MD5: 3a0cd435dc76b2d959f865ef6fc2a5f5
SetCFLAGS: -Os
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--disable-schemas-install
CompileScript: <<
@@ -112,12 +114,21 @@
DescPort: <<
Had to add F77=no to configure to get around a weird libtool thing
when "fort77" is installed.
+
+ Patch libgnome/gnome-init.c for svn revision 3522 -> 3523 to
+ avoid mixed definintions of _ and related gettext tokens.
+
+ Fix prototyping in gnome-sound.c. See:
+ http://bugzilla.gnome.org/show_bug.cgi?id=511455
<<
DescPackaging: <<
No filename collisions gnome-libs-dev vs libgnome2-dev, but
gnome-libs-dev has a libgnome.h that can mask the one in
libgnome2-dev, which can cause other gnome2 headers to get stuck in
the gnome1 headers world.
+
+ This lib links popt directly and propagates that to all
+ dependant libs. Not expected to change anytime soon.
<<
License: GPL/LGPL
Maintainer: The Gnome Core Team <[EMAIL PROTECTED]>
--- NEW FILE: libgnome2.patch ---
diff -Nurd -x'*~' libgnome-2.20.1.1.orig/libgnome/gnome-init.c
libgnome-2.20.1.1/libgnome/gnome-init.c
--- libgnome-2.20.1.1.orig/libgnome/gnome-init.c 2007-10-16
14:30:40.000000000 -0400
+++ libgnome-2.20.1.1/libgnome/gnome-init.c 2008-01-23 01:10:42.000000000
-0500
@@ -38,7 +38,7 @@
#include <glib.h>
#include <glib/goption.h>
#include <glib/gstdio.h>
-#include <glib/gi18n-lib.h>
+#include <libgnome/gnome-i18n.h>
#include "gnome-init.h"
#include "gnome-gconfP.h"
diff -Nurd -x'*~' libgnome-2.20.1.1.orig/libgnome/gnome-sound.c
libgnome-2.20.1.1/libgnome/gnome-sound.c
--- libgnome-2.20.1.1.orig/libgnome/gnome-sound.c 2007-10-16
14:30:40.000000000 -0400
+++ libgnome-2.20.1.1/libgnome/gnome-sound.c 2008-01-23 00:58:40.000000000
-0500
@@ -73,8 +73,6 @@
( ( x & 0xff000000 ) >> 24 ) )
#endif
-G_GNUC_INTERNAL void _gnome_sound_set_enabled (gboolean);
-
/**
* gnome_sound_sample_load_wav:
* @file: filename to try loading a WAV file from.
@@ -320,6 +318,8 @@
}
#endif
+G_GNUC_INTERNAL void _gnome_sound_set_enabled (gboolean);
+
void G_GNUC_INTERNAL
_gnome_sound_set_enabled (gboolean enabled)
{
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
