CVS commit: pkgsrc/graphics/inkscape

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Apr 30 19:45:31 UTC 2025

Modified Files:
        pkgsrc/graphics/inkscape: distinfo
Added Files:
        pkgsrc/graphics/inkscape/patches: patch-src_util_gobjectptr.h

Log Message:
inkscape: C++ build fix, from upstream


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 pkgsrc/graphics/inkscape/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/inkscape/patches/patch-src_util_gobjectptr.h

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

Modified files:

Index: pkgsrc/graphics/inkscape/distinfo
diff -u pkgsrc/graphics/inkscape/distinfo:1.102 pkgsrc/graphics/inkscape/distinfo:1.103
--- pkgsrc/graphics/inkscape/distinfo:1.102     Mon Nov  4 10:10:57 2024
+++ pkgsrc/graphics/inkscape/distinfo   Wed Apr 30 19:45:31 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.102 2024/11/04 10:10:57 jperkin Exp $
+$NetBSD: distinfo,v 1.103 2025/04/30 19:45:31 tnn Exp $
 
 BLAKE2s (inkscape-1.4.tar.xz) = 4ff593a28645a46cf060fbcbe6c1275dd1ff331220ef99634588e46471deffd2
 SHA512 (inkscape-1.4.tar.xz) = 3b81306b81416597073e7eda2a103112cee63493bcf96fa737bb1edfbd682ebb329e415bbbbfda877aef2a78dc376460040ebc5c0cc2c90c0fe60db5d7d12368
@@ -10,3 +10,4 @@ SHA1 (patch-src_extension_internal_pdfin
 SHA1 (patch-src_path_splinefit_splinefit.c) = 6c4482891567215a9b2cb5b2a4fb63ca54b24f9f
 SHA1 (patch-src_path_splinefit_splinefont.c) = 43f67ea3c25d64d323899718d6adf26225f24da0
 SHA1 (patch-src_path_splinefit_splinefont.h) = 170bec433cfbf98f54717e09433f6def5a7a9afe
+SHA1 (patch-src_util_gobjectptr.h) = 8842a58c554c73d61049d14cd5c3c3036c6408e8

Added files:

Index: pkgsrc/graphics/inkscape/patches/patch-src_util_gobjectptr.h
diff -u /dev/null pkgsrc/graphics/inkscape/patches/patch-src_util_gobjectptr.h:1.1
--- /dev/null   Wed Apr 30 19:45:31 2025
+++ pkgsrc/graphics/inkscape/patches/patch-src_util_gobjectptr.h        Wed Apr 30 19:45:31 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_util_gobjectptr.h,v 1.1 2025/04/30 19:45:31 tnn Exp $
+
+Compile fix: https://gitlab.com/inkscape/inkscape/-/commit/eb6dadcf1a5c660167ba43f3606c8e7cc6529787.patch
+
+--- src/util/gobjectptr.h.orig 2024-04-22 21:00:30.000000000 +0000
++++ src/util/gobjectptr.h
+@@ -20,7 +20,7 @@ public:
+     GObjectPtr() = default;
+     explicit GObjectPtr(T *p, bool add_ref = false) : _p(p) { if (add_ref) _ref(); }
+     GObjectPtr(GObjectPtr const &other) : _p(other._p) { _ref(); }
+-    GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other.p; _ref(); } return *this; }
++    GObjectPtr &operator=(GObjectPtr const &other) { if (&other != this) { _unref(); _p = other._p; _ref(); } return *this; }
+     GObjectPtr(GObjectPtr &&other) noexcept : _p(other._p) { other._p = nullptr; }
+     GObjectPtr &operator=(GObjectPtr &&other) { if (&other != this) { _unref(); _p = other._p; other._p = nullptr; } return *this; }
+     ~GObjectPtr() { _unref(); }