CVS commit: pkgsrc/graphics/inkscape

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug  2 07:31:05 UTC 2022

Modified Files:
        pkgsrc/graphics/inkscape: distinfo
        pkgsrc/graphics/inkscape/patches: patch-src_actions_actions-edit.cpp

Log Message:
inkscape: adapt patch to version submitted upstream


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/graphics/inkscape/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/inkscape/patches/patch-src_actions_actions-edit.cpp

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.90 pkgsrc/graphics/inkscape/distinfo:1.91
--- pkgsrc/graphics/inkscape/distinfo:1.90      Mon Jul 25 19:42:33 2022
+++ pkgsrc/graphics/inkscape/distinfo   Tue Aug  2 07:31:05 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.90 2022/07/25 19:42:33 wiz Exp $
+$NetBSD: distinfo,v 1.91 2022/08/02 07:31:05 wiz Exp $
 
 BLAKE2s (inkscape-1.2.1.tar.xz) = d044b582e20c274f04fb1f3fd8392d0e42798aa7aed284ad81d263cfa4d3926a
 SHA512 (inkscape-1.2.1.tar.xz) = 1f968cb20855e77ad8a1b16f8d4841e3279e139c7b1f41eccb7fbef9a7da092f3ffe7f123d032c395939a002725f68d6f1305b2a87ed68610a69a31052711521
 Size (inkscape-1.2.1.tar.xz) = 98048464 bytes
 SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = 26351c300629e28f6523fe2167a2eed5802435cf
-SHA1 (patch-src_actions_actions-edit.cpp) = 6f8944612e28ff19433fd3ca8c8006683bb8d130
+SHA1 (patch-src_actions_actions-edit.cpp) = 8f18d7889ba2d1d8e39b9ee6c87e0d3df905807d
 SHA1 (patch-src_extension_implementation_script.cpp) = da46549f688da5c9c0ecbeaeac7962e4f261cae4

Index: pkgsrc/graphics/inkscape/patches/patch-src_actions_actions-edit.cpp
diff -u pkgsrc/graphics/inkscape/patches/patch-src_actions_actions-edit.cpp:1.1 pkgsrc/graphics/inkscape/patches/patch-src_actions_actions-edit.cpp:1.2
--- pkgsrc/graphics/inkscape/patches/patch-src_actions_actions-edit.cpp:1.1     Mon Jul 25 19:42:33 2022
+++ pkgsrc/graphics/inkscape/patches/patch-src_actions_actions-edit.cpp Tue Aug  2 07:31:05 2022
@@ -1,25 +1,36 @@
-$NetBSD: patch-src_actions_actions-edit.cpp,v 1.1 2022/07/25 19:42:33 wiz Exp $
+$NetBSD: patch-src_actions_actions-edit.cpp,v 1.2 2022/08/02 07:31:05 wiz Exp $
 
-Avoid confusion with clone(2) on NetBSD.
-https://gitlab.com/inkscape/inbox/-/issues/7378
+Fix collision with clone() from sched.h on NetBSD.
+https://gitlab.com/inkscape/inkscape/-/merge_requests/4679
 
 --- src/actions/actions-edit.cpp.orig  2022-07-14 13:10:04.000000000 +0000
 +++ src/actions/actions-edit.cpp
-@@ -150,7 +150,7 @@ duplicate(InkscapeApplication *app)
- }
+@@ -23,6 +23,8 @@
+ #include "ui/tools/text-tool.h"
+ #include "ui/tools/node-tool.h"
  
++namespace ActionsEdit {
++
  void
--clone(InkscapeApplication *app)
-+inkscape_clone(InkscapeApplication *app)
+ object_to_pattern(InkscapeApplication *app)
  {
-     auto selection = app->get_active_selection();
+@@ -302,6 +304,10 @@ std::vector<std::vector<Glib::ustring>> 
+     // clang-format on
+ };
  
-@@ -322,7 +322,7 @@ add_actions_edit(InkscapeApplication* ap
++}
++
++using namespace ActionsEdit;
++
+ void
+ add_actions_edit(InkscapeApplication* app)
+ {
+@@ -322,7 +328,7 @@ add_actions_edit(InkscapeApplication* ap
      gapp->add_action( "paste-width-separately",          sigc::bind<InkscapeApplication*>(sigc::ptr_fun(&paste_width_separately), app));
      gapp->add_action( "paste-height-separately",         sigc::bind<InkscapeApplication*>(sigc::ptr_fun(&paste_height_separately), app));
      gapp->add_action( "duplicate",                       sigc::bind<InkscapeApplication*>(sigc::ptr_fun(&duplicate), app));
 -    gapp->add_action( "clone",                           sigc::bind<InkscapeApplication*>(sigc::ptr_fun(&clone), app));
-+    gapp->add_action( "clone",                           sigc::bind<InkscapeApplication*>(sigc::ptr_fun(&inkscape_clone), app));
++    gapp->add_action( "clone",                           sigc::bind<InkscapeApplication*>(sigc::ptr_fun(&ActionsEdit::clone), app));
      gapp->add_action( "clone-unlink",                    sigc::bind<InkscapeApplication*>(sigc::ptr_fun(&clone_unlink), app));
      gapp->add_action( "clone-unlink-recursively",        sigc::bind<InkscapeApplication*>(sigc::ptr_fun(&clone_unlink_recursively), app));
      gapp->add_action( "clone-link",                      sigc::bind<InkscapeApplication*>(sigc::ptr_fun(&clone_link), app));