diff --git a/main/recode/.checksums b/main/recode/.checksums index 46d18a1ec..dfec52837 100644 --- a/main/recode/.checksums +++ b/main/recode/.checksums @@ -1,2 +1 @@ -c6acfb0f7967a6a03ac52a5438d4b7e6 recode-3.7.13-no-help2man.patch -fe0293805bc8910511fc6df25a3294b5 recode-3.7.13.tar.gz +d88b41fd27549123a0822e5a3fae98a8 recode-3.7.14.tar.gz diff --git a/main/recode/.pkgfiles b/main/recode/.pkgfiles index 7732394c6..b7bbe0042 100644 --- a/main/recode/.pkgfiles +++ b/main/recode/.pkgfiles @@ -1,4 +1,4 @@ -recode-3.7.13-1 +recode-3.7.14-1 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/recode @@ -7,9 +7,9 @@ drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/recodext.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/librecode.a -lrwxrwxrwx root/root usr/lib/librecode.so -> librecode.so.3.7.13 -lrwxrwxrwx root/root usr/lib/librecode.so.3 -> librecode.so.3.7.13 --rwxr-xr-x root/root usr/lib/librecode.so.3.7.13 +lrwxrwxrwx root/root usr/lib/librecode.so -> librecode.so.3.7.14 +lrwxrwxrwx root/root usr/lib/librecode.so.3 -> librecode.so.3.7.14 +-rwxr-xr-x root/root usr/lib/librecode.so.3.7.14 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/info/ -rw-r--r-- root/root usr/share/info/recode.info.gz diff --git a/main/recode/recode-3.7.13-no-help2man.patch b/main/recode/recode-3.7.13-no-help2man.patch deleted file mode 100644 index bc493d429..000000000 --- a/main/recode/recode-3.7.13-no-help2man.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://bugs.gentoo.org/890256 -https://github.com/rrthomas/recode/commit/dcdd5d26c0c2c49f8113b63186449d6a1e3a509e - -From dcdd5d26c0c2c49f8113b63186449d6a1e3a509e Mon Sep 17 00:00:00 2001 -From: Reuben Thomas -Date: Fri, 6 Jan 2023 20:11:03 +0100 -Subject: [PATCH] src/Makefile.am: allow build without help2man - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = gnits - bin_PROGRAMS = recode - lib_LTLIBRARIES = librecode.la - noinst_LTLIBRARIES = libmerged.la --man_MANS = recode.1 -+dist_man_MANS = recode.1 - include_HEADERS = recode.h recodext.h - - H_STEPS = common.h decsteps.h inisteps.h tersteps.h \ -@@ -100,12 +100,12 @@ merged.c: mergelex.py $(L_STEPS) - # Depend on recode$(EXEEXT) rather than explicitly make-ing it, as otherwise - # we break parallel builds, as libmerged.la can be built twice in parallel, - # which can fail. --recode.1: main.c $(top_srcdir)/configure.ac recode$(EXEEXT) -+recode.1: main.c $(top_srcdir)/configure.ac - ## Exit gracefully if recode.1 is not writeable, such as during distcheck! - $(AM_V_GEN)if ( touch $@.w && rm -f $@.w; ) >/dev/null 2>&1; then \ - $(top_srcdir)/build-aux/missing --run $(HELP2MAN) --locale=en_US.UTF-8 \ - --name="converts files between character sets" \ -- --output=$@ ./recode; \ -+ --output=$@ ./recode$(EXEEXT); \ - fi - - main.o: main.c ../config.status -@@ -169,5 +169,3 @@ strip-pool.c strip-data.c: stamp-strip - stamp-strip: ../tables.py $(MNEMONICS_DS) $(CHARSETS_DEF) - $(TABLES_PY) -C $(srcdir) -p $(MNEMONICS_DS) $(CHARSETS_DEF) - @echo timestamp > $(srcdir)/$@ -- --DISTCLEANFILES = recode.1 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,5 +1,5 @@ - # Makefile for Recode regression tests. --# Copyright © 1996-2022 Free Software Foundation, Inc. -+# Copyright © 1996-2023 Free Software Foundation, Inc. - # François Pinard , 1988. - - # This program is free software; you can redistribute it and/or modify - diff --git a/main/recode/spkgbuild b/main/recode/spkgbuild index 1290c8c4c..ccb6c8608 100644 --- a/main/recode/spkgbuild +++ b/main/recode/spkgbuild @@ -2,16 +2,13 @@ # depends : python3 name=recode -version=3.7.13 +version=3.7.14 release=1 -source="https://github.com/rrthomas/recode/releases/download/v$version/$name-$version.tar.gz - recode-3.7.13-no-help2man.patch" +source="https://github.com/rrthomas/recode/releases/download/v$version/$name-$version.tar.gz" build() { cd $name-$version - patch -Np1 -i $SRC/recode-3.7.13-no-help2man.patch - ./configure \ --prefix=/usr \ --mandir=/usr/share/man \