From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 6240C138334 for ; Tue, 3 Dec 2019 14:31:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A98A8E081E; Tue, 3 Dec 2019 14:31:54 +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 7CC2DE081E for ; Tue, 3 Dec 2019 14:31:54 +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 262C734D735 for ; Tue, 3 Dec 2019 14:31:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 133868BC for ; Tue, 3 Dec 2019 14:31:51 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1575383505.777b8eccb294ecae84fe00016b329265c8dace8a.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/mrxvt/, x11-terms/mrxvt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch x11-terms/mrxvt/mrxvt-0.5.4.ebuild X-VCS-Directories: x11-terms/mrxvt/ x11-terms/mrxvt/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 777b8eccb294ecae84fe00016b329265c8dace8a X-VCS-Branch: master Date: Tue, 3 Dec 2019 14:31:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5beb5de6-5ba0-428a-9f34-4f4e20d42cd8 X-Archives-Hash: e7406539937ca681992fae86ffa0e01a commit: 777b8eccb294ecae84fe00016b329265c8dace8a Author: Anthony G. Basile gentoo org> AuthorDate: Tue Dec 3 14:31:32 2019 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Dec 3 14:31:45 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=777b8ecc x11-terms/mrxvt: bumpt to EAPI=7 Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Anthony G. Basile gentoo.org> .../mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch | 4 ++-- x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch | 8 ++++---- x11-terms/mrxvt/mrxvt-0.5.4.ebuild | 9 +++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch index a52a10269bc..bf5362b3ee3 100644 --- a/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch +++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch @@ -1,7 +1,7 @@ Index: src/tabbar.c =================================================================== ---- src/tabbar.c (revision 337) -+++ src/tabbar.c (working copy) +--- ./src/tabbar.c (revision 337) ++++ ./src/tabbar.c (working copy) @@ -1327,7 +1327,7 @@ if( p.we_wordc > 1) rxvt_msg( DBG_ERROR, DBG_TABBAR, diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch index a475b70685d..1c221593709 100644 --- a/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch +++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-libpng14.patch @@ -1,7 +1,7 @@ http://repos.archlinux.org/wsvn/packages/mrxvt/trunk/libpng14.patch ---- configure.ac -+++ configure.ac +--- ./configure.ac ++++ ./configure.ac @@ -952,7 +952,7 @@ if test "x$support_png" = "xyes"; then AC_CHECK_LIB( @@ -11,8 +11,8 @@ http://repos.archlinux.org/wsvn/packages/mrxvt/trunk/libpng14.patch [], [support_png=no], [-lz -lm] ---- src/mpng.c -+++ src/mpng.c +--- ./src/mpng.c ++++ ./src/mpng.c @@ -83,7 +83,7 @@ display_depth = XDefaultDepth(display,XDefaultScreen(display)); diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild index 3355069ef63..5d841cb7c68 100644 --- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild +++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=7 inherit autotools eutils DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support" @@ -31,8 +31,9 @@ DEPEND="${RDEPEND} x11-base/xorg-proto" src_prepare() { - epatch "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch \ - "${FILESDIR}"/${P}-libpng14.patch + eapply "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch + eapply "${FILESDIR}"/${P}-libpng14.patch + eapply_user eautoreconf