inkscape: Avoid ambiguous function calls, fix PKGLOCALEDIR.

16 files changed, 243 insertions, 1 deletions

diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo
index e0fed657ee4..0d2c99cb186 100644
--- a/graphics/inkscape/distinfo
+++ b/graphics/inkscape/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.64 2018/06/21 10:25:35 wiz Exp $
+$NetBSD: distinfo,v 1.65 2018/06/28 11:18:58 jperkin Exp $
 
 SHA1 (inkscape-0.92.2.tar.bz2) = c620d7aac594a0f839f2f7840d57e26f00991d16
 RMD160 (inkscape-0.92.2.tar.bz2) = 5508b38c47ed0a860a734eef8f8ca8e53f4e923a
@@ -11,11 +11,26 @@ SHA1 (patch-aj) = 31d6cc8bb179629023bd04bcac0fd935b2c9636d
 SHA1 (patch-ap) = 412509a03d26e925548e3371529a1273db958611
 SHA1 (patch-aq) = fb7de44d33fdc5895ce84ca8d44ff6a6c328c402
 SHA1 (patch-config.h.cmake) = 1dcc7237fba3dbdfd7993ea2f5a2176785fb561e
+SHA1 (patch-po_CMakeLists.txt) = aa03a91f656c239b8bfaeae8acd753b16be58aca
 SHA1 (patch-src_CMakeLists.txt) = ccd5eeca81891f83c5eaf8cb80d33f001beaf55c
+SHA1 (patch-src_extension_internal_emf-inout.cpp) = 4fe6c24007b54d55d11502876e759f62a290922e
+SHA1 (patch-src_extension_internal_emf-print.cpp) = 5da493a452afa4b11bbb204c430fc3e63332c927
+SHA1 (patch-src_extension_internal_metafile-print.cpp) = 798a2f15986cd81d13bf576b1641a810d4d40573
 SHA1 (patch-src_extension_internal_pdfinput_pdf-input.cpp) = 437cb3a461df047fef3c91e86c89cdcf15ef9965
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = a15b784ff4941807c31958643d671961fff248ac
 SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = ba408f45544853f9323f8bd879bd55604072bb7a
 SHA1 (patch-src_extension_internal_pdfinput_svg-builder.cpp) = d7bfff0d3a1309b96eb70bc75b08d5d1ddf400da
+SHA1 (patch-src_extension_internal_wmf-inout.cpp) = b49b504d1cf9388d2ad7e1c91c339e7c3d5ffdf5
+SHA1 (patch-src_extension_internal_wmf-print.cpp) = b658d7a0697aaed55671507fe88ce93619ef1070
+SHA1 (patch-src_gradient-drag.cpp) = d6fc1f587a9ad404715fa6e70fe07823a3c68b0c
 SHA1 (patch-src_io_inkjar.cpp) = 060d59225cfe7b66db5e9f41e76860df9ce12d01
+SHA1 (patch-src_live__effects_lpe-ellipse__5pts.cpp) = e909a5b2e65f931246e5b3de7145739d1b6f6209
+SHA1 (patch-src_live__effects_lpe-lattice.cpp) = 17040a794a312ebecb63dd7b19be8f3337b18c47
+SHA1 (patch-src_live__effects_lpe-lattice2.cpp) = bcff9e9177895168a4ef888376f1c3942e7786fb
+SHA1 (patch-src_sp-ellipse.cpp) = e0b273e14c8174712b40f2c83c2e5408644bb9c9
+SHA1 (patch-src_svg_svg-length.cpp) = 41679ab161275577ccd3f525653e7766ca4f92c6
 SHA1 (patch-src_trace_siox.cpp) = daeff4626dace6997f64ab9c96b0bfb304e724c8
+SHA1 (patch-src_ui_dialog_grid-arrange-tab.cpp) = 0ea5b92f2bf923efd149a11d9fff3d5a1d5e5421
 SHA1 (patch-src_ui_tool_node.h) = 2900ab737d6b9245aabefee5e79564bdbaec57bc
