[gentoo-commits] repo/gentoo:master commit in: x11-terms/mrxvt/, x11-terms/mrxvt/files/

[David Seifert]

commit:     d3e99bee31a1948abb61d68092d0da987d967e9e
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sat Nov 28 23:09:24 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 23:09:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e99bee

x11-terms/mrxvt: fix build with gcc-10

* Thanks to Sam James for providing the patch link

Closes: https://github.com/gentoo/gentoo/pull/18441
Closes: https://bugs.gentoo.org/707146
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch | 20 +++++++++++
 x11-terms/mrxvt/mrxvt-0.5.4.ebuild                 | 41 +++++++++++++---------
 2 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
new file mode 100644
index 00000000000..2bb39a423ae
--- /dev/null
+++ b/x11-terms/mrxvt/files/mrxvt-0.5.4-fno-common.patch
@@ -0,0 +1,20 @@
+--- a/src/rxvtlib.h
++++ b/src/rxvtlib.h
+@@ -790,7 +790,7 @@ typedef struct {
+ } action_t;
+ 
+ /* Values for macro_t.type. Must sync this with macroNames from macros.c */
+-enum {
++enum macroFnNames {
+     MacroFnDummy=0,
+     MacroFnEsc,
+     MacroFnStr,
+@@ -820,7 +820,7 @@ enum {
+     MacroFnSaveConfig,
+     MacroFnToggleMacros,
+     NMACRO_FUNCS
+-} macroFnNames;
++};
+ 
+ typedef unsigned char macro_priority_t;
+ typedef struct {

diff --git a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
index 2090e188130..dbbfd4f073d 100644
--- a/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
+++ b/x11-terms/mrxvt/mrxvt-0.5.4.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools eutils
+
+inherit autotools
 
 DESCRIPTION="Multi-tabbed rxvt clone with XFT, transparent background and CJK support"
 HOMEPAGE="http://materm.sourceforge.net/"
@@ -15,31 +16,37 @@ KEYWORDS="~alpha amd64 ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 L10N_IUSE="l10n_el l10n_ja l10n_ko l10n_th l10n_zh-CN l10n_zh-TW"
 IUSE="debug png jpeg session truetype menubar utempter xpm ${L10N_IUSE}"
 
-RDEPEND="png? ( media-libs/libpng )
-	utempter? ( sys-libs/libutempter )
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXt
 	jpeg? ( virtual/jpeg )
-	truetype? ( x11-libs/libXft
+	png? ( media-libs/libpng:= )
+	truetype? (
 		media-libs/fontconfig
 		media-libs/freetype
-		elibc_uclibc? ( dev-libs/libiconv ) )
-	x11-libs/libX11
-	x11-libs/libXt
-	xpm? ( x11-libs/libXpm )
-	x11-libs/libXrender"
-
-DEPEND="${RDEPEND}
+		x11-libs/libXft
+		elibc_uclibc? ( dev-libs/libiconv )
+	)
+	utempter? ( sys-libs/libutempter )
+	xpm? ( x11-libs/libXpm )"
+DEPEND="
+	${RDEPEND}
 	x11-base/xorg-proto"
 
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
-	eapply "${FILESDIR}"/${P}-libpng14.patch
-	eapply_user
+PATCHES=(
+	"${FILESDIR}"/${P}-001-fix-segfault-when-wd-empty.patch
+	"${FILESDIR}"/${P}-libpng14.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+	default
 	eautoreconf
 
 	if use elibc_uclibc && use truetype; then
 		# It is stated in the README "Multichar support under XFT requires GNU iconv"
-		sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' "${S}/src/Makefile.in"
+		sed -i -e 's/LIBS = @LIBS@/LIBS = @LIBS@ -liconv/' src/Makefile.in || die
 	fi
 }
 
@@ -102,7 +109,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z $RXVT_TERM ]]; then
+	if [[ -z ${RXVT_TERM} ]]; then
 		einfo
 		einfo "If you experience problems with curses programs, then this is"
 		einfo "most likely because of incorrectly set termcap / terminfo"