[gentoo-commits] repo/gentoo:master commit in: www-client/w3m/files/, www-client/w3m/
commit: 466d6e07e72b21538a8fd6a03ebefec90347ebae
Author: Sam James gentoo org>
AuthorDate: Mon Sep 12 17:43:31 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Sep 12 18:04:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=466d6e07
www-client/w3m: fix configure tests with Clang 15
Signed-off-by: Sam James gentoo.org>
.../w3m-0.5.3_p20220429-clang-15-configure.patch | 26
www-client/w3m/w3m-0.5.3_p20220429-r1.ebuild | 135 +
2 files changed, 161 insertions(+)
diff --git a/www-client/w3m/files/w3m-0.5.3_p20220429-clang-15-configure.patch
b/www-client/w3m/files/w3m-0.5.3_p20220429-clang-15-configure.patch
new file mode 100644
index ..c9543cb64955
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3_p20220429-clang-15-configure.patch
@@ -0,0 +1,26 @@
+https://github.com/tats/w3m/pull/248
+
+From cecac3d8a177362fc27c8a109ac23a8760e74a10 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Mon, 12 Sep 2022 18:41:28 +0100
+Subject: [PATCH] acinclude.m4: fix configure tests broken with Clang 15
+ (implicit function declarations)
+
+Clang 15 makes implicit function declarations fatal by default which
+leads to some configure tests silently failing/returning
+the wrong result.
+
+Signed-off-by: Sam James
+--- a/acinclude.m4
b/acinclude.m4
+@@ -904,7 +904,8 @@ AC_DEFUN([AC_W3M_SIGSETJMP],
+ [AC_SUBST(HAVE_SIGSETJMP)
+ AC_MSG_CHECKING(for sigsetjmp)
+ AC_TRY_COMPILE(
+-[#include ],
++[#include
++ #include ],
+ [ jmp_buf env;
+if (sigsetjmp(env, 1) != 0) { exit(0); } siglongjmp(env, 1);],
+ [have_sigsetjmp="yes"; AC_DEFINE(HAVE_SIGSETJMP)],
+
diff --git a/www-client/w3m/w3m-0.5.3_p20220429-r1.ebuild
b/www-client/w3m/w3m-0.5.3_p20220429-r1.ebuild
new file mode 100644
index ..5793a2a9b5a5
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3_p20220429-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools prefix toolchain-funcs
+
+MY_P="${P/_p/+git}"
+MY_PV="${PV/_p/+git}"
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="https://github.com/tats/w3m;
+SRC_URI="https://github.com/tats/w3m/archive/v${MY_PV}.tar.gz ->
${MY_P}.tar.gz"
+S="${WORKDIR}/${P/_p/-git}"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="fbcon gdk-pixbuf gpm imlib l10n_ja lynxkeymap nls nntp ssl unicode X
xface"
+
+REQUIRED_USE="
+ fbcon? ( ?? ( gdk-pixbuf imlib ) )
+ X? ( ?? ( gdk-pixbuf imlib ) )
+"
+
+RDEPEND="
+ dev-libs/boehm-gc:=
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf
+ X? ( x11-libs/gdk-pixbuf-xlib )
+ )
+ !gdk-pixbuf? (
+ imlib? ( media-libs/imlib2[X?] )
+ )
+ gpm? ( sys-libs/gpm )
+ ssl? ( dev-libs/openssl:0= )
+ X? (
+ x11-base/xorg-proto
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ )
+ xface? ( media-libs/compface )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.3_p20210102-restore-gettext-macro.patch
+ "${FILESDIR}"/${PN}-0.5.3_p20210102-fix-configure-gettext.patch
+ "${FILESDIR}"/${PN}-0.5.3_p20220429-clang-15-configure.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in || die
+ hprefixify acinclude.m4
+
+ AT_NOEAUTOHEADER="yes" AT_M4DIR="m4" eautoreconf
+}
+
+src_configure() {
+ local myconf=()
+ local image imagelib
+
+ if use gdk-pixbuf ; then
+ imagelib="gtk3"
+ elif use imlib ; then
+ imagelib="imlib2"
+ fi
+ if [[ -n "${imagelib}" ]] ; then
+ 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
+ # m17n and unicode, see bug #47046.
+ if use l10n_ja ; then
+ myconf+=( --enable-japanese=$(usex unicode U E) )
+ else
+ myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
+ fi
+ # lynxkeymap IUSE flag. bug #49397
+ myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
+
+ econf \
+ $(use_enable gpm mouse) \
+ $(use_enable nls) \
+ $(use_enable nntp) \
+ $(use_enable ssl digest-auth) \
+ $(use_enable xface) \
+ $(use_with ssl) \
+ --enable-image=${image:-no} \
+ --enable-m17n \
+
[gentoo-commits] repo/gentoo:master commit in: www-client/w3m/files/, www-client/w3m/
commit: 5d3abfa9559c11bd9ac3087a9bf3debd51cf0c30
Author: Marco Scardovi scardovi com>
AuthorDate: Sun Apr 25 21:51:57 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 25 22:00:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d3abfa9
www-client/w3m: add 0.5.3_p20210102
Signed-off-by: Marco Scardovi scardovi.com>
Signed-off-by: Sam James gentoo.org>
www-client/w3m/Manifest | 1 +
www-client/w3m/files/lang.patch | 32 +++
www-client/w3m/w3m-0.5.3_p20210102.ebuild | 136 ++
3 files changed, 169 insertions(+)
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 8de29484f7d..0f12153d81d 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,2 +1,3 @@
DIST w3m-0.5.3+git20180125.tar.gz 2181743 BLAKE2B
d0766fa215be971ba280e4933ee9521ac4b7806f77ced5be4de58a5e28fa478e29a9102d101174f8d216cb982827b347c0fbcbfc494068d1cb8e443e73df7228
SHA512
61b8498b927569937c509460e291eeba6eb302d34ccd6e1bf4d1eb07ac73a3ac5a477161727d310324625be04b907f8c3e970382d08c9fa0846b371699f04e14
DIST w3m-0.5.3+git20190105.tar.gz 2183651 BLAKE2B
624fe3b8c1daa2a6d4ce21e051ee363a29114bdb64e0e0d9864b8098f2a12bcb27e293fa3dfa4dc1dff691fa40046f4878b7d39c321f591d3689d00e3ed42bad
SHA512
b63b15d0bea82f50bcaa9fc0826c2d3c265a3ad73069b4a020812f28b552cdf08618ab877280c9f3a43bd64f51b80b7a526098e6395ea121c0981a3fcd2562b4
+DIST w3m-0.5.3+git20210102.tar.gz 2189272 BLAKE2B
f82c13c26b1c83cda90655abdcf30422e257a5c2e48c32d5636a70f895078d11a95fc6ce623fa94624bb2a1125b71e7654d872dfb91fd86c4290278de3cf88f8
SHA512
357eeecf0f63bfd5174c9670533882323879657bdecefd0758d853ca645e368331bfdf91e99c0917f19829e184ce892ecdc99bd865851707d93baccfb4b97632
diff --git a/www-client/w3m/files/lang.patch b/www-client/w3m/files/lang.patch
new file mode 100644
index 000..dccc3542690
--- /dev/null
+++ b/www-client/w3m/files/lang.patch
@@ -0,0 +1,32 @@
+new file mode 100644
+index ..da1b2aef
+--- /dev/null
b/m4/codeset.m4
+@@ -0,0 +1,25 @@
++# codeset.m4 serial 5 (gettext-0.18.2)
++dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016 Free Software Foundation,
++dnl Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl From Bruno Haible.
++
++AC_DEFUN([AM_LANGINFO_CODESET],
++[
++ AC_CACHE_CHECK([for nl_langinfo and CODESET], [am_cv_langinfo_codeset],
++[AC_LINK_IFELSE(
++ [AC_LANG_PROGRAM(
++ [[#include ]],
++ [[char* cs = nl_langinfo(CODESET); return !cs;]])],
++ [am_cv_langinfo_codeset=yes],
++ [am_cv_langinfo_codeset=no])
++])
++ if test $am_cv_langinfo_codeset = yes; then
++AC_DEFINE([HAVE_LANGINFO_CODESET], [1],
++ [Define if you have and nl_langinfo(CODESET).])
++ fi
++])
++
+--
+2.20.1
diff --git a/www-client/w3m/w3m-0.5.3_p20210102.ebuild
b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
new file mode 100644
index 000..cb833a9cd2b
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.3_p20210102.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools prefix toolchain-funcs
+
+MY_P="${P/_p/+git}"
+MY_PV="${PV/_p/+git}"
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="https://github.com/tats/w3m;
+SRC_URI="https://github.com/tats/w3m/archive/v${MY_PV}.tar.gz ->
${MY_P}.tar.gz"
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
~x86-solaris"
+IUSE="fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja lynxkeymap nls nntp ssl
unicode X xface"
+
+REQUIRED_USE="
+ fbcon? ( ?? ( gdk-pixbuf imlib ) )
+ X? ( ?? ( gdk-pixbuf imlib ) )
+"
+
+RDEPEND="
+ dev-libs/boehm-gc:=
+ sys-libs/ncurses:0=
+ sys-libs/zlib
+ gdk-pixbuf? (
+ x11-libs/gdk-pixbuf
+ X? ( x11-libs/gdk-pixbuf-xlib )
+ )
+ !gdk-pixbuf? (
+ imlib? ( media-libs/imlib2[X?] )
+ )
+ gpm? ( sys-libs/gpm )
+ ssl? ( dev-libs/openssl:0= )
+ X? (
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ )
+ xface? ( media-libs/compface )
+"
+
+BDEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/lang.patch" )
+
+S="${WORKDIR}/${P/_p/-git}"
+
+src_prepare() {
+ default
+ sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in || die
+ hprefixify acinclude.m4
+
+ eautoconf
+}
+
+src_configure() {
+ local myconf=()
+ local image imagelib
+
+ if use gdk-pixbuf ; then
+ imagelib="gtk3"
+ elif use imlib ; then
+ imagelib="imlib2"
+ fi
+ if
[gentoo-commits] repo/gentoo:master commit in: www-client/w3m/files/, www-client/w3m/
commit: 3d57bfe7a5f036cb475c135dffa13d8382fd1e8f
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Mon Apr 16 16:48:59 2018 +
Commit: Mike Gilbert gentoo org>
CommitDate: Mon Apr 16 18:27:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d57bfe7
www-client/w3m: Delete old version (0.5.3-r9).
www-client/w3m/Manifest | 1 -
www-client/w3m/files/w3m-time.patch | 11 ---
www-client/w3m/w3m-0.5.3-r9.ebuild | 132
3 files changed, 144 deletions(-)
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 8f7f3f3e054..1c5ab42428f 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,2 +1 @@
DIST w3m-0.5.3+git20180125.tar.gz 2181743 BLAKE2B
d0766fa215be971ba280e4933ee9521ac4b7806f77ced5be4de58a5e28fa478e29a9102d101174f8d216cb982827b347c0fbcbfc494068d1cb8e443e73df7228
SHA512
61b8498b927569937c509460e291eeba6eb302d34ccd6e1bf4d1eb07ac73a3ac5a477161727d310324625be04b907f8c3e970382d08c9fa0846b371699f04e14
-DIST w3m-0.5.3.git20161120.tar.gz 2177917 BLAKE2B
48e7d9fee00431d65e4ae486d1cf5a376542fb0655215d95455d6f0e3ba63a6dfb243a858e0bb5e745ac75713091b17fa5c5a63c91a3e837c911ef1f576ce497
SHA512
81ecf9e5d9067a82efa5464e5f9396327a6333f9e414458a972b2b7bff138bd17c490b5258e34cb1e338c7a6c0dd6105a1bfd1e0d02edfadead79caa39106a5c
diff --git a/www-client/w3m/files/w3m-time.patch
b/www-client/w3m/files/w3m-time.patch
deleted file mode 100644
index 8489eee3fae..000
--- a/www-client/w3m/files/w3m-time.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/html.h
-+++ b/html.h
-@@ -8,6 +8,8 @@
- #include
- #endif/* USE_SSL */
-
-+#include
-+
- #define StrUFgets(f) StrISgets((f)->stream)
- #define StrmyUFgets(f) StrmyISgets((f)->stream)
- #define UFgetc(f) ISgetc((f)->stream)
diff --git a/www-client/w3m/w3m-0.5.3-r9.ebuild
b/www-client/w3m/w3m-0.5.3-r9.ebuild
deleted file mode 100644
index b4bce71092f..000
--- a/www-client/w3m/w3m-0.5.3-r9.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools prefix vcs-snapshot
-
-MY_REL="git20161120"
-MY_P="${P}.${MY_REL}"
-
-DESCRIPTION="Text based WWW browser, supports tables and frames"
-HOMEPAGE="https://github.com/tats/w3m;
-SRC_URI="https://github.com/tats/${PN}/archive/v${PV}+${MY_REL}.tar.gz ->
${MY_P}.tar.gz"
-
-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
~amd64-fbsd"
-IUSE="X fbcon gdk-pixbuf gpm imlib l10n_de l10n_ja libressl lynxkeymap nls
nntp ssl unicode xface"
-
-RDEPEND="dev-libs/boehm-gc:=
- sys-libs/ncurses:0=
- sys-libs/zlib
- X? (
- x11-libs/libXdmcp
- x11-libs/libXext
- )
- gdk-pixbuf? ( x11-libs/gdk-pixbuf[X?] )
- !gdk-pixbuf? (
- imlib? ( media-libs/imlib2[X?] )
- )
- gpm? ( sys-libs/gpm )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- xface? ( media-libs/compface )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="X? ( ?? ( gdk-pixbuf imlib ) )
- fbcon? ( ?? ( gdk-pixbuf imlib ) )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-img-fb.patch"
- "${FILESDIR}/${PN}-time.patch"
-)
-
-src_prepare() {
- default
- sed -i "/^AR=/s:ar:$(tc-getAR):" {.,${PN}img,libwc}/Makefile.in
- hprefixify acinclude.m4
- eautoconf
-}
-
-src_configure() {
- local myconf=()
- local image imagelib
-
- 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 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
- # m17n and unicode, see bug #47046.
- if use l10n_ja; then
- myconf+=( --enable-japanese=$(usex unicode U E) )
- else
- myconf+=( --with-charset=$(usex unicode UTF-8 US-ASCII) )
- fi
- # lynxkeymap IUSE flag. bug #49397
- myconf+=( --enable-keymap=$(usex lynxkeymap lynx ${PN}) )
-
- econf \
- $(use_enable gpm mouse) \
- $(use_enable nls) \
- $(use_enable nntp) \
- $(use_enable ssl digest-auth) \
- $(use_enable xface) \
- $(use_with ssl) \
- --enable-image=${image:-no} \
- --enable-m17n \
- --enable-unicode \
- --with-browser="${EPREFIX}/usr/bin/xdg-open" \
-
[gentoo-commits] repo/gentoo:master commit in: www-client/w3m/files/, www-client/w3m/
commit: 97d6e3e6839898829e8cce211b97a7fa77f5d06e
Author: Akinori Hattori gentoo org>
AuthorDate: Tue Apr 3 13:23:54 2018 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Apr 3 13:31:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d6e3e6
www-client/w3m: fix dependency for w3m-img
Closes: https://bugs.gentoo.org/605930
Package-Manager: Portage-2.3.24, Repoman-2.3.6
www-client/w3m/files/w3m-img-fb.patch | 10 ++
www-client/w3m/metadata.xml | 1 +
www-client/w3m/w3m-0.5.3-r9.ebuild| 32 ++--
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 000..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
+ #include
+ #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 @@
Cjk
+ Enable support for
x11-libs/gdk-pixbuf
If you prefer Lynx-like key
binding
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
[gentoo-commits] repo/gentoo:master commit in: www-client/w3m/files/, www-client/w3m/
commit: 75c91c730b02f8f85ca27c1017c241927e34f650
Author: Akinori Hattori gentoo org>
AuthorDate: Tue Apr 3 13:18:04 2018 +
Commit: Akinori Hattori gentoo org>
CommitDate: Tue Apr 3 13:31:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75c91c73
www-client/w3m: update patches
Package-Manager: Portage-2.3.24, Repoman-2.3.6
www-client/w3m/files/w3m-0.5.3-underlinking.patch | 15 ---
.../{w3m-0.5.3-fix-missing-time.patch => w3m-time.patch} | 2 --
www-client/w3m/w3m-0.5.3-r9.ebuild| 5 +
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/www-client/w3m/files/w3m-0.5.3-underlinking.patch
b/www-client/w3m/files/w3m-0.5.3-underlinking.patch
deleted file mode 100644
index 1b034b46cb1..000
--- a/www-client/w3m/files/w3m-0.5.3-underlinking.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Explicitly link w3mimgdisplay with -lX11 to build with gcc 4.5
-Author: Martin Pitt
-Bug:
https://sourceforge.net/tracker/?func=detail=3126430_id=39518=425441
-
w3m-0.5.3.orig/Makefile.in 2011-01-04 18:22:18.0 +0900
-+++ w3m-0.5.3/Makefile.in 2011-02-06 12:05:40.0 +0900
-@@ -199,7 +199,7 @@
- $(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
-
- $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
-- $(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a
$(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
-+ $(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a
$(LDFLAGS) $(LIBS) -lX11 $(IMGLDFLAGS)
-
- w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
- $(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
diff --git a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
b/www-client/w3m/files/w3m-time.patch
similarity index 80%
rename from www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
rename to www-client/w3m/files/w3m-time.patch
index 03efd85d653..8489eee3fae 100644
--- a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
+++ b/www-client/w3m/files/w3m-time.patch
@@ -1,5 +1,3 @@
-diff --git a/html.h b/html.h
-index c490655..2a9a431 100644
--- a/html.h
+++ b/html.h
@@ -8,6 +8,8 @@
diff --git a/www-client/w3m/w3m-0.5.3-r9.ebuild
b/www-client/w3m/w3m-0.5.3-r9.ebuild
index a4a9eb180c8..811e11b5efd 100644
--- a/www-client/w3m/w3m-0.5.3-r9.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r9.ebuild
@@ -40,10 +40,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
S="${WORKDIR}/${MY_P}"
-PATCHES=(
- "${FILESDIR}/${P}-underlinking.patch"
- "${FILESDIR}/${P}-fix-missing-time.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-time.patch" )
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: www-client/w3m/files/, www-client/w3m/
commit: 8ee43ba4e036db70fff258f3edb2f0335385e93f
Author: Yixun Lan gentoo org>
AuthorDate: Sun Dec 4 15:04:12 2016 +
Commit: Yixun Lan gentoo org>
CommitDate: Sun Dec 4 15:05:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ee43ba4
www-client/w3m: fix USE="-ssl" err, missing
Gentoo-Bug: 601498
Package-Manager: portage-2.3.2
www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch | 13 +
www-client/w3m/w3m-0.5.3-r9.ebuild| 8 +---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
b/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
new file mode 100644
index ..03efd85
--- /dev/null
+++ b/www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch
@@ -0,0 +1,13 @@
+diff --git a/html.h b/html.h
+index c490655..2a9a431 100644
+--- a/html.h
b/html.h
+@@ -8,6 +8,8 @@
+ #include
+ #endif/* USE_SSL */
+
++#include
++
+ #define StrUFgets(f) StrISgets((f)->stream)
+ #define StrmyUFgets(f) StrmyISgets((f)->stream)
+ #define UFgetc(f) ISgetc((f)->stream)
diff --git a/www-client/w3m/w3m-0.5.3-r9.ebuild
b/www-client/w3m/w3m-0.5.3-r9.ebuild
index a0f3e0b..bc191ce 100644
--- a/www-client/w3m/w3m-0.5.3-r9.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r9.ebuild
@@ -34,11 +34,13 @@ RDEPEND=">=sys-libs/ncurses-5.2-r3:0=
DEPEND="${RDEPEND}
virtual/pkgconfig"
-S="${WORKDIR}"/${MY_P}
+PATCHES=(
+ "${FILESDIR}/${P}-underlinking.patch"
+ "${FILESDIR}/${P}-fix-missing-time.patch"
+)
+S="${WORKDIR}"/${MY_P}
src_prepare() {
- epatch "${FILESDIR}/${PN}-0.5.3-underlinking.patch"
-
default
ecvs_clean
sed -i -e "/^AR=/s/ar/$(tc-getAR)/" {.,w3mimg,libwc}/Makefile.in || die
