From 71d188eaf4267673a42924d99b98a961bed7b98f Mon Sep 17 00:00:00 2001
From: Patrick Storz <eduard.braun2@gmx.de>
Date: Tue, 28 May 2019 23:00:01 +0200
Subject: CMake/MSYS2: Update dependencies (add libpdcurses)

---
 CMakeScripts/InstallMSYS2.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index 4c5e38731..b6456e533 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -84,6 +84,7 @@ if(WIN32)
     ${MINGW_BIN}/libpangomm-1.4-[0-9]*.dll
     ${MINGW_BIN}/libpangowin32-1.0-[0-9]*.dll
     ${MINGW_BIN}/libpcre-[0-9]*.dll
+    ${MINGW_BIN}/libpdcurses.dll
     ${MINGW_BIN}/libpixman-1-[0-9]*.dll
     ${MINGW_BIN}/libplc[0-9]*.dll
     ${MINGW_BIN}/libplds[0-9]*.dll
@@ -94,7 +95,6 @@ if(WIN32)
     ${MINGW_BIN}/libpsl-[0-9]*.dll
     ${MINGW_BIN}/libquadmath-[0-9]*.dll
     ${MINGW_BIN}/libraqm-[0-9]*.dll
-    ${MINGW_BIN}/libreadline[0-9]*.dll
     ${MINGW_BIN}/librevenge-0.[0-9]*.dll
     ${MINGW_BIN}/librevenge-stream-0.[0-9]*.dll
     ${MINGW_BIN}/librsvg-2-[0-9]*.dll
@@ -117,13 +117,13 @@ if(WIN32)
     ${MINGW_BIN}/libxml2-[0-9]*.dll
     ${MINGW_BIN}/libxslt-[0-9]*.dll
     ${MINGW_BIN}/libyaml-0-[0-9]*.dll
+    ${MINGW_BIN}/libzstd.dll
     ${MINGW_BIN}/nss[0-9]*.dll
     ${MINGW_BIN}/nssutil[0-9]*.dll
     ${MINGW_BIN}/smime[0-9]*.dll
     ${MINGW_BIN}/tcl[0-9]*.dll
     ${MINGW_BIN}/tk[0-9]*.dll
-    ${MINGW_BIN}/zlib1.dll
-    ${MINGW_BIN}/libzstd.dll)
+    ${MINGW_BIN}/zlib1.dll)
   INSTALL(FILES ${MINGW_LIBS} DESTINATION .)
   # There are differences for 64-Bit and 32-Bit build environments.
   if(HAVE_MINGW64)
-- 
cgit v1.2.3


From d66a11f144601d1bb2fb0007e3e4463a393b6bd3 Mon Sep 17 00:00:00 2001
From: Thomas Holder <thomas@thomas-holder.de>
Date: Wed, 29 May 2019 19:28:02 +0000
Subject: macOS: gtk-mac-integration

---
 CMakeScripts/DefineDependsandFlags.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index e1f6ca2b9..1ab70106b 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -211,6 +211,12 @@ else()
     set(LPE_ENABLE_TEST_EFFECTS OFF)
 endif()
 
+if(APPLE)
+    pkg_check_modules(MacIntegration REQUIRED gtk-mac-integration-gtk3)
+    list(APPEND INKSCAPE_INCS_SYS ${MacIntegration_INCLUDE_DIRS})
+    list(APPEND INKSCAPE_LIBS ${MacIntegration_LIBRARIES})
+endif()
+
 # ----------------------------------------------------------------------------
 # CMake's builtin
 # ----------------------------------------------------------------------------
-- 
cgit v1.2.3


From b56b894b55ceff922dedbb13782d01a97228b0f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rene=CC=81=20de=20Hesselle?= <dehesselle@web.de>
Date: Sat, 1 Jun 2019 00:49:15 +0200
Subject: Include more feature libraries

- gtkspell
- libyaml
- cppunit
- librevenge
- libcdr
- ImageMagick 6
- OpenMP
---
 CMakeScripts/DefineDependsandFlags.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 1ab70106b..73e15fbb1 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -284,8 +284,8 @@ if(WITH_OPENMP)
     if(OPENMP_FOUND)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
         list(APPEND INKSCAPE_CXX_FLAGS  ${OpenMP_CXX_FLAGS})
-        if(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode")
-            set(CMAKE_XCODE_ATTRIBUTE_ENABLE_OPENMP_SUPPORT "YES")
+        if(APPLE)
+            list(APPEND INKSCAPE_LIBS "-lomp")
         endif()
         mark_as_advanced(OpenMP_C_FLAGS)
         mark_as_advanced(OpenMP_CXX_FLAGS)
-- 
cgit v1.2.3


From 6edc3e959fff0d576547582a708a6a43e74285ab Mon Sep 17 00:00:00 2001
From: Thomas Holder <thomas@thomas-holder.de>
Date: Sun, 2 Jun 2019 22:49:02 +0200
Subject: Fix linking for Homebrew (macOS)

Supersedes !710
---
 CMakeScripts/DefineDependsandFlags.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 73e15fbb1..e0afe784d 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -214,7 +214,7 @@ endif()
 if(APPLE)
     pkg_check_modules(MacIntegration REQUIRED gtk-mac-integration-gtk3)
     list(APPEND INKSCAPE_INCS_SYS ${MacIntegration_INCLUDE_DIRS})
-    list(APPEND INKSCAPE_LIBS ${MacIntegration_LIBRARIES})
+    list(APPEND INKSCAPE_LIBS ${MacIntegration_LDFLAGS})
 endif()
 
 # ----------------------------------------------------------------------------
-- 
cgit v1.2.3