aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTatsuya Kinoshita <tats@debian.org>2014-12-01 15:39:17 +0000
committerTatsuya Kinoshita <tats@debian.org>2014-12-01 15:39:17 +0000
commit9551302f3b188fc6aa1dd5f13cc066f508fc8519 (patch)
treeb0ae72e9c8bda001a5e41b31d8d0d43df643ca4c
parentNew patch 360_libressl.patch to disable USE_EGD for LibreSSL (diff)
downloadw3m-9551302f3b188fc6aa1dd5f13cc066f508fc8519.tar.gz
w3m-9551302f3b188fc6aa1dd5f13cc066f508fc8519.zip
New patch 370_gtk2-pkg-config.patch to handle defined PKG_CONFIG when gtk2
Diffstat (limited to '')
-rw-r--r--debian/patches/370_gtk2-pkg-config.patch31
-rw-r--r--debian/patches/series1
2 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/370_gtk2-pkg-config.patch b/debian/patches/370_gtk2-pkg-config.patch
new file mode 100644
index 0000000..5714fc5
--- /dev/null
+++ b/debian/patches/370_gtk2-pkg-config.patch
@@ -0,0 +1,31 @@
+Subject: Assume defined PKG_CONFIG points right location when gtk2
+Author: OBATA Akio <obache@netbsd.org>
+Origin: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/w3m/patches/patch-aa?rev=1.13&content-type=text/x-cvsweb-markup
+Origin: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/www/w3m/patches/patch-ak?rev=1.1&content-type=text/x-cvsweb-markup
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index c1d112b..d768476 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -664,8 +664,6 @@ AC_DEFUN([AC_W3M_IMAGE],
+ with_gtk2="yes"
+ if test x"$PKG_CONFIG" = x; then
+ PKG_CONFIG=pkg-config
+- else
+- PKG_CONFIG=:
+ fi;;
+ esac
+ done
+diff --git a/configure b/configure
+index ec7f11e..b5adbb5 100755
+--- a/configure
++++ b/configure
+@@ -6826,8 +6826,6 @@ $as_echo "$with_imagelib" >&6; }
+ with_gtk2="yes"
+ if test x"$PKG_CONFIG" = x; then
+ PKG_CONFIG=pkg-config
+- else
+- PKG_CONFIG=:
+ fi;;
+ esac
+ done
diff --git a/debian/patches/series b/debian/patches/series
index 184e113..5e3ed8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,6 +35,7 @@
340_ssl-init.patch
350_ambwidth.patch
360_libressl.patch
+370_gtk2-pkg-config.patch
800_lang-en.patch
810_lang-de.patch
820_lang-ja.patch