* [gentoo-commits] repo/gentoo:master commit in: x11-terms/mrxvt/, x11-terms/mrxvt/files/
@ 2019-12-03 14:31 Anthony G. Basile
0 siblings, 0 replies; 2+ messages in thread
From: Anthony G. Basile @ 2019-12-03 14:31 UTC (permalink / raw
To: gentoo-commits
commit: 777b8eccb294ecae84fe00016b329265c8dace8a
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 3 14:31:32 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> 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 <blueness <AT> 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/mrxvt/, x11-terms/mrxvt/files/
@ 2020-11-28 23:10 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2020-11-28 23:10 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-28 23:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-03 14:31 [gentoo-commits] repo/gentoo:master commit in: x11-terms/mrxvt/, x11-terms/mrxvt/files/ Anthony G. Basile
-- strict thread matches above, loose matches on Subject: below --
2020-11-28 23:10 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox