CVS commit: pkgsrc/graphics/inkscape

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Fri Aug 20 11:40:15 UTC 2021

Modified Files:
        pkgsrc/graphics/inkscape: distinfo
Added Files:
        pkgsrc/graphics/inkscape/patches:
            patch-CMakeScripts_DefineDependsandFlags.cmake
            patch-src_object_sp-use-reference.h

Log Message:
inkscape: Fix building on NetBSD 9.x

reported by snow flurry on pkgsrc-users@


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/graphics/inkscape/distinfo
cvs rdiff -u -r0 -r1.4 \
    pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/inkscape/patches/patch-src_object_sp-use-reference.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.81 pkgsrc/graphics/inkscape/distinfo:1.82
--- pkgsrc/graphics/inkscape/distinfo:1.81      Fri Jul  2 14:04:06 2021
+++ pkgsrc/graphics/inkscape/distinfo   Fri Aug 20 11:40:15 2021
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.81 2021/07/02 14:04:06 wiz Exp $
+$NetBSD: distinfo,v 1.82 2021/08/20 11:40:15 nia Exp $
 
 SHA1 (inkscape-1.1.tar.xz) = e61dc54dd15c79eeabc9cc04cc8ecaf15ead42b2
 RMD160 (inkscape-1.1.tar.xz) = f10f34fcb06675ec00360a36a8efe46d2864ac49
 SHA512 (inkscape-1.1.tar.xz) = 54b75f8794d748ef59d5b719ea04e3debadc1a5cf3f62f14254502567973bbd634850edd0a3bc082be878dacf041e9bd10982c4846bf154f89aa5319eda4ee80
 Size (inkscape-1.1.tar.xz) = 34203156 bytes
+SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = 26351c300629e28f6523fe2167a2eed5802435cf
 SHA1 (patch-src_display_cairo-utils.cpp) = dc2ca383c1050b40bb500b522e789c1f6e8f42b7
 SHA1 (patch-src_extension_implementation_script.cpp) = da46549f688da5c9c0ecbeaeac7962e4f261cae4
+SHA1 (patch-src_object_sp-use-reference.h) = f642f27dea75e29fd55bef39e37f8a98000a33a0
 SHA1 (patch-src_path-prefix.cpp) = d927b859d75422fc42ee16bbbbdaa1a8321df7e8
 SHA1 (patch-src_svg_svg-length.cpp) = 39fe19a500a73d0a58ba84d08aba0c6ae47dda04

Added files:

Index: pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake
diff -u /dev/null pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake:1.4
--- /dev/null   Fri Aug 20 11:40:15 2021
+++ pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake     Fri Aug 20 11:40:15 2021
@@ -0,0 +1,18 @@
+$NetBSD: patch-CMakeScripts_DefineDependsandFlags.cmake,v 1.4 2021/08/20 11:40:15 nia Exp $
+
+NetBSD 9 has gcc7 without -lstdc++fs.
+
+--- CMakeScripts/DefineDependsandFlags.cmake.orig      2021-05-17 19:26:40.000000000 +0000
++++ CMakeScripts/DefineDependsandFlags.cmake
+@@ -298,9 +298,11 @@ endif()
+ 
+ find_package(Boost 1.19.0 REQUIRED COMPONENTS filesystem)
+ 
++if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD"))
+ if (CMAKE_COMPILER_IS_GNUCC AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9)
+     list(APPEND INKSCAPE_LIBS "-lstdc++fs")
+ endif()
++endif()
+ 
+ list(APPEND INKSCAPE_INCS_SYS ${Boost_INCLUDE_DIRS})
+ # list(APPEND INKSCAPE_LIBS ${Boost_LIBRARIES})

Index: pkgsrc/graphics/inkscape/patches/patch-src_object_sp-use-reference.h
diff -u /dev/null pkgsrc/graphics/inkscape/patches/patch-src_object_sp-use-reference.h:1.1
--- /dev/null   Fri Aug 20 11:40:15 2021
+++ pkgsrc/graphics/inkscape/patches/patch-src_object_sp-use-reference.h        Fri Aug 20 11:40:15 2021
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_object_sp-use-reference.h,v 1.1 2021/08/20 11:40:15 nia Exp $
+
+Fix build error on NetBSD 9.x.
+https://gitlab.com/inkscape/inkscape/-/merge_requests/3345
+
+--- src/object/sp-use-reference.h.orig 2021-05-17 19:25:49.000000000 +0000
++++ src/object/sp-use-reference.h
+@@ -14,11 +14,10 @@
+ 
+ #include "sp-item.h"
+ #include "uri-references.h"
++#include "display/curve.h"
+ 
+ #include <memory>
+ 
+-class SPCurve;
+-
+ namespace Inkscape {
+ namespace XML {
+ class Node;