From 79e99693a8478b8517c5afdbf75f75c0d7313918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 10 Sep 2020 22:01:29 -0400
Subject: [PATCH 01/36] Add kf5iconthemes port

---
 ports/kf5iconthemes/CONTROL                   |  5 +++
 .../add-missing-kf5guiaddons-dependency.patch | 12 +++++++
 ports/kf5iconthemes/portfile.cmake            | 34 +++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 ports/kf5iconthemes/CONTROL
 create mode 100644 ports/kf5iconthemes/add-missing-kf5guiaddons-dependency.patch
 create mode 100644 ports/kf5iconthemes/portfile.cmake

diff --git a/ports/kf5iconthemes/CONTROL b/ports/kf5iconthemes/CONTROL
new file mode 100644
index 00000000000000..d2080816abfcdf
--- /dev/null
+++ b/ports/kf5iconthemes/CONTROL
@@ -0,0 +1,5 @@
+Source: kf5iconthemes
+Version: 5.73.0
+Homepage: https://api.kde.org/frameworks/kiconthemes/html/index.html
+Description: Icon GUI utilities
+Build-Depends: ecm, qt5-base, qt5-tools, qt5-svg, kf5archive, kf5i18n, kf5coreaddons, kf5guiaddons, kf5configwidgets, kf5widgetsaddons, kf5itemviews
diff --git a/ports/kf5iconthemes/add-missing-kf5guiaddons-dependency.patch b/ports/kf5iconthemes/add-missing-kf5guiaddons-dependency.patch
new file mode 100644
index 00000000000000..3fb30a09ad4468
--- /dev/null
+++ b/ports/kf5iconthemes/add-missing-kf5guiaddons-dependency.patch
@@ -0,0 +1,12 @@
+ --git a/CMakeLists.txt b/CMakeLists.txt
+index 34642613ae2dc692769f36c9f578eaa280d3545a..7fa4be6afd7bdce728731000c570e8cac1a78c29 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,6 +51,7 @@ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
+ find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
++find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
+ 
+ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
+ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
new file mode 100644
index 00000000000000..9e9f6ecadaff32
--- /dev/null
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -0,0 +1,34 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kiconthemes
+    REF v5.73.0
+    SHA512 bf43c8848a9f4e698b90e45e399a34486a54f7cca1423eb6a3c57f82ae811afb078aaf06ce606f9b698f6622740b6a7ecca646560a8e54a5718f7108ca92620c
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS 
+        -DBUILD_HTML_DOCS=OFF
+        -DBUILD_MAN_DOCS=OFF
+        -DBUILD_QTHELP_DOCS=OFF
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5IconThemes)
+
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")	
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")	
+endif()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc)
+file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

From af062f121f887b4c777739e3cf32e1f48d288054 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 10 Sep 2020 22:10:55 -0400
Subject: [PATCH 02/36] kf5iconthemes: add missing PATCH directive

---
 ports/kf5iconthemes/portfile.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 9e9f6ecadaff32..727204230cf081 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF v5.73.0
     SHA512 bf43c8848a9f4e698b90e45e399a34486a54f7cca1423eb6a3c57f82ae811afb078aaf06ce606f9b698f6622740b6a7ecca646560a8e54a5718f7108ca92620c
     HEAD_REF master
+    PATCHES 
+        "add-missing-kf5guiaddons-dependency.patch"
 )
 
 vcpkg_configure_cmake(

From 24706a8f8ac93369f87f49fda137b03d03ec32bb Mon Sep 17 00:00:00 2001
From: Kuntal Majumder <hellozee@disroot.org>
Date: Tue, 15 Sep 2020 11:05:23 +0530
Subject: [PATCH 03/36] Fix Kf5Iconthemes for windows:

---
 ports/kf5iconthemes/portfile.cmake | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 727204230cf081..ed97a5605b29b8 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -8,6 +8,10 @@ vcpkg_from_github(
         "add-missing-kf5guiaddons-dependency.patch"
 )
 
+vcpkg_find_acquire_program(GETTEXT_MSGMERGE)
+get_filename_component(GETTEXT_MSGMERGE_EXE_PATH ${GETTEXT_MSGMERGE} DIRECTORY)
+vcpkg_add_to_path(${GETTEXT_MSGMERGE_EXE_PATH})
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
@@ -16,6 +20,8 @@ vcpkg_configure_cmake(
         -DBUILD_MAN_DOCS=OFF
         -DBUILD_QTHELP_DOCS=OFF
         -DBUILD_TESTING=OFF
+        -DKDE_INSTALL_QTPLUGINDIR=plugins
+        -DKDE_INSTALL_DATAROOTDIR=data
 )
 
 vcpkg_install_cmake()
@@ -24,7 +30,9 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5IconThemes)
 vcpkg_copy_pdbs()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")	
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")	
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+elseif(VCPKG_TARGET_IS_WINDOWS)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/kiconfinder5.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/kiconfinder5.exe")
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data)

