From b6d3c50bc0bcfa71a73d47faa17143528309245c Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 16 May 2021 16:10:42 +0200 Subject: [PATCH] rxvt-unicode: update to 9.26. --- srcpkgs/rxvt-unicode/patches/destruct.patch | 17 ------- .../rxvt-unicode/patches/manual-perl.patch | 44 ------------------- srcpkgs/rxvt-unicode/template | 18 +++----- 3 files changed, 6 insertions(+), 73 deletions(-) delete mode 100644 srcpkgs/rxvt-unicode/patches/destruct.patch delete mode 100644 srcpkgs/rxvt-unicode/patches/manual-perl.patch diff --git a/srcpkgs/rxvt-unicode/patches/destruct.patch b/srcpkgs/rxvt-unicode/patches/destruct.patch deleted file mode 100644 index e7e528c2e05..00000000000 --- a/srcpkgs/rxvt-unicode/patches/destruct.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://lists.schmorp.de/pipermail/rxvt-unicode/2020q2/002583.html - ---- src/rxvtperl.xs -+++ src/rxvtperl.xs -@@ -374,12 +374,6 @@ static PerlInterpreter *perl; - - rxvt_perl_interp::~rxvt_perl_interp () - { -- if (perl) -- { -- perl_destruct (perl); -- perl_free (perl); -- PERL_SYS_TERM (); -- } - } - - void diff --git a/srcpkgs/rxvt-unicode/patches/manual-perl.patch b/srcpkgs/rxvt-unicode/patches/manual-perl.patch deleted file mode 100644 index 903116072d2..00000000000 --- a/srcpkgs/rxvt-unicode/patches/manual-perl.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- configure.ac.orig 2014-07-30 00:57:35.525532956 +0200 -+++ configure.ac 2014-07-30 01:24:04.531476426 +0200 -@@ -717,39 +717,8 @@ - - IF_PERL=\# - if test x$support_perl = xyes; then -- AC_PATH_PROG(PERL, perl5, perl) -- -- AC_MSG_CHECKING(for $PERL suitability) -- if $PERL -MExtUtils::Embed -e "use v5.8" >/dev/null 2>/dev/null; then -- -- save_CXXFLAGS="$CXXFLAGS" -- save_LIBS="$LIBS" -- CXXFLAGS="$CXXFLAGS `$PERL -MExtUtils::Embed -e ccopts`" -- LIBS="$LIBS `$PERL -MExtUtils::Embed -e ldopts`" -- AC_LINK_IFELSE([AC_LANG_PROGRAM([[ --#include --#include --#include --]], [[ -- PerlInterpreter *perl = perl_alloc (); --]])],[rxvt_perl_link=yes],[rxvt_perl_link=no]) -- CXXFLAGS="$save_CXXFLAGS" -- LIBS="$save_LIBS" -- -- if test x$rxvt_perl_link = xyes; then -- AC_MSG_RESULT(ok) -- AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter) -- IF_PERL= -- PERL_O=rxvtperl.o -- PERLFLAGS="`$PERL -MExtUtils::Embed -e ccopts`" -- PERLLIB="`$PERL -MExtUtils::Embed -e ldopts`" -- PERLPRIVLIBEXP="`$PERL -MConfig -e 'print $Config{privlibexp}'`" -- else -- AC_MSG_ERROR([no, unable to link]) -- fi -- else -- AC_MSG_ERROR([no working perl found, or perl not version >= 5.8]) -- fi -+ AC_DEFINE(ENABLE_PERL, 1, Define if you can embed a perl interpreter) -+ IF_PERL= - fi - AC_SUBST(PERLLIB) - AC_SUBST(PERLFLAGS) diff --git a/srcpkgs/rxvt-unicode/template b/srcpkgs/rxvt-unicode/template index 483d4765916..9db4173cc9b 100644 --- a/srcpkgs/rxvt-unicode/template +++ b/srcpkgs/rxvt-unicode/template @@ -1,7 +1,7 @@ # Template file for 'rxvt-unicode' pkgname=rxvt-unicode -version=9.22 -revision=15 +version=9.26 +revision=11 build_style=gnu-configure configure_args=" --with-terminfo=/usr/share/terminfo --enable-256-color @@ -13,8 +13,9 @@ configure_args=" $(vopt_if perl '--enable-perl' '--disable-perl') $(vopt_if startup_notification '--enable-startup-notification' '--disable-startup-notification') $(vopt_if unicode3 '--enable-unicode3' '--disable-unicode3')" -hostmakedepends="pkg-config $(vopt_if perl 'perl autoconf')" -makedepends="xorgproto fontconfig-devel libXrender-devel libXft-devel libSM-devel +hostmakedepends="pkg-config $(vopt_if perl 'perl')" +makedepends="xorgproto fontconfig-devel + libXrender-devel libXft-devel libSM-devel libXt-devel $(vopt_if gdk_pixbuf gdk-pixbuf-devel) $(vopt_if perl perl) $(vopt_if startup_notification startup-notification-devel)" @@ -24,7 +25,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-or-later" homepage="http://software.schmorp.de/pkg/rxvt-unicode.html" distfiles="http://dist.schmorp.de/${pkgname}/${pkgname}-${version}.tar.bz2" -checksum=e94628e9bcfa0adb1115d83649f898d6edb4baced44f5d5b769c2eeb8b95addd +checksum=643116b9a25d29ad29f4890131796d42e6d2d21312282a613ef66c80c5b8c98b # Package build options build_options="gdk_pixbuf perl startup_notification unicode3" @@ -43,13 +44,6 @@ _cross_perl() { fi } -pre_configure() { - if [ "$build_option_perl" ]; then - rm configure - ./autogen.sh - fi -} - do_configure() { if [ "$build_option_perl" ]; then ./configure $configure_args \