diff options
| author | Tatsuya Kinoshita <tats@debian.org> | 2015-01-24 14:36:40 +0000 |
|---|---|---|
| committer | Tatsuya Kinoshita <tats@debian.org> | 2015-01-24 14:37:05 +0000 |
| commit | 8595cb4102d547388d0d9e699d10a14f8f7aa71c (patch) | |
| tree | cd27e4b710769000b651b9af4db2704a1cd328dd /debian/patches/370_gtk2-pkg-config.patch | |
| parent | Update Vcs-Browser (diff) | |
| download | w3m-8595cb4102d547388d0d9e699d10a14f8f7aa71c.tar.gz w3m-8595cb4102d547388d0d9e699d10a14f8f7aa71c.zip | |
Integrate Debian changes into 020_debian.patch (closes: #776112)
(debian/patches/*.patch except 010_upstream.patch are merged)
Diffstat (limited to 'debian/patches/370_gtk2-pkg-config.patch')
| -rw-r--r-- | debian/patches/370_gtk2-pkg-config.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/debian/patches/370_gtk2-pkg-config.patch b/debian/patches/370_gtk2-pkg-config.patch deleted file mode 100644 index 5714fc5..0000000 --- a/debian/patches/370_gtk2-pkg-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 |