From 6ed5891c18fc78a69764af0a29ad9b5feefb1aa8 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 14 Oct 2024 16:54:27 +0800 Subject: libgsf: upgrade 1.14.52 -> 1.14.53 0001-Compilation-attempt-fixes-for-libxml-2.13.patch removed since it's included in 1.14.53 Changelog: ============ * Compilation fixes for libxml 2.13 * Fix ABR in gsf-vba-dump. * Teach gsf (the tool) to handle odf properties. * Fix integer overflows affecting memory allocation. * Add missing "DocumentStatus" ole2 property. * Avoid some undefined C behaviour in overflow checks. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...Compilation-attempt-fixes-for-libxml-2.13.patch | 105 --------------------- meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb | 23 ----- meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb | 22 +++++ 3 files changed, 22 insertions(+), 128 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch delete mode 100644 meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb create mode 100644 meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch b/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch deleted file mode 100644 index 08ff51205a..0000000000 --- a/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 4a84e9857d83f684bf53d616942a393ce558a328 Mon Sep 17 00:00:00 2001 -From: Morten Welinder -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 ---- - 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 ]], [[(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 - #include - -+#ifdef HAVE_XMLNANOHTTPOPEN -+// It's going away, so make it conditional - #include -+#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 diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb deleted file mode 100644 index 97cbbe450c..0000000000 --- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "GNOME Structured File Library" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=61464cfe342798eeced82efe9ae55f63" - -SECTION = "libs" - -DEPENDS= "libxml2 bzip2 glib-2.0 zlib" - -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 \ - file://0001-Compilation-attempt-fixes-for-libxml-2.13.patch" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" - -EXTRA_OECONF = "\ - --with-bz2 \ -" - -FILES:${PN} += "${datadir}/thumbnailers" diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb new file mode 100644 index 0000000000..ffa24e8120 --- /dev/null +++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb @@ -0,0 +1,22 @@ +SUMMARY = "GNOME Structured File Library" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=61464cfe342798eeced82efe9ae55f63" + +SECTION = "libs" + +DEPENDS= "libxml2 bzip2 glib-2.0 zlib" + +GNOMEBASEBUILDCLASS = "autotools" +inherit gnomebase gobject-introspection gettext gtk-doc + +SRC_URI[archive.sha256sum] = "0eb59a86e0c50f97ac9cfe4d8cc1969f623f2ae8c5296f2414571ff0a9e8bcba" +SRC_URI += " file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" + +EXTRA_OECONF = "\ + --with-bz2 \ +" + +FILES:${PN} += "${datadir}/thumbnailers" -- cgit v1.2.3-54-g00ecf