Re: [PR PATCH] [Updated] build-style cmake: change CMAKE_FIND_ROOT_PATH to $XBPS_CROSS_BASE/usr

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1423 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages build-style-cmake-cross-root-path
https://github.com/void-linux/void-packages/pull/26552

build-style cmake: change CMAKE_FIND_ROOT_PATH to $XBPS_CROSS_BASE/usr
Building `nomacs` without this change reveals the brokenness.

```
CMake Error at /usr/arm-linux-gnueabihf/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:14 (message):
  The imported target "Qt5::Core" references the file

     "/usr/arm-linux-gnueabihf/../usr/lib/qt5//mkspecs/linux-g++"

  but this file does not exist.  Possible reasons include:

  * The file was deleted, renamed, or moved to another location.

  * An install or uninstall procedure did not complete successfully.

  * The installation package was faulty and contained

     "/usr/arm-linux-gnueabihf/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake"

  but not all the files it references.

Call Stack (most recent call first):
  /usr/arm-linux-gnueabihf/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake:55 (_qt5_Core_check_file_exists)
  /usr/arm-linux-gnueabihf/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:232 (include)
  /usr/arm-linux-gnueabihf/lib/cmake/Qt5/Qt5Config.cmake:28 (find_package)
  cmake/Utils.cmake:21 (find_package)
  CMakeLists.txt:110 (NMC_FINDQT)
```

A patch file from https://github.com/void-linux/void-packages/pull/26552.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-build-style-cmake-cross-root-path-26552.patch --]
[-- Type: text/x-diff, Size: 4371 bytes --]

From 75ec102f764264891b3595998ab30f3e13319004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 12:14:37 +0700
Subject: [PATCH 1/2] build-style/cmake: set find_root_path to cross_base/usr

Close: #26552
---
 common/build-style/cmake.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh
index fbbb6a8d950..9ffc9c1cf20 100644
--- a/common/build-style/cmake.sh
+++ b/common/build-style/cmake.sh
@@ -14,7 +14,7 @@ SET(CMAKE_SYSTEM_VERSION 1)
 SET(CMAKE_C_COMPILER   ${CC})
 SET(CMAKE_CXX_COMPILER ${CXX})
 
-SET(CMAKE_FIND_ROOT_PATH  ${XBPS_MASTERDIR})
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_MASTERDIR}/usr;${XBPS_MASTERDIR})
 
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
@@ -46,7 +46,7 @@ SET(CMAKE_CROSSCOMPILING TRUE)
 
 SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
 
-SET(CMAKE_FIND_ROOT_PATH  ${XBPS_CROSS_BASE})
+SET(CMAKE_FIND_ROOT_PATH  "${XBPS_CROSS_BASE}/usr;${XBPS_CROSS_BASE}")
 
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)

From bc281969567ae8a06a1002c61f6beef24ae427d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 11:18:17 +0700
Subject: [PATCH 2/2] nomacs: update to 3.16.224.

---
 srcpkgs/nomacs/patches/fix-build.patch | 39 --------------------------
 srcpkgs/nomacs/template                |  9 +++---
 srcpkgs/nomacs/update                  |  1 +
 3 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 srcpkgs/nomacs/patches/fix-build.patch
 create mode 100644 srcpkgs/nomacs/update

diff --git a/srcpkgs/nomacs/patches/fix-build.patch b/srcpkgs/nomacs/patches/fix-build.patch
deleted file mode 100644
index d927eaf523f..00000000000
--- a/srcpkgs/nomacs/patches/fix-build.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001
-From: Michael Palimaka <kensington@gentoo.org>
-Date: Sun, 9 Jun 2019 19:15:28 +1000
-Subject: [PATCH] Fix build with GCC9
-
----
- ImageLounge/src/DkCore/DkMetaData.cpp | 2 ++
- ImageLounge/src/DkGui/DkNoMacs.cpp    | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git ImageLounge/src/DkCore/DkMetaData.cpp ImageLounge/src/DkCore/DkMetaData.cpp
-index d195757e..affec7be 100644
---- ImageLounge/src/DkCore/DkMetaData.cpp
-+++ ImageLounge/src/DkCore/DkMetaData.cpp
-@@ -42,6 +42,8 @@
- #include <QApplication>
- #pragma warning(pop)		// no warnings from includes - end
- 
-+#include <iostream>
-+
- namespace nmc {
- 
- // DkMetaDataT --------------------------------------------------------------------
-diff --git ImageLounge/src/DkGui/DkNoMacs.cpp ImageLounge/src/DkGui/DkNoMacs.cpp
-index 6a412f70..bbfba233 100644
---- ImageLounge/src/DkGui/DkNoMacs.cpp
-+++ ImageLounge/src/DkGui/DkNoMacs.cpp
-@@ -96,6 +96,8 @@
- #include <QWinTaskbarButton>
- #endif
- 
-+#include <iostream>
-+
- namespace nmc {
- 
- DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) : QObject(parent) {
--- 
-2.23.0
-
diff --git a/srcpkgs/nomacs/template b/srcpkgs/nomacs/template
index 7f825a118c7..529e86aa504 100644
--- a/srcpkgs/nomacs/template
+++ b/srcpkgs/nomacs/template
@@ -1,10 +1,11 @@
 # Template file for 'nomacs'
 pkgname=nomacs
-version=3.12
-revision=3
+version=3.16.224
+revision=1
 build_wrksrc=ImageLounge
 build_style=cmake
-configure_args="-DENABLE_TRANSLATIONS=1 -DUSE_SYSTEM_QUAZIP=1"
+configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_TRANSLATIONS=1
+ -DUSE_SYSTEM_QUAZIP=1"
 hostmakedepends="pkg-config qt5-qmake qt5-host-tools quazip-devel"
 makedepends="qt5-tools-devel qt5-svg-devel exiv2-devel libopencv-devel
  libraw-devel quazip-devel"
@@ -13,4 +14,4 @@ maintainer="Kharlamov Alexey <der@2-47.ru>"
 license="GPL-3.0-or-later"
 homepage="https://nomacs.org/"
 distfiles="https://github.com/nomacs/nomacs/archive/${version}.tar.gz"
-checksum=f4a32169e6c0cb939971da2732e4d67c6e2e649506da1b55bfc94963a26280ff
+checksum=bbc7e9048026ef9e0d2b64902c88050f17a679ef3d3c009de2c3b7de5d1d217c
diff --git a/srcpkgs/nomacs/update b/srcpkgs/nomacs/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/nomacs/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"