From 1bc6cf44c38389146cf86f0f802e0cfff3bfaf7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Mon, 9 Nov 2020 20:21:22 -0500
Subject: [PATCH 04/36] [kf5*] update to 5.75.0

---
 ports/kf5iconthemes/CONTROL        | 2 +-
 ports/kf5iconthemes/portfile.cmake | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/kf5iconthemes/CONTROL b/ports/kf5iconthemes/CONTROL
index d2080816abfcdf..86f85eff05a7ac 100644
--- a/ports/kf5iconthemes/CONTROL
+++ b/ports/kf5iconthemes/CONTROL
@@ -1,5 +1,5 @@
 Source: kf5iconthemes
-Version: 5.73.0
+Version: 5.75.0
 Homepage: https://api.kde.org/frameworks/kiconthemes/html/index.html
 Description: Icon GUI utilities
 Build-Depends: ecm, qt5-base, qt5-tools, qt5-svg, kf5archive, kf5i18n, kf5coreaddons, kf5guiaddons, kf5configwidgets, kf5widgetsaddons, kf5itemviews
diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index ed97a5605b29b8..1c050fe1a6f237 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kiconthemes
-    REF v5.73.0
-    SHA512 bf43c8848a9f4e698b90e45e399a34486a54f7cca1423eb6a3c57f82ae811afb078aaf06ce606f9b698f6622740b6a7ecca646560a8e54a5718f7108ca92620c
+    REF v5.75.0
+    SHA512 106c56d995193696cccb74abacf1d2553af7a0a330f3d5bbf002c893b6adb28c429b140c61fca52c62d1a29a1091a0963295ef4141b705cec57ebce1a6096477
     HEAD_REF master
     PATCHES 
         "add-missing-kf5guiaddons-dependency.patch"
@@ -41,4 +41,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc)
-file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
\ No newline at end of file

From aff2f5ebad316258986aa754a4d2285af5bd1c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Fri, 5 Mar 2021 21:22:29 -0400
Subject: [PATCH 05/36] [kf5iconthemes] convert CONTROL to manifest

---
 ports/kf5iconthemes/CONTROL    |  5 -----
 ports/kf5iconthemes/vcpkg.json | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)
 delete mode 100644 ports/kf5iconthemes/CONTROL
 create mode 100644 ports/kf5iconthemes/vcpkg.json

diff --git a/ports/kf5iconthemes/CONTROL b/ports/kf5iconthemes/CONTROL
deleted file mode 100644
index 86f85eff05a7ac..00000000000000
--- a/ports/kf5iconthemes/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: kf5iconthemes
-Version: 5.75.0
-Homepage: https://api.kde.org/frameworks/kiconthemes/html/index.html
-Description: Icon GUI utilities
-Build-Depends: ecm, qt5-base, qt5-tools, qt5-svg, kf5archive, kf5i18n, kf5coreaddons, kf5guiaddons, kf5configwidgets, kf5widgetsaddons, kf5itemviews
diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
new file mode 100644
index 00000000000000..9dae255c3de591
--- /dev/null
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "name": "kf5iconthemes",
+  "version-string": "5.75.0",
+  "description": "Icon GUI utilities",
+  "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html",
+  "dependencies": [
+    "ecm",
+    "kf5archive",
+    "kf5configwidgets",
+    "kf5coreaddons",
+    "kf5guiaddons",
+    "kf5i18n",
+    "kf5itemviews",
+    "kf5widgetsaddons",
+    "qt5-base",
+    "qt5-svg",
+    "qt5-tools"
+  ]
+}

From 16b3cd397949ced8983807ce2a2d82701d933881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 10:47:01 +0200
Subject: [PATCH 06/36] [kf5iconthemes] update to current spec

