Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[kf5iconthemes] new port #16567

Merged
merged 37 commits into from
Sep 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
79e9969
Add kf5iconthemes port
wrobelda Sep 11, 2020
af062f1
kf5iconthemes: add missing PATCH directive
wrobelda Sep 11, 2020
24706a8
Fix Kf5Iconthemes for windows:
hellozee Sep 15, 2020
1bc6cf4
[kf5*] update to 5.75.0
wrobelda Nov 10, 2020
aff2f5e
[kf5iconthemes] convert CONTROL to manifest
wrobelda Mar 6, 2021
16b3cd3
[kf5iconthemes] update to current spec
wrobelda Aug 26, 2021
c0d7985
[kf5iconthemes] use semVer
wrobelda Aug 26, 2021
a1d1cfd
[kf5iconthemes] remove extraneous options
wrobelda Aug 26, 2021
c66afea
[kf5iconthemes] update to 5.84
wrobelda Aug 26, 2021
826221f
[kf5iconthemes] use vcpkg_copy_tools()
wrobelda Aug 26, 2021
6c9d117
[kf5iconthemes] only remove what's needed
wrobelda Aug 26, 2021
4e0c2a1
[kf5iconthemes] wrap paths in quotes
wrobelda Aug 26, 2021
8b6ef23
[kf5iconthemes] update versions
wrobelda Aug 26, 2021
5c0a63b
[kf5iconthemes] DISABLE_PARALLEL_CONFIGURE
wrobelda Aug 26, 2021
4a33787
[kf5iconthemes] update versions
wrobelda Aug 26, 2021
93dbfc8
[kf5iconthemes] Add support for static builds
wrobelda Aug 26, 2021
c9a7f1f
[kf5iconthemes] update versions
wrobelda Aug 26, 2021
3129371
[kf5iconthemes] reformat vcpkg.json
wrobelda Aug 26, 2021
536b42a
[kf5iconthemes] update versions
wrobelda Aug 26, 2021
22e3272
[kf5iconthemes] add Qt Designer plugin feature
wrobelda Aug 26, 2021
e7768d3
[kf5iconthemes] update versions
wrobelda Aug 26, 2021
fd4b2ed
[kf5iconthemes] add libiconv dependency
wrobelda Aug 26, 2021
a830fbe
[kf5iconthemes] update versions
wrobelda Aug 26, 2021
646b195
[kf5iconthemes] fix Windows Static builds
wrobelda Aug 26, 2021
2ebdd09
[kf5iconthemes] update versions
wrobelda Aug 26, 2021
ddf9395
[kf5iconthemes] add PACKAGE_NAME to vcpkg_cmake_config_fixup
wrobelda Aug 30, 2021
bab9597
[kf5iconthemes] update versions
wrobelda Aug 30, 2021
055c7f1
[kf5iconthemes] rename patch files
wrobelda Aug 30, 2021
40ea980
[kf5iconthemes] libiconv patches only for windows static builds
wrobelda Aug 30, 2021
c9ee64d
[kf5iconthemes] update versions
wrobelda Aug 30, 2021
e1317ee
[kf5iconthemes] fix identation
wrobelda Sep 2, 2021
a9a7974
[kf5iconthemes] update versions
wrobelda Sep 2, 2021
a903671
[kf5iconthemes] cleanup, iconv was fixed in kf5i18n
wrobelda Sep 7, 2021
4891fcb
[kf5iconthemes] update versions
wrobelda Sep 7, 2021
b01b4a9
[kf5iconthemes] use generic, non-semver versioning
wrobelda Sep 13, 2021
138f96f
[kf5iconthemes] update versions
wrobelda Sep 13, 2021
dcf3f8f
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Sep 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions ports/kf5iconthemes/fix_config_cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From 2d9a393978ff6ae9c5577a3595cd761b199dc4fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <[email protected]>
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

49 changes: 49 additions & 0 deletions ports/kf5iconthemes/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
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
)

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()
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5IconThemes 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")
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")
40 changes: 40 additions & 0 deletions ports/kf5iconthemes/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{
"name": "kf5iconthemes",
"version": "5.84.0",
"description": "Icon GUI utilities",
"homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html",
"dependencies": [
"ecm",
"gettext",
{
"name": "gettext",
"host": true,
"features": [
"tools"
]
},
"kf5archive",
"kf5configwidgets",
"kf5coreaddons",
"kf5guiaddons",
"kf5i18n",
"kf5itemviews",
"kf5widgetsaddons",
"qt5-base",
"qt5-svg",
"qt5-tools",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
],
"features": {
"designerplugin": {
"description": "Enables a Qt Designer plugin"
}
}
}
4 changes: 4 additions & 0 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions versions/k-/kf5iconthemes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "969df4c5b4230e480fcffa7d71a312e869a3660d",
"version": "5.84.0",
"port-version": 0
}
]
}