From b13fd6a2781560aab2f796e8944448f43c7f8570 Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Thu, 30 Nov 2017 20:55:57 +0100
Subject: Packaging/MSYS2: include tcl/tk accessory files

They are required for tkinter

Fixed bugs:
  - https://bugs.launchpad.net/inkscape/+bug/1735451
  - https://bugs.launchpad.net/inkscape/+bug/1695946
---
 CMakeScripts/InstallMSYS2.cmake | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index a192f459f..891202fae 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -205,6 +205,13 @@ if(WIN32)
     ${MINGW_LIB}/enchant/libenchant_aspell.dll
     DESTINATION lib/enchant)
 
+  # tcl/tk related files (required for tkinter)
+  install(DIRECTORY
+    ${MINGW_PATH}/lib/tcl8
+    ${MINGW_PATH}/lib/tcl8.6
+    ${MINGW_PATH}/lib/tk8.6
+    DESTINATION lib)
+
   # Necessary to run extensions on windows if it is not in the path
   if (HAVE_MINGW64)
     install(FILES
-- 
cgit v1.2.3


From 09f2a3f9b285498300b08af5080b62763684033d Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Thu, 30 Nov 2017 21:11:10 +0100
Subject: Packaging/MSYS2: remove unneeded libraries

---
 CMakeScripts/InstallMSYS2.cmake | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 891202fae..6f66d5e26 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -39,7 +39,6 @@ if(WIN32)
     ${MINGW_BIN}/libfreetype-[0-9]*.dll
     ${MINGW_BIN}/libfribidi-[0-9]*.dll
     ${MINGW_BIN}/libgc-[0-9]*.dll
-    ${MINGW_BIN}/libgdbm-[0-9]*.dll
     ${MINGW_BIN}/libgdk-3-[0-9]*.dll
     ${MINGW_BIN}/libgdk_pixbuf-2.0-[0-9]*.dll
     ${MINGW_BIN}/libgdkmm-3.0-[0-9]*.dll
@@ -50,8 +49,6 @@ if(WIN32)
     ${MINGW_BIN}/libglib-2.0-[0-9]*.dll
     ${MINGW_BIN}/libglibmm-2.4-[0-9]*.dll
     ${MINGW_BIN}/libgmodule-2.0-[0-9]*.dll
-    ${MINGW_BIN}/libgmp-[0-9]*.dll
-    ${MINGW_BIN}/libgnutls-[0-9]*.dll
     ${MINGW_BIN}/libgobject-2.0-[0-9]*.dll
     ${MINGW_BIN}/libgomp-[0-9]*.dll
     ${MINGW_BIN}/libgraphite[0-9]*.dll
@@ -61,7 +58,6 @@ if(WIN32)
     ${MINGW_BIN}/libgtkmm-3.0-[0-9]*.dll
     ${MINGW_BIN}/libgtkspell3-3-[0-9]*.dll
     ${MINGW_BIN}/libharfbuzz-[0-9]*.dll
-    ${MINGW_BIN}/libhogweed-[0-9]*.dll
     ${MINGW_BIN}/libiconv-[0-9]*.dll
     ${MINGW_BIN}/libicudt[0-9]*.dll
     ${MINGW_BIN}/libicuin[0-9]*.dll
@@ -71,14 +67,11 @@ if(WIN32)
     ${MINGW_BIN}/libjpeg-[0-9]*.dll
     ${MINGW_BIN}/liblcms2-[0-9]*.dll
     ${MINGW_BIN}/liblqr-1-[0-9]*.dll
-    ${MINGW_BIN}/libltdl-[0-9]*.dll
     ${MINGW_BIN}/liblzma-[0-9]*.dll
-    ${MINGW_BIN}/libnettle-[0-9]*.dll
     ${MINGW_BIN}/libnghttp2-[0-9]*.dll
     ${MINGW_BIN}/libnspr[0-9]*.dll
     ${MINGW_BIN}/libopenblas.dll
     ${MINGW_BIN}/libopenjp2-[0-9]*.dll
-    ${MINGW_BIN}/libp11-kit-[0-9]*.dll
     ${MINGW_BIN}/libpango-1.0-[0-9]*.dll
     ${MINGW_BIN}/libpangocairo-1.0-[0-9]*.dll
     ${MINGW_BIN}/libpangoft2-1.0-[0-9]*.dll
@@ -99,13 +92,11 @@ if(WIN32)
     ${MINGW_BIN}/librevenge-0.[0-9]*.dll
     ${MINGW_BIN}/librevenge-stream-0.[0-9]*.dll
     ${MINGW_BIN}/librsvg-2-[0-9]*.dll
-    ${MINGW_BIN}/librtmp-[0-9]*.dll
     ${MINGW_BIN}/libsigc-2.0-[0-9]*.dll
     ${MINGW_BIN}/libsoup-2.4-[0-9]*.dll
     ${MINGW_BIN}/libsqlite3-[0-9]*.dll
     ${MINGW_BIN}/libssh2-[0-9]*.dll
     ${MINGW_BIN}/libstdc++-[0-9]*.dll
-    ${MINGW_BIN}/libtasn1-[0-9]*.dll
     ${MINGW_BIN}/libtermcap-[0-9]*.dll
     ${MINGW_BIN}/libtiff-[0-9]*.dll
     ${MINGW_BIN}/libunistring-[0-9]*.dll
-- 
cgit v1.2.3