Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/web
In directory vz-cvs-3.sog:/tmp/cvs-serv1827/10.7/main/finkinfo/web

Modified Files:
        w3m.info 
Added Files:
        w3m.patch 
Log Message:
maybe fix build (steal redhat's patch for current gc API); also modernize 
OBSOLETE incantation


Index: w3m.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/web/w3m.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- w3m.info    31 Oct 2011 18:23:18 -0000      1.1
+++ w3m.info    21 Oct 2012 05:57:32 -0000      1.2
@@ -1,13 +1,13 @@
 Package: w3m
 Version: 0.5.3
-Revision: 102
+Revision: 103
 Description: Text-mode WWW browser with tables/frames
 License: BSD
 Maintainer: Todai Fink Team <[email protected]>
 BuildDepends: <<
   gc, libncurses5 (>= 5.4-20041023-1006), system-openssl-dev,
   libgettext8-dev, gettext-bin, gettext-tools, libiconv-dev, pkgconfig,
-  freetype219, imlib2 (>= 1.0.5-1), x11-dev
+  freetype219 (>= 2.4.10-1), imlib2 (>= 1.0.5-1), x11-dev, fink (>= 0.32)
 <<
 Depends: <<
   gc-shlibs, libncurses5-shlibs (>= 5.4-20041023-1006),
@@ -17,7 +17,12 @@
 Replaces: %N-ssl ( << 0.5.1-1004 )
 Source: mirror:sourceforge:w3m/w3m-%v.tar.gz
 Source-MD5: 1b845a983a50b8dec0169ac48479eacc
-PatchScript: sed -i.bak 's|sed -ne |LC_ALL=C sed -ne |' scripts/Makefile.in
+PatchFile: %n.patch
+PatchFile-MD5: dd2916abe098e23493cff3185f41c026
+PatchScript: <<
+       %{default_script}
+       sed -i.bak 's|sed -ne |LC_ALL=C sed -ne |' scripts/Makefile.in
+<<
 ConfigureParams: <<
   --with-termlib=ncurses --with-imagelib=imlib2 --disable-w3mmailer \
   --mandir=%p/share/man --libexecdir=%p/lib --with-editor=%p/bin/editor \
@@ -44,7 +49,7 @@
 SplitOff2: <<
   Package: w3m-x11
   Depends: <<
-    %N (= %v-%r), x11, freetype219-shlibs, imlib2-shlibs (>= 1.0.5-1)
+    %N (= %v-%r), x11, freetype219-shlibs (>= 2.4.10-1), imlib2-shlibs (>= 
1.0.5-1)
   <<
   Recommends: compface
   Description: X11 support for w3m
@@ -61,3 +66,9 @@
  It features excellent support for tables and frames. It can be 
  used as a standalone file pager, too.
 <<
+DescPackaging: <<
+       gc's GC_warn_proc accessors no longer (as of 7.1 -> 7.2?) seem
+       to have atomic call to set-and-get? Hope there's no race by
+       doing it in sequential calls! Patch from:
+       https://bugzilla.redhat.com/show_bug.cgi?id=555467
+<<

--- NEW FILE: w3m.patch ---
diff -Nurd -x'*~' w3m-0.5.3.orig/main.c w3m-0.5.3/main.c
--- w3m-0.5.3.orig/main.c       2011-01-04 04:42:19.000000000 -0500
+++ w3m-0.5.3/main.c    2012-10-21 01:46:50.000000000 -0400
@@ -833,7 +833,8 @@
     mySignal(SIGPIPE, SigPipe);
 #endif
 
-    orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc);
+    orig_GC_warn_proc = GC_get_warn_proc();
+    GC_set_warn_proc(wrap_GC_warn_proc);
     err_msg = Strnew();
     if (load_argc == 0) {
        /* no URL specified */


------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to