From 507409cedacdb394a2a99cb396d7d60bbb27af97 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 14 Jun 2023 22:27:55 +0200 Subject: [PATCH] readline: bump version --- .../readline/patches/readline-8.1.patchset | 35 ----------- .../readline/patches/readline-8.2.patchset | 61 +++++++++++++++++++ ...8.1.002.recipe => readline-8.2.001.recipe} | 27 ++++---- 3 files changed, 74 insertions(+), 49 deletions(-) delete mode 100644 sys-libs/readline/patches/readline-8.1.patchset create mode 100644 sys-libs/readline/patches/readline-8.2.patchset rename sys-libs/readline/{readline-8.1.002.recipe => readline-8.2.001.recipe} (75%) diff --git a/sys-libs/readline/patches/readline-8.1.patchset b/sys-libs/readline/patches/readline-8.1.patchset deleted file mode 100644 index 016a441a9..000000000 --- a/sys-libs/readline/patches/readline-8.1.patchset +++ /dev/null @@ -1,35 +0,0 @@ -From 9332d4a9ebdc68e524de21d9696b2f01a351142f Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Wed, 28 Jun 2017 23:33:35 +0200 -Subject: applying patch readline-7.0.patch - - -diff --git a/support/shlib-install b/support/shlib-install -index 661355d..cfd9cf1 100755 ---- a/support/shlib-install -+++ b/support/shlib-install -@@ -118,7 +118,7 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2' - # Create symlinks to the installed library. This section is incomplete. - # - case "$host_os-$host_vendor" in --*linux*|freebsd*|dragonfly*) -+*linux*|freebsd*|dragonfly*|haiku*) - # libname.so.M -> libname.so.M.N - ${echo} ${RM} ${INSTALLDIR}/$LINK2 - if [ -z "$uninstall" ]; then -diff --git a/support/shobj-conf b/support/shobj-conf -index 5a3f977..c34b69b 100644 ---- a/support/shobj-conf -+++ b/support/shobj-conf -@@ -123,7 +123,7 @@ sunos5*|solaris2*) - ;; - - # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd. --linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*) -+linux*-*|gnu*-*|k*bsd*-gnu-*|freebsd*|dragonfly*|haiku*) - SHOBJ_CFLAGS=-fPIC - SHOBJ_LD='${CC}' - SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' --- -2.28.0 - diff --git a/sys-libs/readline/patches/readline-8.2.patchset b/sys-libs/readline/patches/readline-8.2.patchset new file mode 100644 index 000000000..fe1250be4 --- /dev/null +++ b/sys-libs/readline/patches/readline-8.2.patchset @@ -0,0 +1,61 @@ +From d059a7f206b693720b2eeb77d9f231b836b406ef Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Wed, 28 Jun 2017 23:33:35 +0200 +Subject: applying patch readline-7.0.patch + + +diff --git a/support/shlib-install b/support/shlib-install +index 661355d..cfd9cf1 100644 +--- a/support/shlib-install ++++ b/support/shlib-install +@@ -118,7 +118,7 @@ INSTALL_LINK2='${echo} cd $INSTALLDIR && ${echo} ${LN} $LIBNAME $LINK2' + # Create symlinks to the installed library. This section is incomplete. + # + case "$host_os-$host_vendor" in +-*linux*|freebsd*|dragonfly*) ++*linux*|freebsd*|dragonfly*|haiku*) + # libname.so.M -> libname.so.M.N + ${echo} ${RM} ${INSTALLDIR}/$LINK2 + if [ -z "$uninstall" ]; then +diff --git a/support/shobj-conf b/support/shobj-conf +index cd7634d..a6387bd 100644 +--- a/support/shobj-conf ++++ b/support/shobj-conf +@@ -123,7 +123,7 @@ sunos5*|solaris2*) + ;; + + # All versions of Linux (including Gentoo/FreeBSD) or the semi-mythical GNU Hurd. +-linux*-*|gnu*-*|k*bsd*-gnu-*|midnightbsd*|freebsd*|dragonfly*) ++linux*-*|gnu*-*|k*bsd*-gnu-*|midnightbsd*|freebsd*|dragonfly*|haiku*) + SHOBJ_CFLAGS=-fPIC + SHOBJ_LD='${CC}' + SHOBJ_LDFLAGS='-shared -Wl,-soname,$@' +-- +2.37.3 + + +From 192ac070aea2927bfb8fde35872120bc777469de Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Wed, 14 Jun 2023 21:44:18 +0200 +Subject: [PATCH] gcc2 unknown flag + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 15501fa..5117c32 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -118,7 +118,7 @@ AC_USE_SYSTEM_EXTENSIONS + # If we're using gcc and the user hasn't specified CFLAGS, add -O2 to CFLAGS + if test -n "$want_auto_cflags" ; then + AUTO_CFLAGS="-g ${GCC:+-O2}" +- STYLE_CFLAGS="${GCC:+-Wno-parentheses} ${GCC:+-Wno-format-security} ${GCC:+-Wno-tautological-constant-out-of-range-compare}" ++ STYLE_CFLAGS="${GCC:+-Wno-parentheses} ${GCC:+-Wno-format-security}" + fi + + AC_PROG_GCC_TRADITIONAL +-- +2.37.3 + diff --git a/sys-libs/readline/readline-8.1.002.recipe b/sys-libs/readline/readline-8.2.001.recipe similarity index 75% rename from sys-libs/readline/readline-8.1.002.recipe rename to sys-libs/readline/readline-8.2.001.recipe index b41ae3732..95b697223 100644 --- a/sys-libs/readline/readline-8.1.002.recipe +++ b/sys-libs/readline/readline-8.2.001.recipe @@ -13,23 +13,22 @@ HOMEPAGE="http://tiswww.case.edu/php/chet/readline/rltop.html" COPYRIGHT="1989-2019 Free Software Foundation, Inc." LICENSE="GNU GPL v3" REVISION="1" -SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz" -SOURCE_DIR="readline-8.1" -for i in {001..002}; do - eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/readline/readline-8.1-patches/readline81-$i#noarchive\"" +SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-8.2.tar.gz" +SOURCE_DIR="readline-8.2" +for i in 001; do + eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/readline/readline-8.2-patches/readline82-$i#noarchive\"" done -CHECKSUM_SHA256="f8ceb4ee131e3232226a17f51b164afc46cd0b9e6cef344be87c65962cb82b02" -CHECKSUM_SHA256_001="682a465a68633650565c43d59f0b8cdf149c13a874682d3c20cb4af6709b9144" -CHECKSUM_SHA256_002="e55be055a68cb0719b0ccb5edc9a74edcc1d1f689e8a501525b3bc5ebad325dc" -PATCHES="readline-8.1.patchset" +CHECKSUM_SHA256="3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35" +CHECKSUM_SHA256_001="bbf97f1ec40a929edab5aa81998c1e2ef435436c597754916e6a5868f273aff7" +PATCHES="readline-8.2.patchset" ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" readline$secondaryArchSuffix = $portVersion - lib:libhistory$secondaryArchSuffix = 8.1 compat >= 8 - lib:libreadline$secondaryArchSuffix = 8.1 compat >= 8 + lib:libhistory$secondaryArchSuffix = 8.2 compat >= 8 + lib:libreadline$secondaryArchSuffix = 8.2 compat >= 8 " REQUIRES=" haiku$secondaryArchSuffix @@ -60,14 +59,14 @@ BUILD_PREREQUIRES=" " defineDebugInfoPackage readline$secondaryArchSuffix \ - $libDir/libhistory.so.8.1 \ - $libDir/libreadline.so.8.1 + $libDir/libhistory.so.8.2 \ + $libDir/libreadline.so.8.2 PATCH() { - for i in {001..002}; do + for i in 001; do echo "Applying patch $i..." - sed -e "s/\.\.\/readline-8.1\///" ../../sources-$i/readline81-$i | patch -p0 + sed -e "s/\.\.\/readline-8.2\///" ../../sources-$i/readline82-$i | patch -p0 done }