Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv7816
Modified Files:
Tag: pangocairo-branch
libnautilus-ext1-shlibs.info libnautilus-ext1-shlibs.patch
Log Message:
symbol and dep cleanup
Index: libnautilus-ext1-shlibs.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libnautilus-ext1-shlibs.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- libnautilus-ext1-shlibs.patch 4 Mar 2007 20:48:47 -0000 1.1.2.1
+++ libnautilus-ext1-shlibs.patch 26 Jan 2008 21:42:53 -0000 1.1.2.2
@@ -1,6 +1,6 @@
-diff -Nurd -x'*~'
nautilus-2.14.1.orig/libnautilus-extension/libnautilus-extension.pc.in
nautilus-2.14.1/libnautilus-extension/libnautilus-extension.pc.in
---- nautilus-2.14.1.orig/libnautilus-extension/libnautilus-extension.pc.in
2005-06-02 07:05:39.000000000 -0400
-+++ nautilus-2.14.1/libnautilus-extension/libnautilus-extension.pc.in
2006-07-26 13:55:12.000000000 -0400
+diff -Nurd -x'*~'
nautilus-2.20.0.orig/libnautilus-extension/libnautilus-extension.pc.in
nautilus-2.20.0/libnautilus-extension/libnautilus-extension.pc.in
+--- nautilus-2.20.0.orig/libnautilus-extension/libnautilus-extension.pc.in
2007-04-03 06:08:46.000000000 -0400
++++ nautilus-2.20.0/libnautilus-extension/libnautilus-extension.pc.in
2008-01-26 12:22:29.000000000 -0500
@@ -2,7 +2,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
@@ -10,10 +10,10 @@
Name: libnautilus-extension
Description: A library to create Nautilus view extensions
-diff -Nurd -x'*~' nautilus-2.14.1.orig/libnautilus-private/Makefile.in
nautilus-2.14.1/libnautilus-private/Makefile.in
---- nautilus-2.14.1.orig/libnautilus-private/Makefile.in 2006-04-10
19:14:53.000000000 -0400
-+++ nautilus-2.14.1/libnautilus-private/Makefile.in 2006-07-26
13:55:04.000000000 -0400
-@@ -446,7 +446,7 @@
+diff -Nurd -x'*~' nautilus-2.20.0.orig/libnautilus-private/Makefile.in
nautilus-2.20.0/libnautilus-private/Makefile.in
+--- nautilus-2.20.0.orig/libnautilus-private/Makefile.in 2007-09-18
03:01:39.000000000 -0400
++++ nautilus-2.20.0/libnautilus-private/Makefile.in 2008-01-26
12:22:30.000000000 -0500
+@@ -444,7 +444,7 @@
-DDATADIR=\""$(datadir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
@@ -22,7 +22,7 @@
$(NULL)
dependency_static_libs = \
-@@ -456,7 +456,6 @@
+@@ -453,7 +453,6 @@
$(NULL)
libnautilus_private_la_LDFLAGS = \
@@ -30,3 +30,27 @@
-no-undefined \
$(NULL)
+diff -Nurd -x'*~'
nautilus-2.20.0.orig/libnautilus-private/nautilus-program-choosing.c
nautilus-2.20.0/libnautilus-private/nautilus-program-choosing.c
+--- nautilus-2.20.0.orig/libnautilus-private/nautilus-program-choosing.c
2007-07-23 04:36:34.000000000 -0400
++++ nautilus-2.20.0/libnautilus-private/nautilus-program-choosing.c
2008-01-26 12:21:58.000000000 -0500
+@@ -61,7 +61,12 @@
+ #include <gdk/gdkx.h>
+ #endif
+
++#ifdef __APPLE__
++#include <crt_externs.h>
++#define environ (*_NSGetEnviron())
++#else
+ extern char **environ;
++#endif
+
+ /* Cut and paste from gdkspawn-x11.c */
+ static gchar **
+@@ -202,7 +207,6 @@
+ gdk_error_trap_pop ();
+ }
+
+-extern char **environ;
+
+ static char **
+ make_spawn_environment_for_sn_context (SnLauncherContext *sn_context,
Index: libnautilus-ext1-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/libnautilus-ext1-shlibs.info,v
retrieving revision 1.2.2.46
retrieving revision 1.2.2.47
diff -u -d -r1.2.2.46 -r1.2.2.47
--- libnautilus-ext1-shlibs.info 4 Nov 2007 02:34:46 -0000 1.2.2.46
+++ libnautilus-ext1-shlibs.info 26 Jan 2008 21:42:53 -0000 1.2.2.47
@@ -1,6 +1,6 @@
Package: libnautilus-ext1-shlibs
Version: 2.20.0
-Revision: 1
+Revision: 2
Depends: <<
atk1-shlibs (>= 1.20.0-1),
@@ -10,7 +10,6 @@
gnome-vfs2-unified-shlibs (>= 1:2.20.0-1),
gtk+2 (>= 2.12.0-1),
libgettext3-shlibs,
- libhowl-shlibs,
libiconv,
libxml2-shlibs (>= 2.6.30-1),
orbit2 (>= 2.14.9-1),
@@ -21,6 +20,7 @@
BuildDepends: <<
atk1 (>= 1.20.0-1),
audiofile (>= 0.2.5-1),
+ avahi-dev,
bzip2-dev,
cairo (>= 1.2-1),
dbus-dev (>= 1.0-1),
@@ -45,6 +45,7 @@
gtk+2-dev (>= 2.12.0-1),
intltool (>= 0.36.0-1),
libart2 (>= 2.3.16-1),
+ libavahi-glib1-dev,
libbonobo2-dev (>= 2.20.0-1),
libbonoboui2-dev (>= 2.20.0-1),
libcroco3,
@@ -74,7 +75,7 @@
Source-MD5: 3856ec2ffeba786d12f8f6622e398c33
PatchFile: %n.patch
-PatchFile-MD5: 7097fb2608ef3f6ddb5dfea3614be121
+PatchFile-MD5: 27e4db0665bd3a7984ae04c5d4f9d905
ConfigureParams: --disable-schemas-install --disable-update-mimedb
--disable-beagle --disable-tracker --disable-dependency-tracking
--libdir=%p/lib/libnautilus-ext1 --enable-static
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
@@ -120,7 +121,7 @@
libgnomeui2 (>= 2.20.0-1),
libgsf1.114-shlibs (>= 1.14.5-1),
libjpeg-shlibs,
- libnautilus-ext1-shlibs (>= 2.20.0-1),
+ libnautilus-ext1-shlibs (>= %v-%r),
librsvg2-shlibs (>= 2.18.0-1),
startup-notification-shlibs
<<
@@ -184,27 +185,14 @@
recent versions of nautilus.
<<
DescPort: <<
- Fix missing #include in libnautilus-private/nautilus-emblem-utils.c.
- See: http://bugzilla.gnome.org/show_bug.cgi?id=348300
-
Remove inappropriate flag from libnautilus-private/Makefile.
See: http://bugzilla.gnome.org/show_bug.cgi?id=348301
- TODO: The usual **environ fix? See:
+ The usual **environ fix. Only used in private library and only
+ propagated to binary programs (bin/nautilus*), not public
+ libs. Without fix, otool -hv says binaries are NOUNDEFS and nm
+ says symbol is "U" in lib and "D" in binaries. ee:
http://bugzilla.gnome.org/show_bug.cgi?id=344197
-diff -Nurd -x'*~'
nautilus-2.14.1.orig/libnautilus-private/nautilus-program-choosing.c
nautilus-2.14.1/libnautilus-private/nautilus-program-choosing.c
---- nautilus-2.14.1.orig/libnautilus-private/nautilus-program-choosing.c
2006-03-18 01:45:15.000000000 -0500
-+++ nautilus-2.14.1/libnautilus-private/nautilus-program-choosing.c
2006-06-07 15:44:29.000000000 -0400
-@@ -61,7 +61,8 @@
- #include <gdk/gdkx.h>
- #endif
-
--extern char **environ;
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-
- /* Cut and paste from gdkspawn-x11.c */
- static gchar **
<<
DescPackaging: <<
Old nautilus-shlibs had libnautilus-extension.1.dylib library in
-------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
