Hello community, here is the log from the commit of package w3m for openSUSE:Factory checked in at 2013-03-22 13:16:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/w3m (Old) and /work/SRC/openSUSE:Factory/.w3m.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "w3m", Maintainer is "m...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/w3m/w3m.changes 2012-11-13 17:10:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2013-03-22 13:16:17.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Mar 21 16:27:19 UTC 2013 - jeng...@inai.de + +- Make w3m compile with gc 7.x (adds w3m-gc7.diff), + and also use the system libgc. + +------------------------------------------------------------------- Old: ---- gc-arm.patch gc-configure.patch gc-gcc4.patch gc6.6.tar.bz2 New: ---- w3m-gc7.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ w3m.spec ++++++ --- /var/tmp/diff_new_pack.N6fl6F/_old 2013-03-22 13:16:19.000000000 +0100 +++ /var/tmp/diff_new_pack.N6fl6F/_new 2013-03-22 13:16:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package w3m # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,24 +17,14 @@ Name: w3m -BuildRequires: gcc-c++ -BuildRequires: gpm -BuildRequires: imlib2-devel -BuildRequires: ncurses-devel -BuildRequires: openssl-devel -BuildRequires: pkgconfig Url: http://w3m.sourceforge.net/ Version: 0.5.3 Release: 0 Summary: A text-based WWW browser License: ISC Group: Productivity/Networking/Web/Browsers -Provides: w3m_ssl = %version -Provides: web_browser -Obsoletes: w3m_ssl < %version -Source0: http://prdownloads.sourceforge.net/w3m/w3m-%version.tar.bz2 -Source1: gc6.6.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-build + +Source: http://prdownloads.sourceforge.net/w3m/w3m-%version.tar.bz2 Patch0: w3m-disable-cookie-special-domain-check.patch Patch1: w3m-0.4.1-textarea-segfault.dif Patch2: w3m-0.4.1-session-mgmt.dif @@ -46,11 +36,21 @@ Patch9: w3m-history-crossdev.patch Patch11: w3m-ssl-verify.patch Patch12: w3m-closedir.patch -Patch500: gc-gcc4.patch -Patch501: gc-configure.patch -Patch502: gc-arm.patch Patch503: w3m-fh-def.patch Patch504: w3m-openssl.patch +Patch505: w3m-gc7.diff + +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gc-devel +BuildRequires: gcc-c++ +BuildRequires: gpm +BuildRequires: imlib2-devel +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: pkgconfig +Provides: w3m_ssl = %version +Provides: web_browser +Obsoletes: w3m_ssl < %version %package inline-image Summary: An inline image extension for w3m @@ -88,8 +88,8 @@ terminal (if it runs in a graphical X Window System environment). %prep -%setup -q -b 1 -find -name CVS | xargs rm -rf +%setup -q +find -name CVS -exec rm -Rf "{}" "+" %patch0 -p1 %patch1 -p1 %patch2 @@ -103,18 +103,10 @@ %patch12 %patch503 %patch504 -cd ../gc* -%patch500 -%patch501 -%patch502 -p1 +%patch -P 505 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -DUSE_BUFINFO -DOPENSSL_NO_SSL_INTERN -D_GNU_SOURCE -fno-strict-aliasing `ncursesw6-config --cflags`" -pushd ../gc* -./configure --prefix=/usr --disable-shared --disable-threads -make -make install DESTDIR=$RPM_BUILD_DIR/gc_install -popd export LDFLAGS="`ncursesw6-config --libs`" ./configure --bindir=/usr/bin \ --with-termlib=ncursesw \ @@ -138,14 +130,12 @@ --enable-nntp \ --enable-sslverify \ --enable-unicode \ - --disable-w3mmailer \ - --with-gc=$RPM_BUILD_DIR/gc_install/usr + --disable-w3mmailer make %{?_smp_mflags} %install make install install-helpfile DESTDIR=$RPM_BUILD_ROOT install -m 755 Bonus/*.cgi $RPM_BUILD_ROOT/usr/%_lib/w3m/cgi-bin -cp -a ../gc*/doc/README doc/README.gc %find_lang %{name} %files -f %{name}.lang ++++++ w3m-gc7.diff ++++++ From: Jan Engelhardt <jeng...@inai.de> Date: 2013-03-21 17:25:03.803966321 +0100 build: make w3m compile with gc-7.x --- main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: w3m-0.5.3/main.c =================================================================== --- w3m-0.5.3.orig/main.c +++ w3m-0.5.3/main.c @@ -855,7 +855,8 @@ main(int argc, char **argv, char **envp) 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 */ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
