Hello community, here is the log from the commit of package w3m for openSUSE:Factory checked in at 2015-03-23 12:12:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/w3m (Old) and /work/SRC/openSUSE:Factory/.w3m.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "w3m" Changes: -------- --- /work/SRC/openSUSE:Factory/w3m/w3m.changes 2014-12-23 11:48:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.w3m.new/w3m.changes 2015-03-23 12:12:50.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 2 04:05:20 UTC 2015 - m...@suse.com + +- Add w3m-fix-build-with-imlib2-1.4.6.patch: fix build with imlib2 1.4.6, + the patch is from Debian. See http://sourceforge.net/p/w3m/patches/70/ + +------------------------------------------------------------------- New: ---- w3m-fix-build-with-imlib2-1.4.6.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ w3m.spec ++++++ --- /var/tmp/diff_new_pack.RaD94W/_old 2015-03-23 12:12:51.000000000 +0100 +++ /var/tmp/diff_new_pack.RaD94W/_new 2015-03-23 12:12:51.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package w3m # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,7 @@ Patch11: w3m-ssl-verify.patch Patch12: w3m-closedir.patch Patch13: w3m-parallel-make.patch +Patch14: w3m-fix-build-with-imlib2-1.4.6.patch Patch503: w3m-fh-def.patch Patch504: w3m-openssl.patch Patch505: w3m-gc7.diff @@ -103,6 +104,7 @@ %patch11 %patch12 %patch13 -p1 +%patch14 -p1 %patch503 %patch504 %patch -P 505 -p1 ++++++ w3m-fix-build-with-imlib2-1.4.6.patch ++++++ >From bc4000470194df630837b2b0acd1ea4e9d1702b5 Mon Sep 17 00:00:00 2001 From: Tatsuya Kinoshita <t...@debian.org> Date: Fri, 3 Jan 2014 16:33:18 +0900 Subject: [PATCH] Use pkg-config to build with imlib2 1.4.6 --- acinclude.m4 | 7 +++++-- configure | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index e4ccc3d..56d6338 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -649,6 +649,9 @@ AC_DEFUN([AC_W3M_IMAGE], fi;; imlib2) with_imlib2="yes" + if test x"$PKG_CONFIG" = x; then + PKG_CONFIG=pkg-config + fi if test x"$IMLIB2_CONFIG" = x; then IMLIB2_CONFIG=imlib2-config fi;; @@ -728,7 +731,7 @@ AC_DEFUN([AC_W3M_IMAGE], IMGTARGETS="x11" AC_DEFINE(USE_IMLIB2) IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`" else AC_MSG_WARN([unable to build w3mimgdisplay with X11 support]) fi @@ -756,7 +759,7 @@ AC_DEFUN([AC_W3M_IMAGE], AC_DEFINE(USE_IMLIB2) IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`" else AC_MSG_WARN([unable to build w3mimgdisplay with FB support]) fi diff --git a/configure b/configure index 4c1bc06..01153c1 100755 --- a/configure +++ b/configure @@ -6811,6 +6811,9 @@ $as_echo "$with_imagelib" >&6; } fi;; imlib2) with_imlib2="yes" + if test x"$PKG_CONFIG" = x; then + PKG_CONFIG=pkg-config + fi if test x"$IMLIB2_CONFIG" = x; then IMLIB2_CONFIG=imlib2-config fi;; @@ -6955,7 +6958,7 @@ $as_echo "$as_me: WARNING: Imlib2 is not installed. Install Imlib2 (version >= $as_echo "#define USE_IMLIB2 1" >>confdefs.h IMGX11CFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGX11LDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGX11LDFLAGS="-lX11 `${PKG_CONFIG} --libs imlib2`" else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with X11 support" >&5 $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;} @@ -6991,7 +6994,7 @@ $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with X11 support" >&2;} IMGOBJS="$IMGOBJS fb/fb_w3mimg.o fb/fb.o fb/fb_img.o" IMGFBCFLAGS="`${IMLIB2_CONFIG} --cflags`" - IMGFBLDFLAGS="`${IMLIB2_CONFIG} --libs`" + IMGFBLDFLAGS="`${PKG_CONFIG} --libs imlib2`" else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to build w3mimgdisplay with FB support" >&5 $as_echo "$as_me: WARNING: unable to build w3mimgdisplay with FB support" >&2;} -- 2.2.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
