OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 25-Dec-2009 10:29:17
Branch: HEAD Handle: 2009122509291600
Modified files:
openpkg-src/w3m w3m.patch w3m.spec
Log:
fix building against GC 7.2.x
Summary:
Revision Changes Path
1.7 +14 -1 openpkg-src/w3m/w3m.patch
1.68 +4 -4 openpkg-src/w3m/w3m.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/w3m/w3m.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 w3m.patch
--- openpkg-src/w3m/w3m.patch 3 Jun 2007 08:17:08 -0000 1.6
+++ openpkg-src/w3m/w3m.patch 25 Dec 2009 09:29:16 -0000 1.7
@@ -1,6 +1,6 @@
Index: Makefile.in
--- Makefile.in.orig 2007-05-29 14:01:04 +0200
-+++ Makefile.in 2007-06-02 13:11:37 +0200
++++ Makefile.in 2009-12-24 22:39:59 +0100
@@ -119,7 +119,7 @@
DEFUNS=$(top_srcdir)/main.c $(top_srcdir)/menu.c
@@ -28,3 +28,16 @@
-rm -f functable.tab
mktable$(EXT): mktable.o dummy.o $(ALIB)
+Index: main.c
+--- main.c.orig 2007-05-31 03:19:50 +0200
++++ main.c 2009-12-25 10:21:26 +0100
+@@ -842,7 +842,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 */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/w3m/w3m.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 w3m.spec
--- openpkg-src/w3m/w3m.spec 30 Jun 2009 20:21:41 -0000 1.67
+++ openpkg-src/w3m/w3m.spec 25 Dec 2009 09:29:16 -0000 1.68
@@ -32,7 +32,7 @@
Group: Web
License: BSD
Version: 0.5.2
-Release: 20080101
+Release: 20091225
# list of sources
Source0:
http://switch.dl.sourceforge.net/sourceforge/w3m/w3m-%{version}.tar.gz
@@ -43,8 +43,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: ncurses, openssl, zlib, gc
-PreReq: ncurses, openssl, zlib, gc
+BuildPreReq: ncurses, openssl, zlib, gc >= 7.2
+PreReq: ncurses, openssl, zlib, gc >= 7.2
AutoReq: no
AutoReqProv: no
@@ -107,7 +107,7 @@
--disable-unicode \
--disable-m17n \
--disable-nls
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
