CVS commit: pkgsrc/misc/libreoffice

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jun  6 07:51:11 UTC 2024

Modified Files:
        pkgsrc/misc/libreoffice: Makefile distinfo
Added Files:
        pkgsrc/misc/libreoffice/patches: patch-vcl_unx_gtk3_hudawareness.cxx

Log Message:
libreoffice: add upstream patch for segfault

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.334 -r1.335 pkgsrc/misc/libreoffice/Makefile
cvs rdiff -u -r1.152 -r1.153 pkgsrc/misc/libreoffice/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/misc/libreoffice/patches/patch-vcl_unx_gtk3_hudawareness.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/libreoffice/Makefile
diff -u pkgsrc/misc/libreoffice/Makefile:1.334 pkgsrc/misc/libreoffice/Makefile:1.335
--- pkgsrc/misc/libreoffice/Makefile:1.334      Tue Jun  4 08:34:45 2024
+++ pkgsrc/misc/libreoffice/Makefile    Thu Jun  6 07:51:11 2024
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.334 2024/06/04 08:34:45 adam Exp $
+# $NetBSD: Makefile,v 1.335 2024/06/06 07:51:11 wiz Exp $
 
 VERREL=                24.2.3
 VERRC=         2
 VER=           ${VERREL}.${VERRC}
 DISTNAME=      libreoffice-${VER}
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://download.documentfoundation.org/libreoffice/src/${VERREL}/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/misc/libreoffice/distinfo
diff -u pkgsrc/misc/libreoffice/distinfo:1.152 pkgsrc/misc/libreoffice/distinfo:1.153
--- pkgsrc/misc/libreoffice/distinfo:1.152      Sat Jun  1 01:32:15 2024
+++ pkgsrc/misc/libreoffice/distinfo    Thu Jun  6 07:51:11 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.152 2024/06/01 01:32:15 ryoon Exp $
+$NetBSD: distinfo,v 1.153 2024/06/06 07:51:11 wiz Exp $
 
 BLAKE2s (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 0e0a0ae1eb07e5058749dc1726bc59971c723b4b16c57d83f24b6ac6ddd96d71
 SHA512 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 
b9c02d63e9b47a838dbe67c05b9e9e4983d13b9d74794e1c30c73d341c3bc905c9edec3a72fa339ae8c0e06d97e69ac2ea23bf51336b77af14cab7ae67721a46
@@ -238,6 +238,7 @@ SHA1 (patch-sw_source_core_bastyp_calc.c
 SHA1 (patch-sw_source_uibase_config_usrpref.cxx) = 8f761c368e38435aea53bfcfcdc1f3aba0c73d03
 SHA1 (patch-vcl_source_window_window2.cxx) = b5898d10a6f65ddb06ca3b86efe525078d8efa2a
 SHA1 (patch-vcl_unx_generic_app_geninst.cxx) = aa8f1a7e0fe2b6254a05e8370f1d12d25ba9795a
+SHA1 (patch-vcl_unx_gtk3_hudawareness.cxx) = ebaa4ad846e25edfe94ff2ab7c94a3c581a67c75
 SHA1 (patch-xmloff_source_draw_ximp3dscene.cxx) = bdd0b2563e54424dd468c2334e17ab23057a69fb
 SHA1 (patch-xmlsecurity_source_gpg_CertificateImpl.hxx) = 56ac06159e0805edc1685d271b632f1af438be86
 SHA1 (patch-xmlsecurity_source_gpg_xmlsignature__gpgimpl.cxx) = 151ccef192a8491bca5d39f2a02d938b3e4fad67

Added files:

Index: pkgsrc/misc/libreoffice/patches/patch-vcl_unx_gtk3_hudawareness.cxx
diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-vcl_unx_gtk3_hudawareness.cxx:1.1
--- /dev/null   Thu Jun  6 07:51:11 2024
+++ pkgsrc/misc/libreoffice/patches/patch-vcl_unx_gtk3_hudawareness.cxx Thu Jun  6 07:51:11 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-vcl_unx_gtk3_hudawareness.cxx,v 1.1 2024/06/06 07:51:11 wiz Exp $
+
+Fix segfault with glib2.
+https://git.libreoffice.org/core/+/436f823c7c5497f2b22762cec5849a0ff84c220b%5E%21
+
+--- vcl/unx/gtk3/hudawareness.cxx.orig 2024-06-06 07:49:03.789041452 +0000
++++ vcl/unx/gtk3/hudawareness.cxx
+@@ -88,7 +88,7 @@ hud_awareness_register (GDBusConnection 
+ 
+   if (object_id == 0)
+   {
+-      g_free (handle);
++      // note: tdf#161073 handle is expected to be freed by g_dbus_connection_register_object on failure
+       return 0;
+   }
+