Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv30232/10.3/unstable/main/finkinfo/gnome
Modified Files:
glibwww.info
Added Files:
glibwww.patch
Log Message:
Fix lots of linking issues
--- NEW FILE: glibwww.patch ---
diff -Nurd -x'*~' glibwww-0.2.orig/src/gnome-dialogs.c
glibwww-0.2/src/gnome-dialogs.c
--- glibwww-0.2.orig/src/gnome-dialogs.c 2000-05-27 22:15:26.000000000
-0400
+++ glibwww-0.2/src/gnome-dialogs.c 2006-08-03 03:35:16.000000000 -0400
@@ -162,7 +162,7 @@
long b_read = HTRequest_bodyRead(request);
gfloat pcnt = (double)b_read/cl;
- text = g_strdup_printf(_("Read %d%%%% of %l"),
(int)pcnt, cl);
+ text = g_strdup_printf(_("Read %d%%%% of %ld"),
(int)pcnt, cl);
gtk_progress_set_format_string(info->progress, text);
g_free(text);
gtk_progress_set_activity_mode(info->progress, FALSE);
@@ -172,7 +172,7 @@
int *raw_read = input ? (int *)input : NULL;
if (b_read > 0)
- text = g_strdup_printf(_("Read %d bytes"),
b_read);
+ text = g_strdup_printf(_("Read %ld bytes"),
b_read);
else if (raw_read && *raw_read > 0)
text = g_strdup_printf(_("Read %d bytes"),
*raw_read);
else
@@ -191,7 +191,7 @@
long b_write = HTRequest_bodyWritten(request);
gfloat pcnt = (double)b_write/cl;
- text = g_strdup_printf(_("Writing %d%%%% of
%l"), (int)pcnt, cl);
+ text = g_strdup_printf(_("Writing %d%%%% of
%ld"), (int)pcnt, cl);
gtk_progress_set_format_string(info->progress,
text);
g_free(text);
gtk_progress_set_activity_mode(info->progress,
FALSE);
@@ -201,7 +201,7 @@
int *raw_write = input ? (int *)input : NULL;
if (b_write > 0)
- text = g_strdup_printf(_("Writing %d
bytes"), b_write);
+ text = g_strdup_printf(_("Writing %ld
bytes"), b_write);
else if (raw_write && *raw_write > 0)
text = g_strdup_printf(_("Writing %d
bytes"), *raw_write);
else
Index: glibwww.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/gnome/glibwww.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- glibwww.info 23 Feb 2006 07:49:12 -0000 1.4
+++ glibwww.info 3 Aug 2006 07:49:09 -0000 1.5
@@ -1,17 +1,24 @@
Package: glibwww
Version: 0.2
-Revision: 15
+Revision: 16
Source: gnome
Source-MD5: 3f20f0e7b01acb8dc81502e088cd9389
BuildDependsOnly: True
BuildDepends: audiofile, esound, glib, gtk+ (>= 1.2.10-20), libjpeg, libtiff,
netpbm, orbit-dev (>= 0.5.17-15), imlib (>= 1.9.14-14), gnome-libs-dev (>=
1.4.2-19), libwww, gettext-dev, gettext-bin, gettext-tools
Depends: %N-shlibs (= %v-%r)
UpdateLibtool: true
+Patch: %n.patch
+PatchScript: <<
+ perl -pi -e 's,(testglibwww_LDADD =) (libglibwww).la,\1 .libs/\2.dylib,'
src/Makefile.in
+
+# perl -pi -e 's,^(GLIBWWW_LIBS=.*)\$LIBWWW_CFLAGS,\1\$LIBWWW_LIBS,' configure
+ perl -pi -e 's,^(libglibwww_la_LIBADD = ),\1 \$(EXTRA_GNOME_LIBS) ,'
src/Makefile.in
+<<
SetCPPFLAGS: -no-cpp-precomp
SetLDFLAGS: -lintl
SplitOff: <<
Package: %N-shlibs
- Depends: gnome-libs (>= 1.4.2-19), libwww-shlibs
+ Depends: gnome-libs (>= 1.4.2-19), libwww-shlibs, gettext
Replaces: %N (<= 0.2-3)
Files: lib/libglibwww.*.dylib
Shlibs: %p/lib/libglibwww.1.dylib 2.0.0 %n (>= 0.2-4)
@@ -23,5 +30,7 @@
Maintainer: None <fink-devel@lists.sourceforge.net>
DescPackaging: <<
Originally packaged by Masanori Sekino.
+
+ dmacks: Fix ancient libtool hardcode_direct-ish bug; fix flag passing.
<<
Homepage: http://www.gnome.org/
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
