From aad48bdc8a29c8d80f942dce3c37581e8cdc57e2 Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Fri, 10 Feb 2017 05:51:43 +0000
Subject: The Inkscape project announces a new version 0.92 of its popular
 vector drawing software. New features include mesh gradients, improved SVG2
 and CSS3 support, new path effects, interactive smoothing for the pencil
 tool, a new Object dialog for directly managing all drawing elements, and
 much more. Infrastructural changes are also under way, including a switch to
 CMake from the venerable Autotools build system.

---
 .../inkscape/patches/patch-CMakeScripts_Pod2man.cmake     | 15 +++++++++++++++
 graphics/inkscape/patches/patch-configure                 | 15 ---------------
 graphics/inkscape/patches/patch-src_CMakeLists.txt        | 14 ++++++++++++++
 graphics/inkscape/patches/patch-src_ui_clipboard.cpp      | 15 ---------------
 4 files changed, 29 insertions(+), 30 deletions(-)
 create mode 100644 graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake
 delete mode 100644 graphics/inkscape/patches/patch-configure
 create mode 100644 graphics/inkscape/patches/patch-src_CMakeLists.txt
 delete mode 100644 graphics/inkscape/patches/patch-src_ui_clipboard.cpp

(limited to 'graphics/inkscape/patches')

diff --git a/graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake b/graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake
new file mode 100644
index 00000000000..e26525ff47d
--- /dev/null
+++ b/graphics/inkscape/patches/patch-CMakeScripts_Pod2man.cmake
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeScripts_Pod2man.cmake,v 1.1 2017/02/10 05:51:43 adam Exp $
+
+Fix man installation path.
+
+--- CMakeScripts/Pod2man.cmake.orig	2017-02-08 19:36:52.000000000 +0000
++++ CMakeScripts/Pod2man.cmake
+@@ -48,7 +48,7 @@ macro(pod2man PODFILE_FULL RELEASE SECTI
+         )
+         install(
+             FILES ${MANFILE_FULL}
+-            DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/man/man${SECTION}
++            DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man${SECTION}
+         )
+     endif()
+ endmacro(pod2man PODFILE NAME SECTION CENTER)
diff --git a/graphics/inkscape/patches/patch-configure b/graphics/inkscape/patches/patch-configure
deleted file mode 100644
index 0728f38329e..00000000000
--- a/graphics/inkscape/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2015/02/03 13:55:12 adam Exp $
-
-Portability fix.
-
---- configure.orig	2015-02-02 08:52:21.000000000 +0000
-+++ configure
-@@ -23483,7 +23483,7 @@ $as_echo "$have_x11" >&6; }
- 
- 	# Optionally enable strict build options that are known to cause build
- 	# failure in many/most systems
--	if test "x$enable_strict_build" == "xhigh"; then
-+	if test "x$enable_strict_build" = "xhigh"; then
- 		# FIXME: This causes build failure because our internal
- 		# copy of GDL uses deprecated GDK symbols.
- 		#
diff --git a/graphics/inkscape/patches/patch-src_CMakeLists.txt b/graphics/inkscape/patches/patch-src_CMakeLists.txt
new file mode 100644
index 00000000000..2971c9e5080
--- /dev/null
+++ b/graphics/inkscape/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_CMakeLists.txt,v 1.1 2017/02/10 05:51:43 adam Exp $
+
+Shared libs go into lib/.
+
+--- src/CMakeLists.txt.orig	2017-02-08 19:49:12.000000000 +0000
++++ src/CMakeLists.txt
+@@ -570,6 +570,6 @@ if(NOT WIN32)
+     inkscape
+     inkview 
+     RUNTIME DESTINATION bin
+-    LIBRARY DESTINATION lib/inkscape
++    LIBRARY DESTINATION lib
+     ARCHIVE DESTINATION lib/inkscape)
+ endif()
diff --git a/graphics/inkscape/patches/patch-src_ui_clipboard.cpp b/graphics/inkscape/patches/patch-src_ui_clipboard.cpp
deleted file mode 100644
index 56d0c502098..00000000000
--- a/graphics/inkscape/patches/patch-src_ui_clipboard.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_ui_clipboard.cpp,v 1.1 2016/04/12 21:33:49 adam Exp $
-
-Fix building with newer glibmm.
-
---- src/ui/clipboard.cpp.orig	2016-04-12 21:18:03.000000000 +0000
-+++ src/ui/clipboard.cpp
-@@ -1402,7 +1402,7 @@ void ClipboardManagerImpl::_inkscape_wai
- 
-         Glib::ustring target;
-         if (atom_name) {
--            target = Glib::ScopedPtr<char>(atom_name).get(); //This frees the gchar*.
-+            target = Glib::make_unique_ptr_gfree(atom_name).get(); //This frees the gchar*.
-         }
- 
-         listTargets.push_back(target);
-- 
cgit v1.2.3