summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori Hattori <hattya@gentoo.org>2018-04-03 22:23:54 +0900
committerAkinori Hattori <hattya@gentoo.org>2018-04-03 22:31:36 +0900
commit97d6e3e6839898829e8cce211b97a7fa77f5d06e (patch)
treed97ec1804fcc03bd392cb426223c845dcc13cfbe
parentwww-client/w3m: update patches (diff)
downloadgentoo-97d6e3e6839898829e8cce211b97a7fa77f5d06e.tar.gz
gentoo-97d6e3e6839898829e8cce211b97a7fa77f5d06e.tar.bz2
gentoo-97d6e3e6839898829e8cce211b97a7fa77f5d06e.zip
www-client/w3m: fix dependency for w3m-img
Closes: https://bugs.gentoo.org/605930 Package-Manager: Portage-2.3.24, Repoman-2.3.6
-rw-r--r--www-client/w3m/files/w3m-img-fb.patch10
-rw-r--r--www-client/w3m/metadata.xml1
-rw-r--r--www-client/w3m/w3m-0.5.3-r9.ebuild32
3 files changed, 29 insertions, 14 deletions
diff --git a/www-client/w3m/files/w3m-img-fb.patch b/www-client/w3m/files/w3m-img-fb.patch
new file mode 100644
index 00000000000..677d89d3bcd
--- /dev/null
+++ b/www-client/w3m/files/w3m-img-fb.patch
@@ -0,0 +1,10 @@
+--- a/w3mimg/fb/fb_imlib2.c
++++ b/w3mimg/fb/fb_imlib2.c
+@@ -3,7 +3,6 @@
+ fb_imlib2.c 0.3 Copyright (C) 2002, hito
+ **************************************************************************/
+
+-#include <X11/Xlib.h>
+ #include <Imlib2.h>
+ #include "fb.h"
+ #include "fb_img.h"
diff --git a/www-client/w3m/metadata.xml b/www-client/w3m/metadata.xml
index dd01429b95e..3a35f0fcc04 100644
--- a/www-client/w3m/metadata.xml
+++ b/www-client/w3m/metadata.xml
@@ -6,6 +6,7 @@
<name>Cjk</name>
</maintainer>
<use>
+ <flag name="gdk-pixbuf">Enable support for <pkg>x11-libs/gdk-pixbuf</pkg></flag>
<flag name="lynxkeymap">If you prefer Lynx-like key binding</flag>
</use>
<upstream>
diff --git a/www-client/w3m/w3m-0.5.3-r9.ebuild b/www-client/w3m/w3m-0.5.3-r9.ebuild
index 811e11b5efd..61d0335e916 100644
--- a/www-client/w3m/w3m-0.5.3-r9.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r9.ebuild
@@ -15,22 +15,20 @@ SRC_URI="https://github.com/tats/${PN}/archive/v${PV}+${MY_REL}.tar.gz -> ${MY_P
LICENSE="w3m"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="X fbcon gpm gtk imlib l10n_de l10n_ja libressl lynxkeymap nls nntp ssl unicode xface"
+IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja libressl lynxkeymap nls nntp ssl unicode xface"
-# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
-# allow us to build w/o X, so we have to give up framebuffer w3mimg....
-RDEPEND=">=dev-libs/boehm-gc-6.2:=
- >=sys-libs/ncurses-5.2-r3:0=
- >=sys-libs/zlib-1.1.3-r2
+RDEPEND="dev-libs/boehm-gc:=
+ sys-libs/ncurses:0=
+ sys-libs/zlib
X? (
x11-libs/libXdmcp
x11-libs/libXext
)
- gtk? ( x11-libs/gdk-pixbuf )
- !gtk? (
- imlib? ( >=media-libs/imlib2-1.1.0[X] )
+ gdk-pixbuf? ( x11-libs/gdk-pixbuf[X?] )
+ !gdk-pixbuf? (
+ imlib? ( media-libs/imlib2[X?] )
)
- gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+ gpm? ( sys-libs/gpm )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
@@ -40,7 +38,13 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
-PATCHES=( "${FILESDIR}/${PN}-time.patch" )
+REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
+ fbcon? ( ?? ( gdk-pixbuf imlib ) )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-img-fb.patch"
+ "${FILESDIR}/${PN}-time.patch"
+)
src_prepare() {
default
@@ -53,14 +57,14 @@ src_configure() {
local myconf=()
local image imagelib
- if use gtk; then
+ if use gdk-pixbuf; then
imagelib="gtk2"
elif use imlib; then
imagelib="imlib2"
fi
if [[ -n "${imagelib}" ]]; then
- use X && image="${image}${image:+,}x11"
- use X && use fbcon && image="${image}${image:+,}fb"
+ use X && image="${image}${image:+,}x11"
+ use fbcon && image="${image}${image:+,}fb"
fi
# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
# so we better enable or disable both. Default to enable