+SHA1 (patch-src_util_fixed__point.h) = 40b38724541a9dd5ea241370b23dfb55d93cbb58
+SHA1 (patch-src_widgets_desktop-widget.cpp) = 2ccfad3614fe4e40162b2788db68e86f4a1dc6c9
diff --git a/graphics/inkscape/patches/patch-po_CMakeLists.txt b/graphics/inkscape/patches/patch-po_CMakeLists.txt
new file mode 100644
index 00000000000..db61a666bcc
--- /dev/null
+++ b/graphics/inkscape/patches/patch-po_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-po_CMakeLists.txt,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Fix PKGLOCALEDIR.
+
+--- po/CMakeLists.txt.orig	2017-08-06 20:44:00.000000000 +0000
++++ po/CMakeLists.txt
+@@ -3,7 +3,7 @@ foreach(language ${LANGUAGES})
+   string(REGEX REPLACE "(.+(\\\\|/))+" "" language ${language})
+   string(REGEX REPLACE "\\.po$" "" language ${language})
+   set(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${language}.po)
+-  GETTEXT_PROCESS_PO_FILES(${language} ALL INSTALL_DESTINATION "share/locale/" PO_FILES ${pofile})
++  GETTEXT_PROCESS_PO_FILES(${language} ALL INSTALL_DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/ PO_FILES ${pofile})
+ endforeach(language)
+ 
+ if(NOT WIN32)
diff --git a/graphics/inkscape/patches/patch-src_extension_internal_emf-inout.cpp b/graphics/inkscape/patches/patch-src_extension_internal_emf-inout.cpp
new file mode 100644
index 00000000000..3ec6752db77
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_extension_internal_emf-inout.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_extension_internal_emf-inout.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/extension/internal/emf-inout.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/extension/internal/emf-inout.cpp
+@@ -57,6 +57,8 @@
+ #define U_PS_JOIN_MASK (U_PS_JOIN_BEVEL|U_PS_JOIN_MITER|U_PS_JOIN_ROUND)
+ #endif
+ 
++using std::sqrt;
++
+ namespace Inkscape {
+ namespace Extension {
+ namespace Internal {
diff --git a/graphics/inkscape/patches/patch-src_extension_internal_emf-print.cpp b/graphics/inkscape/patches/patch-src_extension_internal_emf-print.cpp
new file mode 100644
index 00000000000..4905fdd6597
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_extension_internal_emf-print.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_extension_internal_emf-print.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/extension/internal/emf-print.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/extension/internal/emf-print.cpp
+@@ -664,7 +664,7 @@ int PrintEmf::create_pen(SPStyle const *
+         Geom::Point p1(one * transform);
+         Geom::Point p(p1 - p0);
+ 
+-        double scale = sqrt((p[X] * p[X]) + (p[Y] * p[Y])) / sqrt(2);
++        double scale = std::sqrt((p[X] * p[X]) + (p[Y] * p[Y])) / std::sqrt(2);
+ 
+         if (!style->stroke_width.computed) {
+             return 0;   //if width is 0 do not (reset) the pen, it should already be NULL_PEN
diff --git a/graphics/inkscape/patches/patch-src_extension_internal_metafile-print.cpp b/graphics/inkscape/patches/patch-src_extension_internal_metafile-print.cpp
new file mode 100644
index 00000000000..2b38eb0695c
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_extension_internal_metafile-print.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_extension_internal_metafile-print.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/extension/internal/metafile-print.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/extension/internal/metafile-print.cpp
+@@ -30,6 +30,9 @@
+ #include "sp-radial-gradient.h"
+ #include "style.h"
+ 
++using std::cos;
++using std::sin;
++
+ namespace Inkscape {
+ namespace Extension {
+ namespace Internal {
diff --git a/graphics/inkscape/patches/patch-src_extension_internal_wmf-inout.cpp b/graphics/inkscape/patches/patch-src_extension_internal_wmf-inout.cpp
new file mode 100644
index 00000000000..fddd6183457
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_extension_internal_wmf-inout.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_extension_internal_wmf-inout.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/extension/internal/wmf-inout.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/extension/internal/wmf-inout.cpp
+@@ -59,6 +59,8 @@
+ #define U_PS_JOIN_MASK (U_PS_JOIN_BEVEL|U_PS_JOIN_MITER|U_PS_JOIN_ROUND)
+ #endif
+ 
++using std::sqrt;
++
+ namespace Inkscape {
+ namespace Extension {
+ namespace Internal {
diff --git a/graphics/inkscape/patches/patch-src_extension_internal_wmf-print.cpp b/graphics/inkscape/patches/patch-src_extension_internal_wmf-print.cpp
new file mode 100644
index 00000000000..e71d60d0357
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_extension_internal_wmf-print.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_extension_internal_wmf-print.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/extension/internal/wmf-print.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/extension/internal/wmf-print.cpp
+@@ -67,6 +67,8 @@
+ #include <string.h>
+ #include <libuemf/symbol_convert.h>
+ 
++using std::sqrt;
++
+ namespace Inkscape {
+ namespace Extension {
+ namespace Internal {
diff --git a/graphics/inkscape/patches/patch-src_gradient-drag.cpp b/graphics/inkscape/patches/patch-src_gradient-drag.cpp
new file mode 100644
index 00000000000..ee85d98755f
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_gradient-drag.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_gradient-drag.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/gradient-drag.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/gradient-drag.cpp
+@@ -55,6 +55,8 @@
+ #include "ui/control-manager.h"
+ #include "ui/tools/tool-base.h"
+ 
++using std::floor;
++
+ using Inkscape::ControlManager;
+ using Inkscape::CtrlLineType;
+ using Inkscape::DocumentUndo;
diff --git a/graphics/inkscape/patches/patch-src_live__effects_lpe-ellipse__5pts.cpp b/graphics/inkscape/patches/patch-src_live__effects_lpe-ellipse__5pts.cpp
new file mode 100644
index 00000000000..125fd17b688
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_live__effects_lpe-ellipse__5pts.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_live__effects_lpe-ellipse__5pts.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/live_effects/lpe-ellipse_5pts.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/live_effects/lpe-ellipse_5pts.cpp
+@@ -23,6 +23,9 @@
+ #include "desktop.h"
+ #include "message-stack.h"
+ 
++using std::cos;
++using std::sin;
++
+ namespace Inkscape {
+ namespace LivePathEffect {
+ 
diff --git a/graphics/inkscape/patches/patch-src_live__effects_lpe-lattice.cpp b/graphics/inkscape/patches/patch-src_live__effects_lpe-lattice.cpp
new file mode 100644
index 00000000000..703d4511eaa
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_live__effects_lpe-lattice.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_live__effects_lpe-lattice.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/live_effects/lpe-lattice.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/live_effects/lpe-lattice.cpp
+@@ -33,6 +33,8 @@
+ 
+ #include "desktop.h" // TODO: should be factored out (see below)
+ 
++using std::pow;
++
+ using namespace Geom;
+ 
+ namespace Inkscape {
diff --git a/graphics/inkscape/patches/patch-src_live__effects_lpe-lattice2.cpp b/graphics/inkscape/patches/patch-src_live__effects_lpe-lattice2.cpp
new file mode 100644
index 00000000000..d9abe783aa0
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_live__effects_lpe-lattice2.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_live__effects_lpe-lattice2.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/live_effects/lpe-lattice2.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/live_effects/lpe-lattice2.cpp
+@@ -37,6 +37,8 @@
+ // TODO due to internal breakage in glibmm headers, this must be last:
+ #include <glibmm/i18n.h>
+ 
++using std::pow;
++
+ using namespace Geom;
+ 
+ namespace Inkscape {
diff --git a/graphics/inkscape/patches/patch-src_sp-ellipse.cpp b/graphics/inkscape/patches/patch-src_sp-ellipse.cpp
new file mode 100644
index 00000000000..f4d988c0f2a
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_sp-ellipse.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_sp-ellipse.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/sp-ellipse.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/sp-ellipse.cpp
+@@ -37,6 +37,8 @@
+ 
+ #define SP_2PI (2 * M_PI)
+ 
++using std::sqrt;
++
+ SPGenericEllipse::SPGenericEllipse()
+     : SPShape()
+     , start(0)
diff --git a/graphics/inkscape/patches/patch-src_svg_svg-length.cpp b/graphics/inkscape/patches/patch-src_svg_svg-length.cpp
new file mode 100644
index 00000000000..75c87eaa3b2
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_svg_svg-length.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_svg_svg-length.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/svg/svg-length.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/svg/svg-length.cpp
+@@ -20,6 +20,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
diff --git a/graphics/inkscape/patches/patch-src_ui_dialog_grid-arrange-tab.cpp b/graphics/inkscape/patches/patch-src_ui_dialog_grid-arrange-tab.cpp
new file mode 100644
index 00000000000..ac450c4ab90
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_ui_dialog_grid-arrange-tab.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_ui_dialog_grid-arrange-tab.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/ui/dialog/grid-arrange-tab.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/ui/dialog/grid-arrange-tab.cpp
+@@ -41,6 +41,8 @@
+ //#include "sp-item-transform.h" FIXME
+ #include "ui/dialog/tile.h" // for Inkscape::UI::Dialog::ArrangeDialog
+ 
++using std::sqrt;
++
+ /*
+  *    Sort items by their x co-ordinates, taking account of y (keeps rows intact)
+  *
diff --git a/graphics/inkscape/patches/patch-src_util_fixed__point.h b/graphics/inkscape/patches/patch-src_util_fixed__point.h
new file mode 100644
index 00000000000..9907cb81b0b
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_util_fixed__point.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_util_fixed__point.h,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/util/fixed_point.h.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/util/fixed_point.h
+@@ -79,7 +79,7 @@ public:
+     operator unsigned int() const { return v>>precision; }
+ 
+     operator float() const { return ldexpf(v,-precision); }
+-    operator double() const { return ldexp(v,-precision); }
++    operator double() const { return std::ldexp(v,-precision); }
+ private:
+     T v;
+ };
diff --git a/graphics/inkscape/patches/patch-src_widgets_desktop-widget.cpp b/graphics/inkscape/patches/patch-src_widgets_desktop-widget.cpp
new file mode 100644
index 00000000000..63b29babb45
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_widgets_desktop-widget.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_widgets_desktop-widget.cpp,v 1.1 2018/06/28 11:18:59 jperkin Exp $
+
+Avoid ambiguous function calls.
+
+--- src/widgets/desktop-widget.cpp.orig	2017-08-06 20:44:00.000000000 +0000
++++ src/widgets/desktop-widget.cpp
+@@ -78,6 +78,8 @@
+ 
+ #include <gtk/gtk.h>
+ 
++using std::log;
++
+ #if defined (SOLARIS) && (SOLARIS == 8)
+ #include "round.h"
+ using Inkscape::round;