Fix FTBFS where g_string_free was not storing the return value

https://src.fedoraproject.org/rpms/dee/c/da3ac90ec6a2a13c029a832b4acc1da4e4665f1d

3 files changed, 40 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed3985c842fa..88a42e18eafc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dee
 	pkgdesc = Model to synchronize multiple instances over DBus
 	pkgver = 1.2.7
-	pkgrel = 13
+	pkgrel = 14
 	url = https://launchpad.net/dee
 	arch = x86_64
 	license = LGPL
@@ -14,11 +14,13 @@ pkgbase = dee
 	source = dee-1.2.7-gcc6-fixes.patch
 	source = dee-1.2.7-fix-duplicates-vala-0.5X.patch
 	source = dee-1.2.7-deprecated-g_type_class_add_private.patch
+	source = dee-1.2.7-fix-g_string_free-usage.patch
 	source = vapi-skip-properties.patch
 	sha256sums = 1bf0336ce684aa0f48d6eae2469628c1a9b43695a77443bc31a5790aa673bf8a
 	sha256sums = 0a97d52b6c1e63ac070d9870914b1741d0bd2cd69f179c6a8ae69d0482905d38
 	sha256sums = 03acd7a0f80a89d7520df27396ba9771b3cc3688f759eee7283f8bcc3852a988
 	sha256sums = e9be91ded88cbb8256ea71d20a71be6ca8e304bc971902e28ffe9bba0ac1dc05
+	sha256sums = cc5cffd8ad8803ec39c625d782e7cbfdd6380dca6d0fbe0f4253a35222519569
 	sha256sums = ba0f9f80e3827fc4e1e546e4011982512b5b09e8f66496b213a4bd319bf829f5
 
 pkgname = dee
diff --git a/PKGBUILD b/PKGBUILD
index 981ee776f2e9..47ee23d311e8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=dee
 pkgver=1.2.7
-pkgrel=13
+pkgrel=14
 pkgdesc="Model to synchronize multiple instances over DBus"
 arch=("x86_64")
 url="https://launchpad.net/dee"
@@ -17,11 +17,13 @@ source=("https://launchpad.net/${pkgname}/1.0/${pkgver}/+download/${pkgname}-${p
          dee-1.2.7-gcc6-fixes.patch
          dee-1.2.7-fix-duplicates-vala-0.5X.patch
          dee-1.2.7-deprecated-g_type_class_add_private.patch
+         dee-1.2.7-fix-g_string_free-usage.patch
          vapi-skip-properties.patch)
 sha256sums=('1bf0336ce684aa0f48d6eae2469628c1a9b43695a77443bc31a5790aa673bf8a'
             '0a97d52b6c1e63ac070d9870914b1741d0bd2cd69f179c6a8ae69d0482905d38'
             '03acd7a0f80a89d7520df27396ba9771b3cc3688f759eee7283f8bcc3852a988'
             'e9be91ded88cbb8256ea71d20a71be6ca8e304bc971902e28ffe9bba0ac1dc05'
+            'cc5cffd8ad8803ec39c625d782e7cbfdd6380dca6d0fbe0f4253a35222519569'
             'ba0f9f80e3827fc4e1e546e4011982512b5b09e8f66496b213a4bd319bf829f5')
 
 prepare() {
@@ -29,6 +31,7 @@ prepare() {
   patch -Np1 -i ../dee-1.2.7-gcc6-fixes.patch
   patch -Np1 -i ../dee-1.2.7-fix-duplicates-vala-0.5X.patch
   patch -Np1 -i ../dee-1.2.7-deprecated-g_type_class_add_private.patch
+  patch -Np1 -i ../dee-1.2.7-fix-g_string_free-usage.patch
   patch -Np1 -i ../vapi-skip-properties.patch
   autoreconf -fi
 }
diff --git a/dee-1.2.7-fix-g_string_free-usage.patch b/dee-1.2.7-fix-g_string_free-usage.patch
new file mode 100644
index 000000000000..1f4ae0ba76b2
--- /dev/null
+++ b/dee-1.2.7-fix-g_string_free-usage.patch
@@ -0,0 +1,33 @@
+diff -up dee-1.2.7/src/dee-icu-term-filter.c.freefix dee-1.2.7/src/dee-icu-term-filter.c
+--- dee-1.2.7/src/dee-icu-term-filter.c.freefix	2023-04-28 09:26:18.883264141 -0400
++++ dee-1.2.7/src/dee-icu-term-filter.c	2023-04-28 09:27:03.585836521 -0400
+@@ -100,8 +100,7 @@ print_error (const gchar *system_id,
+   if (u_parse_error->offset >= 0)
+     g_string_append_printf(str, " Offset %i.", u_parse_error->offset);
+ 
+-  msg = str->str;
+-  g_string_free (str, FALSE);
++  msg = g_string_free (str, FALSE);
+ 
+   return msg;
+ }
+diff -up dee-1.2.7/src/trace-log.c.freefix dee-1.2.7/src/trace-log.c
+--- dee-1.2.7/src/trace-log.c.freefix	2023-04-28 09:27:22.722081551 -0400
++++ dee-1.2.7/src/trace-log.c	2023-04-28 09:29:44.269893973 -0400
+@@ -27,6 +27,7 @@ trace_object_va (void        *obj,
+                  va_list      args)
+ {
+   GString   *tmp;
++  gchar   *msg;
+ 
+   if (!G_IS_OBJECT(obj)) {
+     g_critical ("Failed to log '%s' for object. Not an object.", format);
+@@ -38,7 +39,7 @@ trace_object_va (void        *obj,
+   g_string_append (tmp, format);
+   g_logv (TRACE_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, tmp->str, args);
+ 
+-  g_string_free (tmp, TRUE);
++  msg = g_string_free (tmp, TRUE);
+ }
+ 
+ void