From ebc32427717989b1d01a222ff7a795a3a7914b59 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 12 Jan 2021 21:05:11 +0100 Subject: [PATCH] add missing x11 BR/flags/libs x11 image backend always needs them --- w3m-x11.patch | 21 +++++++++++++++++++++ w3m.spec | 3 +++ 2 files changed, 24 insertions(+) create mode 100644 w3m-x11.patch diff --git a/w3m-x11.patch b/w3m-x11.patch new file mode 100644 index 0000000..647f79d --- /dev/null +++ b/w3m-x11.patch @@ -0,0 +1,21 @@ +--- w3m-0.5.3/acinclude.m4.orig 2021-01-12 20:37:53.279630897 +0100 ++++ w3m-0.5.3/acinclude.m4 2021-01-12 20:54:09.407752277 +0100 +@@ -732,6 +732,8 @@ + else + AC_MSG_WARN([unable to build w3mimgdisplay with X11 support]) + fi ++ IMGX11CFLAGS="$IMGX11CFLAGS `${PKG_CONFIG} --cflags x11`" ++ IMGX11LDFLAGS="$IMGX11LDFLAGS `${PKG_CONFIG} --libs x11`" + fi + if test x"$fb" = xyes; then + if test x"$have_gtk2" = xyes; then +--- w3m-0.5.3/configure.ac.orig 2021-01-12 20:55:05.160780806 +0100 ++++ w3m-0.5.3/configure.ac 2021-01-12 21:01:52.818543811 +0100 +@@ -56,6 +56,7 @@ + AC_W3M_ANSI_COLOR + AC_W3M_BG_COLOR + ++PKG_PROG_PKG_CONFIG + AC_W3M_IMAGE + if test x"$enable_image" != xno; then + AUXBIN_TARGETS="$AUXBIN_TARGETS w3mimgdisplay\$(EXT)" diff --git a/w3m.spec b/w3m.spec index 9aad9b9..b2303eb 100644 --- a/w3m.spec +++ b/w3m.spec @@ -25,6 +25,7 @@ Patch5: format-security.patch Patch6: ac-gettext.patch Patch7: openssl.patch Patch8: %{name}-configure.patch +Patch9: %{name}-x11.patch URL: http://w3m.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -33,6 +34,7 @@ BuildRequires: gettext-tools BuildRequires: gpm-devel %if %{with image} BuildRequires: imlib2-devel >= 1.0.5 +BuildRequires: xorg-lib-libX11-devel %endif BuildRequires: ncurses-devel >= 5.0 BuildRequires: openssl-devel >= 0.9.7d @@ -100,6 +102,7 @@ na linuksowym framebufferze. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %{__sed} '/^AC_PROG_CXX$/d' -i configure.ac -- 2.44.0