CVS commit: pkgsrc/graphics/inkscape

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Jan 13 11:43:34 UTC 2021

Modified Files:
        pkgsrc/graphics/inkscape: distinfo
        pkgsrc/graphics/inkscape/patches: patch-CMakeScripts_Pod2man.cmake
Added Files:
        pkgsrc/graphics/inkscape/patches: patch-src_svg_svg-length.cpp

Log Message:
inkscape: Portability fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 pkgsrc/graphics/inkscape/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/graphics/inkscape/patches/patch-src_svg_svg-length.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.76 pkgsrc/graphics/inkscape/distinfo:1.77
--- pkgsrc/graphics/inkscape/distinfo:1.76      Fri Nov 27 11:53:26 2020
+++ pkgsrc/graphics/inkscape/distinfo   Wed Jan 13 11:43:34 2021
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.76 2020/11/27 11:53:26 ryoon Exp $
+$NetBSD: distinfo,v 1.77 2021/01/13 11:43:34 jperkin Exp $
 
 SHA1 (inkscape-1.0.1.tar.xz) = f04277c8476ab572fa099b4439bff6323c89470e
 RMD160 (inkscape-1.0.1.tar.xz) = c93974227d33674c3c840cd8706cec9761e8cb7c
 SHA512 (inkscape-1.0.1.tar.xz) = 70145e02fe7c3ffbfa3dcea690bfe3315131fb9a507c70bcdc1d0db394d207e3bd04d7cc86c3b625597bddfd2b6e09a03841aece6d2ffb6517fe1c619193ec96
 Size (inkscape-1.0.1.tar.xz) = 32051632 bytes
-SHA1 (patch-CMakeScripts_Pod2man.cmake) = c7f0c0d3b28604c2594bc9265363c782a57af40c
+SHA1 (patch-CMakeScripts_Pod2man.cmake) = c60f61a7a3eca511ced5e085dc66670cee8bfe33
 SHA1 (patch-src_extension_implementation_script.cpp) = 2c2cbcee2fdda5a274906600930acc0257cc0ea2
 SHA1 (patch-src_path-prefix.cpp) = 1ce20f16063759aab60d9e8da6b25700b44099d2
+SHA1 (patch-src_svg_svg-length.cpp) = 076d30eb83fee4ab87b30791cc566c52baabbb68
 SHA1 (patch-src_ui_tool_node.cpp) = b822fcd2456cd19b6482a7f600a9f29abb9f238d

Index: pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake
diff -u pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake:1.3 pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake:1.4
--- pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake:1.3       Wed May  6 01:42:28 2020
+++ pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake   Wed Jan 13 11:43:34 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-CMakeScripts_Pod2man.cmake,v 1.3 2020/05/06 01:42:28 ryoon Exp $
+$NetBSD: patch-CMakeScripts_Pod2man.cmake,v 1.4 2021/01/13 11:43:34 jperkin Exp $
 
 Fix man installation path.
 
---- CMakeScripts/Pod2man.cmake.orig    2020-05-01 13:17:41.000000000 +0000
+--- CMakeScripts/Pod2man.cmake.orig    2020-09-07 08:57:40.000000000 +0000
 +++ CMakeScripts/Pod2man.cmake
 @@ -34,13 +34,13 @@ macro(pod2man PODFILE_FULL RELEASE SECTI
              set(MANFILE_TEMP "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.${LANG}.tmp")
@@ -20,3 +20,12 @@ Fix man installation path.
          endif()
          add_custom_command(
              OUTPUT ${MANFILE_TEMP}
+@@ -56,7 +56,7 @@ macro(pod2man PODFILE_FULL RELEASE SECTI
+         if(GZIP AND WITH_MANPAGE_COMPRESSION)
+             add_custom_command(
+                 OUTPUT ${MANFILE_FULL_GZ}
+-              COMMAND ${GZIP} -f -k --best -n "${MANFILE_FULL}"
++              COMMAND ${GZIP} -f --best -n "${MANFILE_FULL}"
+               DEPENDS ${MANFILE_FULL}
+             )
+             add_custom_target(${MANPAGE_TARGET} ALL

Added files:

Index: pkgsrc/graphics/inkscape/patches/patch-src_svg_svg-length.cpp
diff -u /dev/null pkgsrc/graphics/inkscape/patches/patch-src_svg_svg-length.cpp:1.3
--- /dev/null   Wed Jan 13 11:43:34 2021
+++ pkgsrc/graphics/inkscape/patches/patch-src_svg_svg-length.cpp       Wed Jan 13 11:43:34 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_svg_svg-length.cpp,v 1.3 2021/01/13 11:43:34 jperkin Exp $
+
+Use correct pow().
+
+--- src/svg/svg-length.cpp.orig        2020-09-07 08:57:41.000000000 +0000
++++ src/svg/svg-length.cpp
+@@ -22,6 +22,8 @@
+ #include "stringstream.h"
+ #include "util/units.h"
+ 
++using std::pow;
++
+ static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit, float *val, float *computed, char **next);
+ 
+ #ifndef MAX