From 698ffe5d25c5400acfa787b47dfd9f9455664b80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= <me@dawidwrobel.com>
Date: Sat, 4 Sep 2021 07:20:10 +0200
Subject: [kf5solid] Fix CMake config; some extra fixes (#19810)

* [kf5solid] require bison >= 3.0

* [kf5solid] fix CMake config file

* [kf5solid] some apps actually use solid-hardware5

diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake
index b876b00c0..53cf1841b 100644
--- a/ports/kf5solid/portfile.cmake
+++ b/ports/kf5solid/portfile.cmake
@@ -44,6 +44,11 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Solid)
 vcpkg_copy_pdbs()

+vcpkg_copy_tools(
+      TOOL_NAMES solid-hardware5
+      AUTO_CLEAN
+ )
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
@@ -51,9 +56,6 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-# solid-hardware and solid-power are a non-dev tools allowing to list hardware and power managament status of one's system. No need to keep them.
-file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-hardware5${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/solid-power${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml")
 file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qml" "${CURRENT_PACKAGES_DIR}/qml")

* [kf5solid] /etc is empty, no need to remove it

* [kf5solid] add PACKAGE_NAME to vcpkg_cmake_config_fixup

* [kf5solid] update versions
---
 versions/baseline.json    | 2 +-
 versions/k-/kf5solid.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'versions')

diff --git a/versions/baseline.json b/versions/baseline.json
index 6124d1169..d33a0c6b1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2962,7 +2962,7 @@
     },
     "kf5solid": {
       "baseline": "5.84.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5sonnet": {
       "baseline": "5.84.0",
diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json
index a47818aa8..e449cf699 100644
--- a/versions/k-/kf5solid.json
+++ b/versions/k-/kf5solid.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1f726a86d2961fd90661f27469d1e77b2b75c612",
+      "version-semver": "5.84.0",
+      "port-version": 1
+    },
     {
       "git-tree": "4ddc168b71ca68e8c765edca7a018753871b84e6",
       "version-semver": "5.84.0",
-- 
cgit v1.2.3