From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1014707-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 090891382C5
for <garchives@archives.gentoo.org>; Tue, 3 Apr 2018 13:32:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B99EEE0BA3;
Tue, 3 Apr 2018 13:32:50 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 811A7E0BA3
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Apr 2018 13:32:50 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AF0A1335D36
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Apr 2018 13:32:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8DFA9277
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Apr 2018 13:32:46 +0000 (UTC)
From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" <hattya@gentoo.org>
Message-ID: <1522762296.75c91c730b02f8f85ca27c1017c241927e34f650.hattya@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/w3m/files/, www-client/w3m/
X-VCS-Repository: repo/gentoo
X-VCS-Files: www-client/w3m/files/w3m-0.5.3-fix-missing-time.patch www-client/w3m/files/w3m-0.5.3-underlinking.patch www-client/w3m/files/w3m-time.patch www-client/w3m/w3m-0.5.3-r9.ebuild
X-VCS-Directories: www-client/w3m/files/ www-client/w3m/
X-VCS-Committer: hattya
X-VCS-Committer-Name: Akinori Hattori
X-VCS-Revision: 75c91c730b02f8f85ca27c1017c241927e34f650
X-VCS-Branch: master
Date: Tue, 3 Apr 2018 13:32:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: f182a162-32a9-4b42-a18a-5cff3d15dcd5
X-Archives-Hash: f61e7ee91055403a6dad0bbd2906b798
commit: 75c91c730b02f8f85ca27c1017c241927e34f650
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 3 13:18:04 2018 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue Apr 3 13:31:36 2018 +0000
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..00000000000
--- 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 <martin.pitt@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
-
---- w3m-0.5.3.orig/Makefile.in 2011-01-04 18:22:18.000000000 +0900
-+++ w3m-0.5.3/Makefile.in 2011-02-06 12:05:40.000000000 +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