[kf5newstuff] new port (#20198)

* Add kf5newstuff port

* [kf5newstuff] match the lower case

* [kf5*] update to 5.75.0

* [kf5newstuff] convert manifest to JSON

* [kf5newstuff] use gettext port

* [kf5newstuff] only remove what's needed

* [kf5newstuff] wrap paths in quotes

* [kf5newstuff] remove unused options

* [kf5newstuff] use current spec

* [kf5newstuff] use KDE_INSTALL_QMLDIR instead of manual renaming

* [kf5newstuff] update to 5.84

* [kf5newstuff] fix versioning

* [kf5newstuff] update versions

* [kf5newstuff] fix static builds

* [kf5newstuff] update versions

* [kf5newstuff] fix tool handling on macOS

* [kf5newstuff] update versions

* [kf5newstuff] fix static builds - continued

* [kf5newstuff] update versions

* [kf5newstuff] reduce patch size 1/3

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* [kf5newstuff] reduce patch size 2/3

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* [kf5newstuff] reduce patch size 3/3

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* [kf5newstuff] update versions

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
This commit is contained in:
Dawid Wróbel 2021-10-16 04:13:00 +02:00 committed by GitHub
parent b28d77ada2
commit 02fc26bbe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 194 additions and 0 deletions

View File

@ -0,0 +1,49 @@
diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in
index e4ef2944..063b83ca 100644
--- a/KF5NewStuffConfig.cmake.in
+++ b/KF5NewStuffConfig.cmake.in
@@ -10,5 +10,25 @@ find_dependency(KF5Service "@KF_DEP_VERSION@")
find_dependency(KF5NewStuffCore "@KF_VERSION@")
find_dependency(KF5NewStuffQuick "@KF_VERSION@")
+if (NOT @BUILD_SHARED_LIBS@)
+ find_dependency(Qt5Qml @REQUIRED_QT_VERSION@)
+ find_dependency(Qt5Quick @REQUIRED_QT_VERSION@)
+ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
+
+ find_dependency(KF5KIO "@KF_DEP_VERSION@")
+ find_dependency(KF5Completion "@KF_DEP_VERSION@")
+ find_dependency(KF5I18n "@KF_DEP_VERSION@")
+ find_dependency(KF5ItemViews "@KF_DEP_VERSION@")
+ find_dependency(KF5IconThemes "@KF_DEP_VERSION@")
+ find_dependency(KF5TextWidgets "@KF_DEP_VERSION@")
+ find_dependency(KF5Archive "@KF_DEP_VERSION@")
+ find_dependency(KF5Package "@KF_DEP_VERSION@")
+ find_dependency(KF5Config "@KF_DEP_VERSION@")
+
+ if(@KF5Syndication_FOUND@)
+ find_dependency(KF5Syndication "@KF_VERSION@")
+ endif()
+endif()
+
include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffTargets.cmake")
@PACKAGE_INCLUDE_QCHTARGETS@
--
GitLab
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7022663..d2ead74a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ include(KDECMakeSettings)
include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
set(REQUIRED_QT_VERSION 5.15.0)
-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Widgets Xml)
+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Gui Widgets Xml)
find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE COMPONENTS Qml Quick)
find_package(KF5Archive ${KF_DEP_VERSION} REQUIRED)
--
GitLab

View File

