From 7bc9c63c9da678a7e6fceb095d56c634afd22c56 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 15 Dec 2019 18:09:03 +0000 Subject: gentoo resync : 15.12.2019 --- x11-terms/mrxvt/Manifest | 6 +++--- .../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 +++++---- 4 files changed, 14 insertions(+), 13 deletions(-) (limited to 'x11-terms/mrxvt') diff --git a/x11-terms/mrxvt/Manifest b/x11-terms/mrxvt/Manifest index 0cdc78a9812e..ed166bdb8980 100644 --- a/x11-terms/mrxvt/Manifest +++ b/x11-terms/mrxvt/Manifest @@ -1,5 +1,5 @@ -AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 380 BLAKE2B fd1c07e4e4ea15ed40ce97a9ac79c952e4ce5b0b824c749614f3a95712d37d3b87573137130c5be6c4d7e6b01c1a85e35ec8f197812198d6c201cf0d87801a58 SHA512 703d32e803d73e21ba5c746bcea94331c43e53e6f1b84a86271e94ae4cc59e6c4e8d4e86cbc3e29d594aec04881db57f587b1e94c42249b2beef08e718b69a36 -AUX mrxvt-0.5.4-libpng14.patch 841 BLAKE2B 4d78c68def28ae24678db2fd4aca346fbee170e81ac394deb671569434eed42e6dd8b02f68197eb2245af3d4997561a1b14959d2dfc7d5b030a8db3ed53a451a SHA512 469f2f40b5f09e645be2f59166787b01eb76215e2810b9804d088ed271f743f8d1850e4ed60795674e5d041364e465da8e1f2159131a5b48cab015a106b383c6 +AUX mrxvt-0.5.4-001-fix-segfault-when-wd-empty.patch 384 BLAKE2B ce0573ff1da58ce35c887d3ccc7291231acd0cd57232e0af95404b7ca2100d05db780a1a85878f2b082ef33582b6c202d99a72cafef2e9b247397eb0358e3bd9 SHA512 f2fc886135eb2267d3cdf45d34d151146e473b5b46697e10b44649dde3a05d9ddebbe469d2d7c0b042a26c3986e7a0f88caef049d908517c9cbcf7115688c9b4 +AUX mrxvt-0.5.4-libpng14.patch 849 BLAKE2B d12e4a2e14d0073b28c0fb3c8a834fc4f1f3684a1d98fd432f058dce2bd2b0e0b86b47d5b1b41c612ea7983596709dda1e180665913d760c587bc1ed1d4f4fa2 SHA512 a5f4c3c2c80e1ffbf55d98b5dc563616e924c5286610308041649c21b883354061eca58e058d000ad6e1ad0e845e86bba5a7327fd96def28cf823f1c80f01495 DIST mrxvt-0.5.4.tar.gz 603978 BLAKE2B 7abea6035620f4d93208458cdf994ad57ae47376364c65fe8e62542f013a65a4760df24c0a2c9d5fdecb76f20b895417792f773a32a7624836cda458b948dd3f SHA512 572bb4dda9f9b9dcb597f3185922646523bce34003f536acca82992f68f8f7c1a5f2778d626f805ea2cd061e8451fbbf12010e5d655221f76b83440825c80992 -EBUILD mrxvt-0.5.4.ebuild 3431 BLAKE2B 12901b0a41cd77ca8119b04716faa352714ab26ffb802e5f2945fb6a2afab0ef8914927b9c6ea10921c75b9cff06e1437a4dacd116716757e976b78387043f18 SHA512 af42adc2f28e26fbc9c0b0bdba05f52b2cd80022542ead3b38c77f3f41b0cbbf3dd19094cee04f37baaef8f50f92c9014a49eb88bf6b2333517bd312d4a37491 +EBUILD mrxvt-0.5.4.ebuild 3445 BLAKE2B 3d03bb7eb88a0f692619bf62c05bb4ff723de84047d15f5f8423d10bb775bbcc1e33850a707faf3d59654f9333187705202d3f3d8a24e3cfd63473c2bdc34abf SHA512 d59f9d79c13882dc5e8c77bca003249b6466083c855a0789afbaafdda79f18bec1d28e5dbe61dfa5267a1689bd88f23d631682a85653174b9c60f2bce544ed0c MISC metadata.xml 478 BLAKE2B a0f3413f95c5926e2fa4294967283d32f94081447f5d37d0f57b81a54cd50f3bd1ba8790eaf23fcbf7e5bdeeff21da5e392030f5869100dffa6478201bf2954b SHA512 fb26a82c0a26b3e23e9307ab811cc05fc6affce3bdf705d9417d8f10de7c8448b506414da9134888f4fc3c6fbf4d261646b77916730df711a0e86952a352ce72 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 a52a10269bc1..bf5362b3ee37 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 a475b70685dc..1c2215937099 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 3355069ef639..5d841cb7c682 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 -- cgit v1.2.3