From 15515ed0cd7efe586dd488a91d66ca6133de9f86 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 30 Dec 2023 17:21:11 +0100 Subject: [PATCH] package/catatonit: bump to version 0.2.0 - Drop first patch (already in version) - Update second patch - License changed to GPL-2.0+: https://github.com/openSUSE/catatonit/commit/fe191ef859c6365d44a4d7f4ac9765dee825d78c https://github.com/openSUSE/catatonit/releases/tag/v0.2.0 https://github.com/openSUSE/catatonit/compare/v0.1.7...v0.2.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...e.ac-call-AM_INIT_AUTOMAKE-only-once.patch | 41 ------------------- ...h => 0001-fix-build-with-kernel-5.9.patch} | 15 +++---- package/catatonit/catatonit.hash | 4 +- package/catatonit/catatonit.mk | 4 +- 5 files changed, 10 insertions(+), 55 deletions(-) delete mode 100644 package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch rename package/catatonit/{0002-fix-build-with-kernel-5.9.patch => 0001-fix-build-with-kernel-5.9.patch} (83%) diff --git a/.checkpackageignore b/.checkpackageignore index e76f6e829e..def465e802 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -237,7 +237,6 @@ package/cairo/0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo package/cairo/0003-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch Upstream package/cairo/0004-Fix-mask-usage-in-image-compositor.patch Upstream package/caps/0001-Fix-stdint-types-with-musl.patch Upstream -package/catatonit/0002-fix-build-with-kernel-5.9.patch Upstream package/cdrkit/0001-no-rcmd.patch Upstream package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch Upstream package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch Upstream diff --git a/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch b/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch deleted file mode 100644 index b978a827a1..0000000000 --- a/package/catatonit/0001-configure.ac-call-AM_INIT_AUTOMAKE-only-once.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 99bb9048f532257f3a2c3856cfa19fe957ab6cec Mon Sep 17 00:00:00 2001 -From: Antonio Terceiro -Date: Thu, 4 Nov 2021 07:37:13 -0300 -Subject: [PATCH] configure.ac: call AM_INIT_AUTOMAKE only once - -That second call seems to be there since the beginning, and autoconf -2.69 was fine with it. autoconf 2.71 doesn't allow it anymore: - - $ ./autogen.sh - autoreconf: export WARNINGS= - autoreconf: Entering directory '.' - autoreconf: configure.ac: not using Gettext - autoreconf: running: aclocal --force - configure.ac:34: error: AM_INIT_AUTOMAKE expanded multiple times - /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... - configure.ac:19: the top level - /usr/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from... - configure.ac:34: the top level - autom4te: error: /usr/bin/m4 failed with exit status: 1 - aclocal: error: /usr/bin/autom4te failed with exit status: 1 - autoreconf: error: aclocal failed with exit status: 1 - -Signed-off-by: Antonio Terceiro -Upstream: https://github.com/openSUSE/catatonit/commit/99bb9048f532257f3a2c3856cfa19fe957ab6cec -Signed-off-by: Christian Stewart ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 12c9186..94c5c84 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,4 +31,3 @@ AC_FUNC_FORK - - AC_CONFIG_FILES([Makefile config.h]) - AC_OUTPUT --AM_INIT_AUTOMAKE --- -2.37.2 - diff --git a/package/catatonit/0002-fix-build-with-kernel-5.9.patch b/package/catatonit/0001-fix-build-with-kernel-5.9.patch similarity index 83% rename from package/catatonit/0002-fix-build-with-kernel-5.9.patch rename to package/catatonit/0001-fix-build-with-kernel-5.9.patch index a4c66389db..37def8e546 100644 --- a/package/catatonit/0002-fix-build-with-kernel-5.9.patch +++ b/package/catatonit/0001-fix-build-with-kernel-5.9.patch @@ -1,4 +1,4 @@ -From 1fefcbffe4ade02d625bf058a7c07aeaf9fa7a2f Mon Sep 17 00:00:00 2001 +From 65e1b96bd40cb14b3729ac56bb9f1fcb77254403 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 1 Nov 2022 14:16:01 +0100 Subject: [PATCH] fix build with kernel < 5.9 @@ -15,17 +15,17 @@ Fixes: - http://autobuild.buildroot.org/results/ed9a847905083175c7fcb2f2df28f9ac5b9c3313 Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/openSUSE/catatonit/pull/24] +Upstream: https://github.com/openSUSE/catatonit/commit/663ad1670689143f65af3a288f90cecb7feed54f --- catatonit.c | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/catatonit.c b/catatonit.c -index a38263a..474c525 100644 +index a33f4cd..b10d9b0 100644 --- a/catatonit.c +++ b/catatonit.c -@@ -35,7 +35,7 @@ +@@ -36,7 +36,7 @@ #include #include @@ -35,10 +35,10 @@ index a38263a..474c525 100644 #else # include diff --git a/configure.ac b/configure.ac -index 94c5c84..a746ea1 100644 +index 69e89f0..b37f146 100644 --- a/configure.ac +++ b/configure.ac -@@ -22,7 +22,7 @@ LT_PREREQ([2.4.2]) +@@ -24,7 +24,7 @@ LT_PREREQ([2.4.2]) LT_INIT([disable-shared]) AC_CHECK_HEADERS([errno.h fcntl.h signal.h stdarg.h stdio.h stdlib.h unistd.h]) @@ -47,6 +47,3 @@ index 94c5c84..a746ea1 100644 AC_CHECK_FUNCS([close_range]) --- -2.35.1 - diff --git a/package/catatonit/catatonit.hash b/package/catatonit/catatonit.hash index 9b7420cdb7..9940309c76 100644 --- a/package/catatonit/catatonit.hash +++ b/package/catatonit/catatonit.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e22bc72ebc23762dad8f5d2ed9d5ab1aaad567bdd54422f1d1da775277a93296 catatonit-0.1.7.tar.gz -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING +sha256 d0cf1feffdc89c9fb52af20fc10127887a408bbd99e0424558d182b310a3dc92 catatonit-0.2.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/catatonit/catatonit.mk b/package/catatonit/catatonit.mk index 3dd58eff1d..a308ea6471 100644 --- a/package/catatonit/catatonit.mk +++ b/package/catatonit/catatonit.mk @@ -4,9 +4,9 @@ # ################################################################################ -CATATONIT_VERSION = 0.1.7 +CATATONIT_VERSION = 0.2.0 CATATONIT_SITE = $(call github,openSUSE,catatonit,v$(CATATONIT_VERSION)) -CATATONIT_LICENSE = GPL-3.0+ +CATATONIT_LICENSE = GPL-2.0+ CATATONIT_LICENSE_FILES = COPYING CATATONIT_AUTORECONF = YES