@ -0,0 +1,53 @@
diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in
index 063b83ca..1be53741 100644
--- a/KF5NewStuffConfig.cmake.in
+++ b/KF5NewStuffConfig.cmake.in
@@ -13,7 +13,6 @@ find_dependency(KF5NewStuffQuick "@KF_VERSION@")
if (NOT @BUILD_SHARED_LIBS@)
find_dependency(Qt5Qml @REQUIRED_QT_VERSION@)
find_dependency(Qt5Quick @REQUIRED_QT_VERSION@)
- find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
find_dependency(KF5KIO "@KF_DEP_VERSION@")
find_dependency(KF5Completion "@KF_DEP_VERSION@")
@@ -21,13 +20,6 @@ if (NOT @BUILD_SHARED_LIBS@)
find_dependency(KF5ItemViews "@KF_DEP_VERSION@")
find_dependency(KF5IconThemes "@KF_DEP_VERSION@")
find_dependency(KF5TextWidgets "@KF_DEP_VERSION@")
- find_dependency(KF5Archive "@KF_DEP_VERSION@")
- find_dependency(KF5Package "@KF_DEP_VERSION@")
- find_dependency(KF5Config "@KF_DEP_VERSION@")
-
- if(@KF5Syndication_FOUND@)
- find_dependency(KF5Syndication "@KF_VERSION@")
- endif()
endif()
include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffTargets.cmake")
diff --git a/KF5NewStuffCoreConfig.cmake.in b/KF5NewStuffCoreConfig.cmake.in
index c65c7c42..b395f8cd 100644
--- a/KF5NewStuffCoreConfig.cmake.in
+++ b/KF5NewStuffCoreConfig.cmake.in
@@ -3,6 +3,19 @@
include(CMakeFindDependencyMacro)
find_dependency(KF5Attica "@KF_DEP_VERSION@")
+if (NOT @BUILD_SHARED_LIBS@)
+ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
+
+ find_dependency(KF5I18n "@KF_DEP_VERSION@")
+ find_dependency(KF5Archive "@KF_DEP_VERSION@")
+ find_dependency(KF5Package "@KF_DEP_VERSION@")
+ find_dependency(KF5Config "@KF_DEP_VERSION@")
+
+ if(@KF5Syndication_FOUND@)
+ find_dependency(KF5Syndication "@KF_VERSION@")
+ endif()
+endif()
+
set(KDE_INSTALL_KNSRCDIR "@KDE_INSTALL_DATADIR@/knsrcfiles")
include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffCoreTargets.cmake")
--
GitLab

View File

@ -0,0 +1,39 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/knewstuff
REF v5.84.0
SHA512 107f8c7915f5a7656ed729d03b59e5f53f8751d771487b96e517358f1149801981e27d5cafdf86f759be539305fc8f847c51a28a35947766200cc912072f5c8d
HEAD_REF master
PATCHES
fix_static_builds.patch # https://invent.kde.org/frameworks/knewstuff/-/merge_requests/139
fix_static_builds2.patch # https://invent.kde.org/frameworks/knewstuff/-/merge_requests/140
)
vcpkg_cmake_configure(
DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTING=OFF
-DKDE_INSTALL_QMLDIR=qml
-DBUNDLE_INSTALL_DIR=bin
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuff CONFIG_PATH lib/cmake/KF5NewStuff DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffCore CONFIG_PATH lib/cmake/KF5NewStuffCore DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(PACKAGE_NAME KF5NewStuffQuick CONFIG_PATH lib/cmake/KF5NewStuffQuick)
vcpkg_copy_pdbs()
vcpkg_copy_tools(
TOOL_NAMES knewstuff-dialog
AUTO_CLEAN
)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()
file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")

View File

@ -0,0 +1,40 @@
{
"name": "kf5newstuff",
"version": "5.84.0",
"description": "Framework for downloading and sharing additional application data",
"homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html",
"dependencies": [
"ecm",
{
"name": "gettext",
"host": true,
"features": [
"tools"
]
},
"kf5archive",
"kf5attica",
"kf5completion",
"kf5config",
"kf5coreaddons",
"kf5i18n",
"kf5iconthemes",
"kf5itemviews",
"kf5kio",
"kf5package",
"kf5service",
"kf5textwidgets",
"kf5widgetsaddons",
"kf5xmlgui",
"qt5-base",
"qt5-tools",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -3072,6 +3072,10 @@
"baseline": "5.84.0",
"port-version": 0
},
"kf5newstuff": {
"baseline": "5.84.0",
"port-version": 0
},
"kf5notifications": {
"baseline": "5.84.0",
"port-version": 0

View File

@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "39c986b0766ffb962beb7022b74e1e1037bdc203",
"version": "5.84.0",
"port-version": 0
}
]
}