From aa8cdb97fa50bf568e433be68df5b0689b3185d8 Mon Sep 17 00:00:00 2001 From: Marek Szuba Date: Sun, 8 Nov 2020 12:38:12 +0100 Subject: x11-terms/rxvt-unicode: use a different 24-bit-colour patch The old one had a bug in configure logic which made it impossible to switch 24-bit colour off. Signed-off-by: Marek Szuba --- x11-terms/rxvt-unicode/Manifest | 2 +- x11-terms/rxvt-unicode/rxvt-unicode-9.22-r4.ebuild | 105 --------------------- x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild | 105 +++++++++++++++++++++ 3 files changed, 106 insertions(+), 106 deletions(-) delete mode 100644 x11-terms/rxvt-unicode/rxvt-unicode-9.22-r4.ebuild create mode 100644 x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild (limited to 'x11-terms/rxvt-unicode') diff --git a/x11-terms/rxvt-unicode/Manifest b/x11-terms/rxvt-unicode/Manifest index d6f8508233a1..7a676fb3fd40 100644 --- a/x11-terms/rxvt-unicode/Manifest +++ b/x11-terms/rxvt-unicode/Manifest @@ -1,2 +1,2 @@ DIST rxvt-unicode-9.22.tar.bz2 931198 BLAKE2B ea9a12e4a8396ed6be12b4d50ae260a0376902dbd47b0628bb14ce0509c5d89f5a80370b413fdb9df9b8b81728ec26e115cbf0d88ab6e9cb2a87b03b5d79c432 SHA512 b39f1b2cbe6dd3fbd2a0ad6a9d391a2b6f49d7c5e67bc65fe44a9c86937f8db379572c67564c6e21ff6e09b447cdfd4e540544e486179e94da0e0db679c04dd9 -DIST rxvt-unicode-9.22_24-bit-color-f45025a.patch.xz 8152 BLAKE2B 373e40b0bf3fe0d0a1b5aaf7a6737194858728aa90bd6095d5b9ba85f5fe4cc6b0225f63352517b30edfc166e7075a9d46f4380b0f8e7ca221c84d057c626c6f SHA512 15a13d7f2867ff2423fe7d0f263c65f4f031cb01940b3237e7038010bce4f7f51777b6bc56f6ecaf323785b35cd97b2313fb11ee6e47773cf0df5720dcee16fc +DIST rxvt-unicode-9.22_24-bit-color_cpixl-20201108.patch.xz 8116 BLAKE2B 27940ad42ee3f26c357a50b7fae1e1539acec71f5ff43e7ed16167d0adb175c4de20ba84880f25eec0817703d937d097fda228541d16511811efe5816109e71b SHA512 2b8bbb90c6bb223f622c1e99d62a70a812604d1f8e57cea37a8faf0af578588d3888ea8009568d623710cc03e020a69269770e23476fd9ff9e46dbd9ea23f540 diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r4.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r4.ebuild deleted file mode 100644 index 5c2981ebb1c7..000000000000 --- a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r4.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools desktop - -COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color-f45025a.patch" - -DESCRIPTION="rxvt clone with xft and unicode support" -HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" -SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2 - https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" -IUSE=" - -24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel - +perl startup-notification unicode3 +utmp +wtmp xft -" -RESTRICT="test" - -RDEPEND=" - >=sys-libs/ncurses-5.7-r6:= - media-libs/fontconfig - x11-libs/libX11 - x11-libs/libXrender - gdk-pixbuf? ( x11-libs/gdk-pixbuf ) - kernel_Darwin? ( dev-perl/Mac-Pasteboard ) - perl? ( dev-lang/perl:= ) - startup-notification? ( x11-libs/startup-notification ) - xft? ( x11-libs/libXft ) -" -DEPEND=" - ${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto -" -PATCHES=( - "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch - "${FILESDIR}"/${PN}-9.21-xsubpp.patch - "${WORKDIR}"/${COLOUR_PATCH_NAME} -) -DOCS=( - Changes - README.FAQ - doc/README.xvt - doc/changes.txt - doc/etc/${PN}.term{cap,info} - doc/rxvt-tabbed -) - -src_prepare() { - default - - # kill the rxvt-unicode terminfo file - #192083 - sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" - - eautoreconf -} - -src_configure() { - # --enable-everything goes first: the order of the arguments matters - econf --enable-everything \ - $(use_enable 24-bit-color) \ - $(use_enable 256-color) \ - $(use_enable blink text-blink) \ - $(use_enable fading-colors fading) \ - $(use_enable font-styles) \ - $(use_enable gdk-pixbuf pixbuf) \ - $(use_enable iso14755) \ - $(use_enable mousewheel) \ - $(use_enable perl) \ - $(use_enable startup-notification) \ - $(use_enable unicode3) \ - $(use_enable utmp) \ - $(use_enable wtmp) \ - $(use_enable xft) -} - -src_compile() { - default - - sed -i \ - -e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \ - "${S}"/doc/rxvt-tabbed || die -} - -src_install() { - default - - make_desktop_entry urxvt rxvt-unicode utilities-terminal \ - "System;TerminalEmulator" -} - -pkg_postinst() { - if use 24-bit-color; then - ewarn - ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE." - ewarn "You may or may not encounter visual glitches or stability issues. When in doubt," - ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)." - ewarn - fi -} diff --git a/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild new file mode 100644 index 000000000000..ce083fc2e2f3 --- /dev/null +++ b/x11-terms/rxvt-unicode/rxvt-unicode-9.22-r5.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop + +COLOUR_PATCH_NAME="${PN}-9.22_24-bit-color_cpixl-20201108.patch" + +DESCRIPTION="rxvt clone with xft and unicode support" +HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" +SRC_URI="http://dist.schmorp.de/rxvt-unicode/Attic/${P}.tar.bz2 + https://dev.gentoo.org/~marecki/dists/${PN}/${COLOUR_PATCH_NAME}.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" +IUSE=" + -24-bit-color 256-color blink fading-colors +font-styles gdk-pixbuf iso14755 +mousewheel + +perl startup-notification unicode3 +utmp +wtmp xft +" +RESTRICT="test" + +RDEPEND=" + >=sys-libs/ncurses-5.7-r6:= + media-libs/fontconfig + x11-libs/libX11 + x11-libs/libXrender + gdk-pixbuf? ( x11-libs/gdk-pixbuf ) + kernel_Darwin? ( dev-perl/Mac-Pasteboard ) + perl? ( dev-lang/perl:= ) + startup-notification? ( x11-libs/startup-notification ) + xft? ( x11-libs/libXft ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + x11-base/xorg-proto +" +PATCHES=( + "${FILESDIR}"/${PN}-9.06-case-insensitive-fs.patch + "${FILESDIR}"/${PN}-9.21-xsubpp.patch + "${WORKDIR}"/${COLOUR_PATCH_NAME} +) +DOCS=( + Changes + README.FAQ + doc/README.xvt + doc/changes.txt + doc/etc/${PN}.term{cap,info} + doc/rxvt-tabbed +) + +src_prepare() { + default + + # kill the rxvt-unicode terminfo file - #192083 + sed -i -e "/rxvt-unicode.terminfo/d" doc/Makefile.in || die "sed failed" + + eautoreconf +} + +src_configure() { + # --enable-everything goes first: the order of the arguments matters + econf --enable-everything \ + $(use_enable 24-bit-color) \ + $(use_enable 256-color) \ + $(use_enable blink text-blink) \ + $(use_enable fading-colors fading) \ + $(use_enable font-styles) \ + $(use_enable gdk-pixbuf pixbuf) \ + $(use_enable iso14755) \ + $(use_enable mousewheel) \ + $(use_enable perl) \ + $(use_enable startup-notification) \ + $(use_enable unicode3) \ + $(use_enable utmp) \ + $(use_enable wtmp) \ + $(use_enable xft) +} + +src_compile() { + default + + sed -i \ + -e 's/RXVT_BASENAME = "rxvt"/RXVT_BASENAME = "urxvt"/' \ + "${S}"/doc/rxvt-tabbed || die +} + +src_install() { + default + + make_desktop_entry urxvt rxvt-unicode utilities-terminal \ + "System;TerminalEmulator" +} + +pkg_postinst() { + if use 24-bit-color; then + ewarn + ewarn "You have enabled 24-bit colour support in ${PN}, which is UNOFFICIAL and INCOMPLETE." + ewarn "You may or may not encounter visual glitches or stability issues. When in doubt," + ewarn "rebuild =${CATEGORY}/${PF} with USE=-24-bit-color (the default setting)." + ewarn + fi +} -- cgit v1.2.3-65-gdbad