diff mbox series

[meta-gnome,06/54] libgsf: upgrade 1.14.52 -> 1.14.53

Message ID 1728896115-2944-6-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe,01/54] adw-gtk3: upgrade 5.4 -> 5.5 | expand

Commit Message

Wang Mingyu Oct. 14, 2024, 8:54 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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 <wangmy@fujitsu.com>
---
 ...lation-attempt-fixes-for-libxml-2.13.patch | 105 ------------------
 .../{libgsf_1.14.52.bb => libgsf_1.14.53.bb}  |   5 +-
 2 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch
 rename meta-gnome/recipes-gnome/libgsf/{libgsf_1.14.52.bb => libgsf_1.14.53.bb} (65%)
diff mbox series

Patch

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 08ff51205..000000000
--- 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 <terra@gnome.org>
-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 <raj.khem@gmail.com>
----
- 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
diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb
similarity index 65%
rename from meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb
rename to meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb
index 97cbbe450..ffa24e812 100644
--- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb
+++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.53.bb
@@ -9,9 +9,8 @@  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"
+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"