---
 ports/kf5iconthemes/portfile.cmake | 12 +++---------
 ports/kf5iconthemes/vcpkg.json     | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 1c050fe1a6f237..7c113b4ad255bd 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -8,13 +8,8 @@ vcpkg_from_github(
         "add-missing-kf5guiaddons-dependency.patch"
 )
 
-vcpkg_find_acquire_program(GETTEXT_MSGMERGE)
-get_filename_component(GETTEXT_MSGMERGE_EXE_PATH ${GETTEXT_MSGMERGE} DIRECTORY)
-vcpkg_add_to_path(${GETTEXT_MSGMERGE_EXE_PATH})
-
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS 
         -DBUILD_HTML_DOCS=OFF
         -DBUILD_MAN_DOCS=OFF
@@ -24,9 +19,8 @@ vcpkg_configure_cmake(
         -DKDE_INSTALL_DATAROOTDIR=data
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5IconThemes)
-
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5IconThemes)
 vcpkg_copy_pdbs()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")	
diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index 9dae255c3de591..059791fe72e3db 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -5,6 +5,14 @@
   "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html",
   "dependencies": [
     "ecm",
+    "gettext",
+     {
+       "name": "gettext",
+       "host": true,
+       "features": [
+         "tools"
+       ]
+     },
     "kf5archive",
     "kf5configwidgets",
     "kf5coreaddons",
@@ -14,6 +22,14 @@
     "kf5widgetsaddons",
     "qt5-base",
     "qt5-svg",
-    "qt5-tools"
+    "qt5-tools",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }

From c0d7985bb9601e510e7b425db445baa45196f268 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 10:47:24 +0200
Subject: [PATCH 07/36] [kf5iconthemes] use semVer

---
 ports/kf5iconthemes/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index 059791fe72e3db..b5cfcac724c5cc 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5iconthemes",
-  "version-string": "5.75.0",
+  "version-semver": "5.75.0",
   "description": "Icon GUI utilities",
   "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html",
   "dependencies": [

From a1d1cfd93cf03060f07dffd762ee3087808a9071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 11:06:08 +0200
Subject: [PATCH 08/36] [kf5iconthemes] remove extraneous options

---
 ports/kf5iconthemes/portfile.cmake | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 7c113b4ad255bd..f0650431fcd66c 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -11,12 +11,7 @@ vcpkg_from_github(
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS 
-        -DBUILD_HTML_DOCS=OFF
-        -DBUILD_MAN_DOCS=OFF
-        -DBUILD_QTHELP_DOCS=OFF
         -DBUILD_TESTING=OFF
-        -DKDE_INSTALL_QTPLUGINDIR=plugins
-        -DKDE_INSTALL_DATAROOTDIR=data
 )
 
 vcpkg_cmake_install()

From c66afead4599df60b2310d1ff3fa778e583f1b24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 11:09:41 +0200
Subject: [PATCH 09/36] [kf5iconthemes] update to 5.84

---
 .../add-missing-kf5guiaddons-dependency.patch        | 12 ------------
 ports/kf5iconthemes/portfile.cmake                   | 10 ++++------
 ports/kf5iconthemes/vcpkg.json                       |  2 +-
 3 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 ports/kf5iconthemes/add-missing-kf5guiaddons-dependency.patch

diff --git a/ports/kf5iconthemes/add-missing-kf5guiaddons-dependency.patch b/ports/kf5iconthemes/add-missing-kf5guiaddons-dependency.patch
deleted file mode 100644
index 3fb30a09ad4468..00000000000000
--- a/ports/kf5iconthemes/add-missing-kf5guiaddons-dependency.patch
+++ /dev/null
@@ -1,12 +0,0 @@
- --git a/CMakeLists.txt b/CMakeLists.txt
-index 34642613ae2dc692769f36c9f578eaa280d3545a..7fa4be6afd7bdce728731000c570e8cac1a78c29 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,6 +51,7 @@ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED)
- find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED)
-+find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED)
- 
- remove_definitions(-DQT_NO_CAST_FROM_ASCII)
- remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index f0650431fcd66c..9556f0d9b662c2 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -1,16 +1,14 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kiconthemes
-    REF v5.75.0
-    SHA512 106c56d995193696cccb74abacf1d2553af7a0a330f3d5bbf002c893b6adb28c429b140c61fca52c62d1a29a1091a0963295ef4141b705cec57ebce1a6096477
+    REF v5.84.0
+    SHA512 ca5645d6e4fde4f60c6f16c911539f4056060cc22afae275459632bc7069352b068b1727eb75b898d319e6eef3df9ddc35d8e22d4c1d05a657b112378e56731e
     HEAD_REF master
