raptor2: Do not use curl-config to detect curl
PATCH 1/4 raptor2: Do not use curl-config to detect curl
it fails in cross build environment, use pkg-config instead
Signed-off-by Khem Raj <[email protected]>
--- .../raptor-2.0.16-dont_use_curl-config.patch | 73 +++++++++++++++++++ .../recipes-support/raptor2/raptor2_2.0.16.bb | 6 +- 2 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch
meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch new file +73 -0
@@ -0,0 +1,73 @@ +Do not use curl-config + +Sourced from +https://bugs.gentoo.org/552474 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- a/configure.ac ++++ b/configure.ac +@@ -596,49 +596,12 @@ else + PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [have_libxslt=1], [have_libxslt=0]) + fi + +-dnl curl +-AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="") +- +-if test "X$curl_config" != "Xno" ; then +- if test "X$curl_config" != "X" ; then +- AC_MSG_CHECKING(for $curl_config) +- +- if test -f $curl_config ; then +- CURL_CONFIG=$curl_config +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no - searching PATH) +- fi +- fi +- if test "X$CURL_CONFIG" = "X" ; then +- AC_CHECK_PROGS(CURL_CONFIG, curl-config) +- fi +-fi +- + libcurl_source=no +-if test "X$CURL_CONFIG" != "X"; then +- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags` +- LIBCURL_LIBS=`$CURL_CONFIG --libs` +- +- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS" +- LIBS="$LIBS $LIBCURL_LIBS" +- AC_CHECK_HEADER(curl/curl.h) +- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no) +- +- AC_MSG_CHECKING(for libcurl via curl-config) +- if test $have_curl_easy_init = yes; then +- libcurl_source="curl-config" +- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'` +- fi +- CPPFLAGS="$oCPPFLAGS" +- LIBS="$oLIBS" +-else +- PKG_CHECK_MODULES([LIBCURL],[libcurl],[ +- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` +- libcurl_source="pkg-config" +- ], [:]) +- AC_MSG_CHECKING(for libcurl via pkg-config) +-fi ++PKG_CHECK_MODULES([LIBCURL],[libcurl],[ ++ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` ++ libcurl_source="pkg-config" ++], [:]) ++AC_MSG_CHECKING(for libcurl via pkg-config) + + if test "$libcurl_source" = "no"; then + AC_MSG_RESULT(no - not found) +@@ -1033,7 +996,7 @@ need_libcurl=0 + need_libxml_www=0 + need_libfetch=0 + +-if test "X$CURL_CONFIG" != X; then ++if test "$libcurl_source" != "no"; then + CPPFLAGS="$CPPFLAGS $LIBCURL_CFLAGS" + LIBS="$LIBS $LIBCURL_LIBS" + AC_CHECK_HEADER(curl/curl.h)
meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb +3 -3
@@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = " \ file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -DEPENDS = "libxml2 libxslt curl yajl" +DEPENDS = "bison-native flex-native libxml2 libxslt curl yajl" SRC_URI = " \ http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ + file://raptor-2.0.16-dont_use_curl-config.patch \ " SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" -inherit autotools pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc perlnative EXTRA_OECONF = " \ --without-xml2-config \ - --without-curl-config \ --without-xslt-config \ "
PATCH 2/4 libgsf: Fix build with libxml2 2.13+
Signed-off-by Khem Raj <[email protected]>
--- ...lation-attempt-fixes-for-libxml-2.13.patch | 105 ++++++++++++++++++ .../recipes-gnome/libgsf/libgsf_1.14.52.bb | 3 +- 2 files changed, 107 insertions(+), 1 deletion(-) create mode 100644 meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch
meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch new file +105 -0
@@ -0,0 +1,105 @@ +From 4a84e9857d83f684bf53d616942a393ce558a328 Mon Sep 17 00:00:00 2001 +From: Morten Welinder <[email protected]> +Date: Wed, 3 Jul 2024 19:18:15 -0400 +Subject: [PATCH] Compilation: attempt fixes for libxml 2.13 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgsf/-/commit/5d4bb55095d3d6ef793c1908a88504183e28644c] +Signed-off-by: Khem Raj <[email protected]> +--- + configure.ac | 1 + + gsf/gsf-input-http.c | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/configure.ac b/configure.ac +index fceb776..7c2f946 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,6 +238,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gstdio.h>]], [[(void)g_chown("/ + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) + AC_CHECK_FUNCS(g_date_time_new_from_iso8601 g_date_time_format_iso8601) ++AC_CHECK_FUNCS(xmlNanoHTTPOpen xmlNanoHTTPClose) + CFLAGS=$SAVE_CFLAGS + LIBS=$SAVE_LIBS + +diff --git a/gsf/gsf-input-http.c b/gsf/gsf-input-http.c +index bdde3c8..03f4045 100644 +--- a/gsf/gsf-input-http.c ++++ b/gsf/gsf-input-http.c +@@ -23,7 +23,10 @@ + #include <gsf/gsf-input-http.h> + #include <gsf/gsf.h> + ++#ifdef HAVE_XMLNANOHTTPOPEN ++// It's going away, so make it conditional + #include <libxml/nanohttp.h> ++#endif + + struct _GsfInputHTTP { + GsfInput input; +@@ -74,7 +77,9 @@ gsf_input_http_finalize (GObject *obj_input) + input->content_type = NULL; + + if (input->ctx) { ++#ifdef HAVE_XMLNANOHTTPCLOSE + xmlNanoHTTPClose ((gpointer) input->ctx); ++#endif + input->ctx = NULL; + } + +@@ -215,6 +220,7 @@ gsf_input_http_get_content_type (GsfInputHTTP *input) + return content_type; + } + ++#ifdef HAVE_XMLNANOHTTPOPEN + static GsfInput * + make_local_copy (gpointer *ctx) + { +@@ -254,6 +260,7 @@ make_local_copy (gpointer *ctx) + + return copy; + } ++#endif + + /** + * gsf_input_http_new: +@@ -265,6 +272,7 @@ make_local_copy (gpointer *ctx) + GsfInput * + gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED) + { ++#ifdef HAVE_XMLNANOHTTPOPEN + GObject *obj; + GsfInput *input; + gpointer ctx; +@@ -293,6 +301,10 @@ gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED) + GSF_INPUT_HTTP (obj)->ctx = ctx; + + return GSF_INPUT (obj); ++#else ++ g_return_val_if_fail(url != NULL, NULL); ++ return NULL; ++#endif + } + + static GsfInput * +@@ -304,6 +316,7 @@ gsf_input_http_dup (GsfInput *src, GError **err) + static guint8 const * + gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer) + { ++#ifdef HAVE_XMLNANOHTTPOPEN + int nread; + size_t total_read; + gpointer ctx = GSF_INPUT_HTTP (input)->ctx; +@@ -324,6 +337,12 @@ gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer) + return NULL; + } + return buffer; ++#else ++ (void)input; ++ (void)num_bytes; ++ (void)buffer; ++ return NULL; ++#endif + } + + static gboolean
meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb +2 -1
@@ -10,7 +10,8 @@ GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gobject-introspection gettext gtk-doc SRC_URI[archive.sha256sum] = "9181c914b9fac0e05d6bcaa34c7b552fe5fc0961d3c9f8c01ccc381fb084bcf0" -SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" +SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch \ + file://0001-Compilation-attempt-fixes-for-libxml-2.13.patch" PACKAGECONFIG ??= "" PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf"
PATCH 3/4 libspatialite: Upgrade to 5.1
In reply to Khem Raj- Drop the libtool patch its already fixed in this version
- Add a patch to support libxml2 2.13+
Signed-off-by Khem Raj <[email protected]>
---
...oHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch | 29 +++++++++++++++++++
.../libspatialite/libspatialite_macros.patch | 14 ---------
.../libspatialite_pkgconfig.patch | 12 ++++----
...ialite_5.0.1.bb => libspatialite_5.1.0.bb} | 5 ++--
4 files changed, 37 insertions(+), 23 deletions(-)
create mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch
delete mode 100644 meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch
rename meta-oe/recipes-navigation/libspatialite/{libspatialite_5.0.1.bb => libspatialite_5.1.0.bb} (82%)meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch new file +29 -0
@@ -0,0 +1,29 @@ +From 406e841b3e011e1090f23dba12b12cdd9ec4707e Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sat, 24 Aug 2024 15:19:35 -0700 +Subject: [PATCH] wfs: Cover xmlNanoHTTPCleanup with LIBXML_HTTP_ENABLED + +libxml2 has deprecated internal http support [1] + +[1] https://www.gaia-gis.it/fossil/libspatialite/tktview?name=7c452740fe + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> +--- + src/wfs/wfs_in.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/wfs/wfs_in.c b/src/wfs/wfs_in.c +index 1cfe39d..41ad2ab 100644 +--- a/src/wfs/wfs_in.c ++++ b/src/wfs/wfs_in.c +@@ -4638,7 +4638,9 @@ SPATIALITE_DECLARE void + reset_wfs_http_connection (void) + { + /* Resets the libxml2 "nano HTTP": useful when changing the HTTP_PROXY settings */ ++#ifdef LIBXML_HTTP_ENABLED + xmlNanoHTTPCleanup (); ++#endif + } + + #else /* LIBXML2 isn't enabled */
meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch deleted +0 -14
@@ -1,14 +0,0 @@ -Upstream-Status: Pending - -diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac ---- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:18.748858216 +0100 -+++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:18.751858215 +0100 -@@ -96,7 +96,7 @@ AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_LIBTOOL_WIN32_DLL --AC_PROG_LIBTOOL -+LT_INIT - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST
meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch +6 -6
@@ -1,13 +1,13 @@ Upstream-Status: Pending -diff -rupN libspatialite-5.0.1/spatialite.pc.in libspatialite-5.0.1-new/spatialite.pc.in ---- libspatialite-5.0.1/spatialite.pc.in 2021-02-07 16:53:46.000000000 +0100 -+++ libspatialite-5.0.1-new/spatialite.pc.in 2021-02-10 09:54:09.647552994 +0100 -@@ -8,5 +8,6 @@ includedir=@includedir@ +--- a/spatialite.pc.in ++++ b/spatialite.pc.in +@@ -8,5 +8,7 @@ includedir=@includedir@ Name: spatialite Description: Spatial SQL database engine based on SQLite Version: @VERSION@ --Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ -lm -+Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ -lm +-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm ++Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm +Libs: -L${libdir} -lspatialite ++ Cflags: -I${includedir}
meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb renamed from meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb +2 -3
@@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ file://libspatialite_geos.patch \ - file://libspatialite_macros.patch \ file://libspatialite_pkgconfig.patch \ + file://0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch \ " - -SRC_URI[sha256sum] = "eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98" +SRC_URI[sha256sum] = "43be2dd349daffe016dd1400c5d11285828c22fea35ca5109f21f3ed50605080" inherit autotools-brokensep pkgconfig
PATCH 4/4 libblockdev: Fix build with latest e2fsprogs
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- ...0001-libext2fs-unused-parameters-fix.patch | 92 +++++++++++++++++++ .../libblockdev/libblockdev_3.1.1.bb | 1 + 2 files changed, 93 insertions(+) create mode 100644 meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch
meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch new file +92 -0
@@ -0,0 +1,92 @@ +From 3aad8d471201da4125bd03d7a6921707461fe182 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <[email protected]> +Date: Fri, 7 Jun 2024 10:06:22 +0200 +Subject: [PATCH 1/3] fs: Ignore unused-parameter warning in the FS plugin + +There are some unused parameters in the libext2fs header which +together with Wall and Werror means the plugin compilation fails. +As a workaround we'll disable the unused-parameter warning for +now. + +Fixes: #1026 + +Taken from Fedora + +Upstream-Status: Pending +Signed-off-by: Khem Raj <[email protected]> + +--- + src/plugins/fs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am +index 7d4849c0..00474d5a 100644 +--- a/src/plugins/fs/Makefile.am ++++ b/src/plugins/fs/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libbd_fs.la + +-libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror ++libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter + libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) + libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' + libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ +-- +2.45.2 + + +From da5c14f3e2f83c8c40203897154ee2b788782792 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <[email protected]> +Date: Fri, 7 Jun 2024 15:21:09 +0200 +Subject: [PATCH 2/3] fs: Ignore shift-count-overflow warning in FS plugin + +The warning happens in the libext2fs header. +--- + src/plugins/fs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am +index 00474d5a..42e1c777 100644 +--- a/src/plugins/fs/Makefile.am ++++ b/src/plugins/fs/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libbd_fs.la + +-libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter ++libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow + libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) + libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' + libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ +-- +2.45.2 + + +From 90ceb4b52fbda34673fe5303da84b9a902187503 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <[email protected]> +Date: Wed, 12 Jun 2024 15:34:02 +0200 +Subject: [PATCH 3/3] fs: Fix ignoring errors from libext2fs + +Follow-up for #1028, we still want to show the warning and not +completely supress it. +--- + src/plugins/fs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am +index 42e1c777..1ee256f0 100644 +--- a/src/plugins/fs/Makefile.am ++++ b/src/plugins/fs/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libbd_fs.la + +-libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow ++libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-error=unused-parameter -Wno-error=shift-count-overflow + libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) + libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' + libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ +-- +2.45.2 +
meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb +1 -0
@@ -14,6 +14,7 @@ DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \ file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ + file://0001-libext2fs-unused-parameters-fix.patch \ " SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050" S = "${WORKDIR}/git"