diff --git a/.checkpackageignore b/.checkpackageignore index 0f6a5b0b19..4dde533e3a 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -460,7 +460,6 @@ package/grpc/0003-disable-unconditionally-downloading-api-repos.patch lib_patch. package/gstreamer1/gstd/0001-Don-t-require-gstd-check-user-xenv.sh-for-systemd-se.patch lib_patch.Upstream package/guile/0001-calculate-csqrt_manually.patch lib_patch.Upstream package/guile/0002-Makefile.am-fix-build-without-makeinfo.patch lib_patch.Upstream -package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch lib_patch.Upstream package/gutenprint/0001-use-pregen-xmli18n-header.patch lib_patch.Upstream package/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch lib_patch.Upstream package/harfbuzz/0001-meson.build-check-for-pthread.h.patch lib_patch.Upstream diff --git a/package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch b/package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch deleted file mode 100644 index 011b929a48..0000000000 --- a/package/gumbo-parser/0001-configure.ac-fix-build-without-C.patch +++ /dev/null @@ -1,72 +0,0 @@ -From e6d9556775b0b8f597ce48dc18c908b3cc09e2a3 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 21 Jul 2021 23:47:26 +0200 -Subject: [PATCH] configure.ac: fix build without C++ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fix the following build failure raised on toolchains without C++: - - CXX examples/find_links.o -/bin/bash: line 1: no: command not found - CXX examples/clean_text.o -/bin/bash: line 1: no: command not found -make[2]: *** [Makefile:1071: examples/find_links.o] Error 127 - CXX examples/positions_of_class.o -make[2]: *** Waiting for unfinished jobs.... - CC examples/get_title.o -/bin/bash: line 1: no: command not found -make[2]: *** [Makefile:1071: examples/clean_text.o] Error 127 -make[2]: *** [Makefile:1071: examples/positions_of_class.o] Error 127 - CXX examples/serialize.o -/bin/bash: line 1: no: command not found - CXX examples/prettyprint.o -make[2]: *** [Makefile:1071: examples/serialize.o] Error 127 -/bin/bash: line 1: no: command not found -make[2]: *** [Makefile:1071: examples/prettyprint.o] Error 127 - -Fixes: - - http://autobuild.buildroot.org/results/a32b5d3b959433fd5c3543661c37f80d27fbd010 - -Signed-off-by: Fabrice Fontaine -[Raphaël: refresh patch on top of 0.13.1, update description] -Signed-off-by: Raphaël Mélotte -[Upstream status: https://codeberg.org/gumbo-parser/gumbo-parser/pulls/28] ---- - Makefile.am | 2 ++ - configure.ac | 4 ++++ - 2 files changed, 6 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index e3f9ed7..8a93854 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -96,7 +96,9 @@ gumbo_test_DEPENDENCIES += gtest/lib/libgtest.a gtest/lib/libgtest_main.a - gumbo_test_LDADD += gtest/lib/libgtest.a gtest/lib/libgtest_main.a - endif - -+if HAVE_EXAMPLES - noinst_PROGRAMS = clean_text find_links get_title positions_of_class benchmark serialize prettyprint -+endif - LDADD = libgumbo.la - AM_CPPFLAGS = -I"$(srcdir)/src" - -diff --git a/configure.ac b/configure.ac -index 5636a20..6d21b95 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -28,6 +28,10 @@ AC_CHECK_LIB([gtest_main], - AM_CONDITIONAL(HAVE_SHARED_LIBGTEST, [true]), - AM_CONDITIONAL(HAVE_SHARED_LIBGTEST, [false])) - -+AC_ARG_ENABLE([examples], -+ AS_HELP_STRING([--disable-examples], [Disable examples])) -+AM_CONDITIONAL([HAVE_EXAMPLES], [test "x$enable_examples" != "xno"]) -+ - # Init Automake & libtool - AM_INIT_AUTOMAKE([foreign subdir-objects]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) --- -2.49.0 - diff --git a/package/gumbo-parser/gumbo-parser.hash b/package/gumbo-parser/gumbo-parser.hash index 88c8fffa21..b8809d4db9 100644 --- a/package/gumbo-parser/gumbo-parser.hash +++ b/package/gumbo-parser/gumbo-parser.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 1a054d1e53d556641a6666537247411a77b0c18ef6ad5df23e30d2131676ef81 0.13.1.tar.gz +sha256 dbdc159dc8e5c6f3f254e50bce689dd9e439064ff06c165d5653410a5714ab66 0.13.2.tar.gz # Hash for license files: sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 doc/COPYING diff --git a/package/gumbo-parser/gumbo-parser.mk b/package/gumbo-parser/gumbo-parser.mk index dacd7c981e..6abd24415a 100644 --- a/package/gumbo-parser/gumbo-parser.mk +++ b/package/gumbo-parser/gumbo-parser.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUMBO_PARSER_VERSION = 0.13.1 +GUMBO_PARSER_VERSION = 0.13.2 GUMBO_PARSER_SITE = https://codeberg.org/gumbo-parser/gumbo-parser/archive GUMBO_PARSER_SOURCE = $(GUMBO_PARSER_VERSION).tar.gz GUMBO_PARSER_LICENSE = Apache-2.0