-    PATCHES 
-        "add-missing-kf5guiaddons-dependency.patch"
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS 
+    OPTIONS
         -DBUILD_TESTING=OFF
 )
 
@@ -18,7 +16,7 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5IconThemes)
 vcpkg_copy_pdbs()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")	
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 elseif(VCPKG_TARGET_IS_WINDOWS)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/kiconfinder5.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/kiconfinder5.exe")
diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index b5cfcac724c5cc..a761e0c9500dc3 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5iconthemes",
-  "version-semver": "5.75.0",
+  "version-semver": "5.84.0",
   "description": "Icon GUI utilities",
   "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html",
   "dependencies": [

From 826221f4a795ff338850a54374d9e20bc5b227fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 11:22:25 +0200
Subject: [PATCH 10/36] [kf5iconthemes] use vcpkg_copy_tools()

---
 ports/kf5iconthemes/portfile.cmake | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 9556f0d9b662c2..74a9c8cbdc5acd 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -16,10 +16,20 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5IconThemes)
 vcpkg_copy_pdbs()
 
+vcpkg_copy_tools( 
+    TOOL_NAMES kiconfinder5
+    AUTO_CLEAN
+)
+
+if(VCPKG_TARGET_IS_OSX)
+    vcpkg_copy_tools( 
+        TOOL_NAMES ksvg2icns
+        AUTO_CLEAN
+    )
+endif()
+
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-elseif(VCPKG_TARGET_IS_WINDOWS)
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/kiconfinder5.exe" "${CURRENT_PACKAGES_DIR}/debug/bin/kiconfinder5.exe")
 endif()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data)

From 6c9d1171b8404f65e890abe3b549698bdd67aa7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 11:23:54 +0200
Subject: [PATCH 11/36] [kf5iconthemes] only remove what's needed

---
 ports/kf5iconthemes/portfile.cmake | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 74a9c8cbdc5acd..0a58d46206e465 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -16,13 +16,13 @@ vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5IconThemes)
 vcpkg_copy_pdbs()
 
-vcpkg_copy_tools( 
+vcpkg_copy_tools(
     TOOL_NAMES kiconfinder5
     AUTO_CLEAN
 )
 
 if(VCPKG_TARGET_IS_OSX)
-    vcpkg_copy_tools( 
+    vcpkg_copy_tools(
         TOOL_NAMES ksvg2icns
         AUTO_CLEAN
     )
@@ -32,10 +32,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc)
 file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
\ No newline at end of file

From 4e0c2a139e9d4f822bed44e9bef1cdba2cafb25f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 11:27:22 +0200
Subject: [PATCH 12/36] [kf5iconthemes] wrap paths in quotes

---
 ports/kf5iconthemes/portfile.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 0a58d46206e465..ed80d6ea266d14 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
 )
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
 )
@@ -32,6 +32,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
\ No newline at end of file
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
\ No newline at end of file

From 8b6ef23ed7696105782feb5c11565520409645e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 11:31:22 +0200
Subject: [PATCH 13/36] [kf5iconthemes] update versions

---
 versions/baseline.json         | 4 ++++
 versions/k-/kf5iconthemes.json | 9 +++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 versions/k-/kf5iconthemes.json

diff --git a/versions/baseline.json b/versions/baseline.json
index 03050a42de3eb9..9fecc4ee4a4232 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2968,6 +2968,10 @@
       "baseline": "5.84.0",
       "port-version": 2
     },
+    "kf5iconthemes": {
+      "baseline": "5.84.0",
+      "port-version": 0
+    },
     "kf5itemmodels": {
       "baseline": "5.84.0",
       "port-version": 1
diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
new file mode 100644
index 00000000000000..c1c74500dcbdde
--- /dev/null
+++ b/versions/k-/kf5iconthemes.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "15e38528dc96879da09c94ccaf731005daf3c1f6",
+      "version-semver": "5.84.0",
+      "port-version": 0
+    }
+  ]
+}

From 5c0a63be4294c107ca600871998afdd96ec13111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 11:32:42 +0200
Subject: [PATCH 14/36] [kf5iconthemes] DISABLE_PARALLEL_CONFIGURE

