[graphics/krita] 3rdparty/ext_mypaint: 3rdparty: fix LibMyPaint failing CI on Windows

[Boudewijn Rempt]

Git commit 3c45209192dece24131dfb3a603d4ed47423e5e5 by Boudewijn Rempt, on behalf of L. E. Segovia.
Committed on 23/11/2020 at 09:08.
Pushed by rempt into branch 'master'.

3rdparty: fix LibMyPaint failing CI on Windows

In a previous MR (!594) I upgraded boud's patch for LibMyPaint's build
toolchain in Windows. However, ever since then nightly builds for
Windows have been failing consistently at LibMyPaint's configure step:

> 13:28:08  CMake Error at CMakeLists.txt:67 (install):
> 13:28:08    install Library TARGETS given no DESTINATION!
> 13:28:08
> 13:28:08
> 13:28:08  -- Configuring incomplete, errors occurred!
> 13:28:08  See also "C:/Packaging/KritaDepsBuild/ext_mypaint/ext_mypaint-prefix/src/ext_mypaint-build/CMakeFiles/CMakeOutput.log".

(from
https://binary-factory.kde.org/job/Krita_Nightly_Windows_Dependency_Build/173/execution/node/17/log/
)

What I had not noticed (nor I could figure out, until I grep'd the
binary factory log) was that KDE runs CMake 3.13.2, and I had
unintentionally used a feature only available on CMake 3.14 and later:

> The install(FILES) and install(DIRECTORY) commands learned a new set
of parameters for installing files as a file type, setting the
destination based on the appropriate variables from GNUInstallDirs and
built-in defaults, in lieu of a DESTINATION argument.

(source: https://cmake.org/cmake/help/latest/release/3.14.html#commands)

This commit restores boud's original folders, while using the parameters
defined by KDEInstallDirs.

CCMAIL: kimageshop at kde.org

M  +9    -6    3rdparty/ext_mypaint/0004-cmake-Fix-relative-paths.patch

https://invent.kde.org/graphics/krita/commit/3c45209192dece24131dfb3a603d4ed47423e5e5

diff --git a/3rdparty/ext_mypaint/0004-cmake-Fix-relative-paths.patch b/3rdparty/ext_mypaint/0004-cmake-Fix-relative-paths.patch
index a8f87f34b0..254fd8c90a 100644
--- a/3rdparty/ext_mypaint/0004-cmake-Fix-relative-paths.patch
+++ b/3rdparty/ext_mypaint/0004-cmake-Fix-relative-paths.patch
@@ -1,30 +1,33 @@
-From 606e2353a9b60d6443733ed4a12453698b8d2ac8 Mon Sep 17 00:00:00 2001
+From 165c022a9ab7b6dff88f20c576b41e36991e2f99 Mon Sep 17 00:00:00 2001
 From: "L. E. Segovia" <amy at amyspark.me>
 Date: Tue, 17 Nov 2020 23:44:44 +0000
 Subject: [PATCH 4/4] cmake: Fix relative paths
 
 ---
- CMakeLists.txt | 13 +++++--------
- 1 file changed, 5 insertions(+), 8 deletions(-)
+ CMakeLists.txt | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 882e20e..fa80b3b 100644
+index 0da19e9..b99f289 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -66,11 +66,8 @@ target_link_libraries(mypaint ${JSONC_LIBRARIES})
+@@ -66,11 +66,11 @@ target_link_libraries(mypaint ${JSONC_LIBRARIES})
  set_property(TARGET mypaint PROPERTY C_STANDARD 11)
  install(TARGETS mypaint
      EXPORT libmypaintTargets
 -    RUNTIME DESTINATION bin
 -    LIBRARY DESTINATION lib
 -    ARCHIVE DESTINATION lib
++    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
  ) 
 -install(FILES ${mypaint_HEADERS} DESTINATION include)
 +install(FILES ${mypaint_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/libmypaint)
  
  if(JsonC_FOUND)
      set(PKG_CONFIG_REQUIRES "json-c")
-@@ -79,16 +76,16 @@ else()
+@@ -79,16 +79,16 @@ else()
  endif()
  configure_file("libmypaint.pc.in" "libmypaint.pc" @ONLY)
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libmypaint.pc"