---
 ports/kf5iconthemes/portfile.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index ed80d6ea266d14..351729aafd2c17 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
 )
 
 vcpkg_cmake_configure(
+    DISABLE_PARALLEL_CONFIGURE
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF

From 4a33787e29e53a69d228d0ded28f1013059e1be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 11:32:52 +0200
Subject: [PATCH 15/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index c1c74500dcbdde..301713f1659d84 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "15e38528dc96879da09c94ccaf731005daf3c1f6",
+      "git-tree": "5fd63e3d0747a6c3ba2e2f277acbd2e4129b7762",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From 93dbfc8641cc3a2f86cc33b6028f7699493c5a33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 12:41:06 +0200
Subject: [PATCH 16/36] [kf5iconthemes] Add support for static builds

---
 ports/kf5iconthemes/39.patch       | 38 ++++++++++++++++++++++++++++++
 ports/kf5iconthemes/portfile.cmake |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 ports/kf5iconthemes/39.patch

diff --git a/ports/kf5iconthemes/39.patch b/ports/kf5iconthemes/39.patch
new file mode 100644
index 00000000000000..6fa107c37b2860
--- /dev/null
+++ b/ports/kf5iconthemes/39.patch
@@ -0,0 +1,38 @@
+From 2d9a393978ff6ae9c5577a3595cd761b199dc4fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
+Date: Thu, 26 Aug 2021 12:06:54 +0200
+Subject: [PATCH] Add support for static builds
+
+---
+ KF5IconThemesConfig.cmake.in | 15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+diff --git a/KF5IconThemesConfig.cmake.in b/KF5IconThemesConfig.cmake.in
+index 79688bb..d91f546 100644
+--- a/KF5IconThemesConfig.cmake.in
++++ b/KF5IconThemesConfig.cmake.in
+@@ -3,6 +3,21 @@
+ include(CMakeFindDependencyMacro)
+ find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@")
+ 
++if (NOT @BUILD_SHARED_LIBS@)
++    find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@")
++    find_dependency(Qt5Svg "@REQUIRED_QT_VERSION@")
++
++    if (NOT ANDROID)
++        find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@")
++    endif()
++
++    find_dependency(KF5Archive "@KF_DEP_VERSION@")
++    find_dependency(KF5I18n "@KF_DEP_VERSION@")
++    find_dependency(KF5CoreAddons "@KF_DEP_VERSION@")
++    find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@")
++    find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@")
++    find_dependency(KF5ItemViews "@KF_DEP_VERSION@")
++endif()
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5IconThemesTargets.cmake")
+ @PACKAGE_INCLUDE_QCHTARGETS@
+-- 
+GitLab
+
diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 351729aafd2c17..2a97ea58ef48ef 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -4,6 +4,8 @@ vcpkg_from_github(
     REF v5.84.0
     SHA512 ca5645d6e4fde4f60c6f16c911539f4056060cc22afae275459632bc7069352b068b1727eb75b898d319e6eef3df9ddc35d8e22d4c1d05a657b112378e56731e
     HEAD_REF master
+    PATCHES
+        39.patch
 )
 
 vcpkg_cmake_configure(

From c9a7f1fa3616133054361b4d0288fdbf035cc7ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 12:42:51 +0200
Subject: [PATCH 17/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 301713f1659d84..5c75ac89b4f95e 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "5fd63e3d0747a6c3ba2e2f277acbd2e4129b7762",
+      "git-tree": "a34b5beea612f36368ba352aab740da326efb961",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From 312937184cee05c15b8c20944dae35c8ea682145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 13:50:36 +0200
Subject: [PATCH 18/36] [kf5iconthemes] reformat vcpkg.json

---
 ports/kf5iconthemes/vcpkg.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index a761e0c9500dc3..850330d2f793ad 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -6,13 +6,13 @@
   "dependencies": [
     "ecm",
     "gettext",
-     {
-       "name": "gettext",
-       "host": true,
-       "features": [
-         "tools"
-       ]
-     },
+    {
+      "name": "gettext",
+      "host": true,
+      "features": [
+        "tools"
+      ]
+    },
     "kf5archive",
     "kf5configwidgets",
     "kf5coreaddons",

From 536b42a7dc0c0df4f6e77d37529ece12fd86a3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 13:50:46 +0200
Subject: [PATCH 19/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 5c75ac89b4f95e..6f0573b943cf59 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a34b5beea612f36368ba352aab740da326efb961",
+      "git-tree": "b2e32e06e2099ddbb1ecc065377899fda5e726a3",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From 22e32724b4bd8748375f5e77e9fabd6f11291628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 16:23:55 +0200
Subject: [PATCH 20/36] [kf5iconthemes] add Qt Designer plugin feature

---
 ports/kf5iconthemes/portfile.cmake | 9 +++++++++
 ports/kf5iconthemes/vcpkg.json     | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 2a97ea58ef48ef..80443be88f1d83 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -8,11 +8,20 @@ vcpkg_from_github(
         39.patch
 )
 
+vcpkg_check_features(
+     OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+     FEATURES
+         designerplugin BUILD_DESIGNERPLUGIN
+ )
+
 vcpkg_cmake_configure(
     DISABLE_PARALLEL_CONFIGURE
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
+        -DKDE_INSTALL_PLUGINDIR=plugins
+        -DKDE_INSTALL_QTPLUGINDIR=plugins
+    ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index 850330d2f793ad..c6fd72923cae76 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -31,5 +31,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "designerplugin": {
+      "description": "Enables a Qt Designer plugin"
+    }
+  }
 }

From e7768d36af29e9bf889e171ff621d3c7dd96e4e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 16:24:34 +0200
Subject: [PATCH 21/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 6f0573b943cf59..eee044ea2d85bb 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b2e32e06e2099ddbb1ecc065377899fda5e726a3",
+      "git-tree": "b6e95f2fce2b7aa9aaf81fbce8ecba0786122ec2",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From fd4b2edbe2776f003a9e1c9105ccd793d3c63756 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 17:26:43 +0200
Subject: [PATCH 22/36] [kf5iconthemes] add libiconv dependency

---
 ports/kf5iconthemes/vcpkg.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index c6fd72923cae76..19d449dd587b44 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -20,6 +20,7 @@
     "kf5i18n",
     "kf5itemviews",
     "kf5widgetsaddons",
+    "libiconv",
     "qt5-base",
     "qt5-svg",
     "qt5-tools",

From a830fbe2e9869f0d178d8f403dd8f26d5ae4403f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 17:26:55 +0200
Subject: [PATCH 23/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index eee044ea2d85bb..7b8c7f1bda50f7 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "b6e95f2fce2b7aa9aaf81fbce8ecba0786122ec2",
+      "git-tree": "ced60c0300580ae6e06f69bfae450e6260f09d5b",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From 646b195f2247719dbd0ce7205cced5974cbf9873 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 20:59:36 +0200
Subject: [PATCH 24/36] [kf5iconthemes] fix Windows Static builds

---
 ports/kf5iconthemes/fix_libiconv.patch | 18 ++++++++++++++++++
 ports/kf5iconthemes/portfile.cmake     |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 ports/kf5iconthemes/fix_libiconv.patch

diff --git a/ports/kf5iconthemes/fix_libiconv.patch b/ports/kf5iconthemes/fix_libiconv.patch
new file mode 100644
index 00000000000000..2c1eea66fafecf
--- /dev/null
+++ b/ports/kf5iconthemes/fix_libiconv.patch
@@ -0,0 +1,18 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9a7bf17..744b044 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -40,9 +40,13 @@ ecm_generate_export_header(KF5IconThemes
+ 
+ target_include_directories(KF5IconThemes INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIconThemes>")
+ 
++find_package(Iconv REQUIRED)
++include_directories(${Iconv_INCLUDE_DIRS})
++
+ target_link_libraries(KF5IconThemes
+   PUBLIC
+     Qt5::Widgets
++    ${Iconv_LIBRARIES}
+   PRIVATE
+     Qt5::Svg
+     KF5::Archive       # for KCompressionDevice
diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 80443be88f1d83..9258037102b8c4 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     HEAD_REF master
     PATCHES
         39.patch
+        fix_libiconv.patch
 )
 
 vcpkg_check_features(

From 2ebdd09c23e87b0e7fdd2f68f556f1a28037e800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 26 Aug 2021 20:59:47 +0200
Subject: [PATCH 25/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 7b8c7f1bda50f7..2ee3d99c1fd94a 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "ced60c0300580ae6e06f69bfae450e6260f09d5b",
+      "git-tree": "bbf92f27d12940dc13b5a1fc01e0750f9340d1b2",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From ddf9395fec7d0e25155c40be45bb072714170178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Mon, 30 Aug 2021 16:35:50 +0200
Subject: [PATCH 26/36] [kf5iconthemes] add PACKAGE_NAME to
 vcpkg_cmake_config_fixup

---
 ports/kf5iconthemes/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 9258037102b8c4..eac4298c57887d 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -26,7 +26,7 @@ vcpkg_cmake_configure(
 )
 
 vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5IconThemes)
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5IconThemes CONFIG_PATH lib/cmake/KF5IconThemes)
 vcpkg_copy_pdbs()
 
 vcpkg_copy_tools(

From bab95979b9976ed094ab07f0b025dc07a94f2de2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Mon, 30 Aug 2021 16:36:00 +0200
Subject: [PATCH 27/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 2ee3d99c1fd94a..878bd1e661baba 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "bbf92f27d12940dc13b5a1fc01e0750f9340d1b2",
+      "git-tree": "abafb0fdbc9ebb2faee37a03cc61b3a23a137cf5",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From 055c7f11ba0239e3d5cc2c145263f1a2cd235621 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Tue, 31 Aug 2021 00:51:19 +0200
Subject: [PATCH 28/36] [kf5iconthemes] rename patch files

---
 ports/kf5iconthemes/{39.patch => fix_config_cmake.patch} | 0
 ports/kf5iconthemes/portfile.cmake                       | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename ports/kf5iconthemes/{39.patch => fix_config_cmake.patch} (100%)

diff --git a/ports/kf5iconthemes/39.patch b/ports/kf5iconthemes/fix_config_cmake.patch
similarity index 100%
rename from ports/kf5iconthemes/39.patch
rename to ports/kf5iconthemes/fix_config_cmake.patch
diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index eac4298c57887d..3c940b1967f240 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -5,7 +5,7 @@ vcpkg_from_github(
     SHA512 ca5645d6e4fde4f60c6f16c911539f4056060cc22afae275459632bc7069352b068b1727eb75b898d319e6eef3df9ddc35d8e22d4c1d05a657b112378e56731e
     HEAD_REF master
     PATCHES
-        39.patch
+        fix_config_cmake.patch
         fix_libiconv.patch
 )
 

From 40ea9804cbef578c50a0000d627802f8732e5ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Tue, 31 Aug 2021 00:52:21 +0200
Subject: [PATCH 29/36] [kf5iconthemes] libiconv patches only for windows
 static builds

---
 ports/kf5iconthemes/portfile.cmake | 10 +++++++---
 ports/kf5iconthemes/vcpkg.json     |  5 ++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 3c940b1967f240..3882b49bcd7f3d 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -1,12 +1,16 @@
+set(PATCHES fix_config_cmake.patch)
+
+if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    list(APPEND PATCHES fix_libiconv.patch)
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kiconthemes
     REF v5.84.0
     SHA512 ca5645d6e4fde4f60c6f16c911539f4056060cc22afae275459632bc7069352b068b1727eb75b898d319e6eef3df9ddc35d8e22d4c1d05a657b112378e56731e
     HEAD_REF master
-    PATCHES
-        fix_config_cmake.patch
-        fix_libiconv.patch
+    PATCHES ${PATCHES}
 )
 
 vcpkg_check_features(
diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index 19d449dd587b44..2f70c35f3acadc 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -20,7 +20,10 @@
     "kf5i18n",
     "kf5itemviews",
     "kf5widgetsaddons",
-    "libiconv",
+    {
+      "name": "libiconv",
+      "platform": "windows & static"
+    },
     "qt5-base",
     "qt5-svg",
     "qt5-tools",

From c9ee64d353e9f03321b026c0ccaaf8e968f4483e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Tue, 31 Aug 2021 00:52:31 +0200
Subject: [PATCH 30/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 878bd1e661baba..e55968102eea65 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "abafb0fdbc9ebb2faee37a03cc61b3a23a137cf5",
+      "git-tree": "c51d02e446576ad94c97729c0c2cb875b5c83f6c",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From e1317eeff79cc896a3f646d3680f4acd1eedb639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 2 Sep 2021 12:37:09 +0200
Subject: [PATCH 31/36] [kf5iconthemes] fix identation

---
 ports/kf5iconthemes/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index 3882b49bcd7f3d..bd9e28e807b1f9 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -26,7 +26,7 @@ vcpkg_cmake_configure(
         -DBUILD_TESTING=OFF
         -DKDE_INSTALL_PLUGINDIR=plugins
         -DKDE_INSTALL_QTPLUGINDIR=plugins
-    ${FEATURE_OPTIONS}
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()

From a9a7974015d87bf8da5f1d25229a3558fada772e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Thu, 2 Sep 2021 12:37:40 +0200
Subject: [PATCH 32/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index e55968102eea65..384bffaba459d7 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "c51d02e446576ad94c97729c0c2cb875b5c83f6c",
+      "git-tree": "30cf9af3f0dd3bbf482f7467cfcce2d11c5abbc9",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From a9036714d6018328a2130f0075ec89666038c42c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Tue, 7 Sep 2021 02:43:53 +0200
Subject: [PATCH 33/36] [kf5iconthemes] cleanup, iconv was fixed in kf5i18n

---
 ports/kf5iconthemes/fix_libiconv.patch | 18 ------------------
 ports/kf5iconthemes/portfile.cmake     |  9 ++-------
 ports/kf5iconthemes/vcpkg.json         |  4 ----
 3 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 ports/kf5iconthemes/fix_libiconv.patch

diff --git a/ports/kf5iconthemes/fix_libiconv.patch b/ports/kf5iconthemes/fix_libiconv.patch
deleted file mode 100644
index 2c1eea66fafecf..00000000000000
--- a/ports/kf5iconthemes/fix_libiconv.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9a7bf17..744b044 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -40,9 +40,13 @@ ecm_generate_export_header(KF5IconThemes
- 
- target_include_directories(KF5IconThemes INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KIconThemes>")
- 
-+find_package(Iconv REQUIRED)
-+include_directories(${Iconv_INCLUDE_DIRS})
-+
- target_link_libraries(KF5IconThemes
-   PUBLIC
-     Qt5::Widgets
-+    ${Iconv_LIBRARIES}
-   PRIVATE
-     Qt5::Svg
-     KF5::Archive       # for KCompressionDevice
diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index bd9e28e807b1f9..807c70528974ab 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -1,16 +1,11 @@
-set(PATCHES fix_config_cmake.patch)
-
-if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    list(APPEND PATCHES fix_libiconv.patch)
-endif()
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kiconthemes
     REF v5.84.0
     SHA512 ca5645d6e4fde4f60c6f16c911539f4056060cc22afae275459632bc7069352b068b1727eb75b898d319e6eef3df9ddc35d8e22d4c1d05a657b112378e56731e
     HEAD_REF master
-    PATCHES ${PATCHES}
+    PATCHES
+        fix_config_cmake.patch
 )
 
 vcpkg_check_features(
diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index 2f70c35f3acadc..c6fd72923cae76 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -20,10 +20,6 @@
     "kf5i18n",
     "kf5itemviews",
     "kf5widgetsaddons",
-    {
-      "name": "libiconv",
-      "platform": "windows & static"
-    },
     "qt5-base",
     "qt5-svg",
     "qt5-tools",

From 4891fcbde1117a57a29b639ec3c8b552eeae3eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Tue, 7 Sep 2021 02:44:15 +0200
Subject: [PATCH 34/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 384bffaba459d7..16386a9e16bd9d 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "30cf9af3f0dd3bbf482f7467cfcce2d11c5abbc9",
+      "git-tree": "7f56d3a79812634d1e613671e73985d8a9015816",
       "version-semver": "5.84.0",
       "port-version": 0
     }

From b01b4a936eecc936292861ad85369c0be5b20d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= <me@dawidwrobel.com>
Date: Mon, 13 Sep 2021 07:34:05 +0100
Subject: [PATCH 35/36] [kf5iconthemes] use generic, non-semver versioning

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
---
 ports/kf5iconthemes/vcpkg.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index c6fd72923cae76..d3ba8975e8ece8 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5iconthemes",
-  "version-semver": "5.84.0",
+  "version": "5.84.0",
   "description": "Icon GUI utilities",
   "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html",
   "dependencies": [

From 138f96fa0773777829803da6c9e692e9ea04231c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Mon, 13 Sep 2021 07:34:54 +0100
Subject: [PATCH 36/36] [kf5iconthemes] update versions

---
 versions/k-/kf5iconthemes.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 16386a9e16bd9d..427e272eadd0f8 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,8 +1,8 @@
 {
   "versions": [
     {
-      "git-tree": "7f56d3a79812634d1e613671e73985d8a9015816",
-      "version-semver": "5.84.0",
+      "git-tree": "969df4c5b4230e480fcffa7d71a312e869a3660d",
+      "version": "5.84.0",
       "port-version": 0
     }
   ]