From c509d124daa4e5c62179d411a0cc299f60342bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 23:41:17 -0400 Subject: [PATCH 01/24] Add kf5notifications port --- ports/kf5notifications/CONTROL | 5 +++++ ports/kf5notifications/portfile.cmake | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 ports/kf5notifications/CONTROL create mode 100644 ports/kf5notifications/portfile.cmake diff --git a/ports/kf5notifications/CONTROL b/ports/kf5notifications/CONTROL new file mode 100644 index 00000000000000..efc53bb576e65d --- /dev/null +++ b/ports/kf5notifications/CONTROL @@ -0,0 +1,5 @@ +Source: kf5notifications +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/knotifications/html/index.html +Description: Desktop notifications +Build-Depends: ecm, qt5-base, qt5-tools, qt5-x11extras (linux), qt5-macextras (osx), kf5coreaddons, kf5config diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake new file mode 100644 index 00000000000000..530b601d74e5d1 --- /dev/null +++ b/ports/kf5notifications/portfile.cmake @@ -0,0 +1,27 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/knotifications + REF v5.73.0 + SHA512 d5cf39728ee16557d119fc9c8ecd249645609726893f83fb1fe6fb6727b0444751ef8b1625d68a873f433f6c5a07d96c7fa614f43b3bc1145d78933038880fc9 + 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/KF5Notifications) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 3e64aaf9032f878a6c095ba82b691baf51270c51 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Tue, 15 Sep 2020 21:51:55 +0530 Subject: [PATCH 02/24] Fixed kf5notifications for windows --- ports/kf5notifications/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5notifications/CONTROL b/ports/kf5notifications/CONTROL index efc53bb576e65d..872e9768f70f76 100644 --- a/ports/kf5notifications/CONTROL +++ b/ports/kf5notifications/CONTROL @@ -2,4 +2,4 @@ Source: kf5notifications Version: 5.73.0 Homepage: https://api.kde.org/frameworks/knotifications/html/index.html Description: Desktop notifications -Build-Depends: ecm, qt5-base, qt5-tools, qt5-x11extras (linux), qt5-macextras (osx), kf5coreaddons, kf5config +Build-Depends: ecm, qt5-base, qt5-tools, qt5-x11extras (linux), qt5-macextras (osx), kf5coreaddons, kf5config, libsnoretoast (windows), phonon4qt5 From 6d2cfb9ca369aa1d3a9f53a0103979ccd870ea5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 9 Nov 2020 20:21:22 -0500 Subject: [PATCH 03/24] [kf5*] update to 5.75.0 --- ports/kf5notifications/CONTROL | 2 +- ports/kf5notifications/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/kf5notifications/CONTROL b/ports/kf5notifications/CONTROL index 872e9768f70f76..b984a37afead66 100644 --- a/ports/kf5notifications/CONTROL +++ b/ports/kf5notifications/CONTROL @@ -1,5 +1,5 @@ Source: kf5notifications -Version: 5.73.0 +Version: 5.75.0 Homepage: https://api.kde.org/frameworks/knotifications/html/index.html Description: Desktop notifications Build-Depends: ecm, qt5-base, qt5-tools, qt5-x11extras (linux), qt5-macextras (osx), kf5coreaddons, kf5config, libsnoretoast (windows), phonon4qt5 diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index 530b601d74e5d1..cef53903b3655b 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/knotifications - REF v5.73.0 - SHA512 d5cf39728ee16557d119fc9c8ecd249645609726893f83fb1fe6fb6727b0444751ef8b1625d68a873f433f6c5a07d96c7fa614f43b3bc1145d78933038880fc9 + REF v5.75.0 + SHA512 e1357ba80b15eff97a226b274b6348cad6bbc6d1ab50b8c1cbbb3086d87a4006ad490865e23d81e19333d2ae1321af5c6fca971ce9156c513f0987d2bd0db4ed HEAD_REF master ) @@ -24,4 +24,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -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 2c61213292e9fbd03b256498b81ecdfca6a36b1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:09:59 +0200 Subject: [PATCH 04/24] [kf5notifications] port CONTROL to JSON --- ports/kf5notifications/CONTROL | 5 ----- ports/kf5notifications/vcpkg.json | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) delete mode 100644 ports/kf5notifications/CONTROL create mode 100644 ports/kf5notifications/vcpkg.json diff --git a/ports/kf5notifications/CONTROL b/ports/kf5notifications/CONTROL deleted file mode 100644 index b984a37afead66..00000000000000 --- a/ports/kf5notifications/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5notifications -Version: 5.75.0 -Homepage: https://api.kde.org/frameworks/knotifications/html/index.html -Description: Desktop notifications -Build-Depends: ecm, qt5-base, qt5-tools, qt5-x11extras (linux), qt5-macextras (osx), kf5coreaddons, kf5config, libsnoretoast (windows), phonon4qt5 diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json new file mode 100644 index 00000000000000..4e2d030b00702b --- /dev/null +++ b/ports/kf5notifications/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "kf5notifications", + "version-string": "5.75.0", + "description": "Desktop notifications", + "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", + "dependencies": [ + "ecm", + "kf5config", + "kf5coreaddons", + { + "name": "libsnoretoast", + "platform": "windows" + }, + "phonon4qt5", + "qt5-base", + { + "name": "qt5-macextras", + "platform": "osx" + }, + "qt5-tools", + { + "name": "qt5-x11extras", + "platform": "linux" + } + ] +} From 2a7ac21a3ee1699d268cb01c21bc5571abd8d36a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:12:17 +0200 Subject: [PATCH 05/24] [kf5notifications] remove redundant options --- ports/kf5notifications/portfile.cmake | 8 ++------ ports/kf5notifications/vcpkg.json | 5 ++++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index cef53903b3655b..56c9fb0c58736b 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -9,19 +9,15 @@ vcpkg_from_github( 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 + OPTIONS + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Notifications) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) 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 diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index 4e2d030b00702b..125d91273c6b40 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -7,11 +7,14 @@ "ecm", "kf5config", "kf5coreaddons", + { + "name": "libcanberra", + "platform": "!(windows | uwp)" + }, { "name": "libsnoretoast", "platform": "windows" }, - "phonon4qt5", "qt5-base", { "name": "qt5-macextras", From 4c76907ffc22a670dbe12685c875952bf87877a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:14:35 +0200 Subject: [PATCH 06/24] [kf5notifications] update to current spec --- ports/kf5notifications/portfile.cmake | 8 ++++---- ports/kf5notifications/vcpkg.json | 8 ++++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index 56c9fb0c58736b..e1459156f23fc6 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -6,15 +6,15 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Notifications) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Notifications CONFIG_PATH lib/cmake/KF5Notifications) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index 125d91273c6b40..c87dd0bb2da14f 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -24,6 +24,14 @@ { "name": "qt5-x11extras", "platform": "linux" + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } From 916358ac77fd5adada3e9fb58eaa5bddc15b6ee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:15:39 +0200 Subject: [PATCH 07/24] [kf5notifications] wrap paths in quotes --- ports/kf5notifications/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index e1459156f23fc6..d8f844ba2565d5 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -8,8 +8,8 @@ vcpkg_from_github( vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE - SOURCE_PATH ${SOURCE_PATH} - OPTIONS + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS -DBUILD_TESTING=OFF ) @@ -17,7 +17,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Notifications CONFIG_PATH lib/cmake/KF5Notifications) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +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(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") \ No newline at end of file From f11489d76eeb15fd7cac436fd9a3d4e113c090f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:15:51 +0200 Subject: [PATCH 08/24] [kf5notifications] use semver --- ports/kf5notifications/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index c87dd0bb2da14f..50f7073c189ce7 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5notifications", - "version-string": "5.75.0", + "version-semver": "5.75.0", "description": "Desktop notifications", "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", "dependencies": [ From 16fd76fb1a68995f9d2eac88f842191501606c19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:16:56 +0200 Subject: [PATCH 09/24] [kf5notifications] update to 5.84.0 --- ports/kf5notifications/portfile.cmake | 4 ++-- ports/kf5notifications/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index d8f844ba2565d5..72bf3f3cb7677c 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/knotifications - REF v5.75.0 - SHA512 e1357ba80b15eff97a226b274b6348cad6bbc6d1ab50b8c1cbbb3086d87a4006ad490865e23d81e19333d2ae1321af5c6fca971ce9156c513f0987d2bd0db4ed + REF v5.84.0 + SHA512 ee8d2d0531df726f3e372983e30c2365aab887e1a3cdf5fb9c1b788e78b490f984018a44934ce62116bf10827fbf9aeeaf23236a7024a0e3757a1da7e90dca6c HEAD_REF master ) diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index 50f7073c189ce7..7355ebd09d7e18 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5notifications", - "version-semver": "5.75.0", + "version-semver": "5.84.0", "description": "Desktop notifications", "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", "dependencies": [ From be0e7ec87478619cc9dbc420e0f1295379198bbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:17:14 +0200 Subject: [PATCH 10/24] [kf5notifications] update versions --- versions/baseline.json | 4 ++++ versions/k-/kf5notifications.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/k-/kf5notifications.json diff --git a/versions/baseline.json b/versions/baseline.json index 0f7ca3c5d4a3a0..b2ecb817a59ae9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3044,6 +3044,10 @@ "baseline": "5.84.0", "port-version": 1 }, + "kf5notifications": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5package": { "baseline": "5.84.0", "port-version": 1 diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json new file mode 100644 index 00000000000000..7724c63ebe73f1 --- /dev/null +++ b/versions/k-/kf5notifications.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "7735c944fe6876e965c8e2ceb085cdb7a49a207c", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} From 49f15fef586d1113df08babecc5d3f854c4adddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:23:02 +0200 Subject: [PATCH 11/24] [kf5notifications] remove bin from static builds --- ports/kf5notifications/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index 72bf3f3cb7677c..89a82d7e089168 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -17,6 +17,10 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Notifications CONFIG_PATH lib/cmake/KF5Notifications) 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}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") From 416c90f0adf8c2472884b7737d5969b4ebb2054b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:23:10 +0200 Subject: [PATCH 12/24] [kf5notifications] update versions --- versions/k-/kf5notifications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index 7724c63ebe73f1..20f6f40d3e087c 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "7735c944fe6876e965c8e2ceb085cdb7a49a207c", + "git-tree": "3871ff1d948a1c647ef1504a354f4e5d6e5c9b39", "version-semver": "5.84.0", "port-version": 0 } From 90097a3240d7b0f902dc5d420875ff25bc575c3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:30:05 +0200 Subject: [PATCH 13/24] [kf5notifications] add kf5windowsystem dependency --- ports/kf5notifications/vcpkg.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index 7355ebd09d7e18..699c768d0cb1e1 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -7,6 +7,10 @@ "ecm", "kf5config", "kf5coreaddons", + { + "name": "kf5windowsystem", + "platform": "!android" + }, { "name": "libcanberra", "platform": "!(windows | uwp)" From 1b9efa16adc15aaf3ce91f1e86f88dd2fe7ce1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 18:30:12 +0200 Subject: [PATCH 14/24] [kf5notifications] update versions --- versions/k-/kf5notifications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index 20f6f40d3e087c..b1980a13c9365a 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "3871ff1d948a1c647ef1504a354f4e5d6e5c9b39", + "git-tree": "1fe3615a19f84c4e176a48110f1acf3969b09672", "version-semver": "5.84.0", "port-version": 0 } From ec53b50d94dd1ada646ee598ef41eefdf5998f21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 20:22:48 +0200 Subject: [PATCH 15/24] [kf5notifications] fix CMake config file --- ports/kf5notifications/fix_config_cmake.patch | 64 +++++++++++++++++++ ports/kf5notifications/portfile.cmake | 2 + 2 files changed, 66 insertions(+) create mode 100644 ports/kf5notifications/fix_config_cmake.patch diff --git a/ports/kf5notifications/fix_config_cmake.patch b/ports/kf5notifications/fix_config_cmake.patch new file mode 100644 index 00000000000000..306f2a57aec280 --- /dev/null +++ b/ports/kf5notifications/fix_config_cmake.patch @@ -0,0 +1,64 @@ +From 1d3b1e0b70fe58f8bf2f1aac8f14536925ea0fa1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Tue, 31 Aug 2021 20:19:56 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5NotificationsConfig.cmake.in | 42 +++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +diff --git a/KF5NotificationsConfig.cmake.in b/KF5NotificationsConfig.cmake.in +index eeded42..6b261c0 100644 +--- a/KF5NotificationsConfig.cmake.in ++++ b/KF5NotificationsConfig.cmake.in +@@ -11,5 +11,47 @@ if (@HAVE_DBUS@) + find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) + endif() + ++if (NOT @BUILD_SHARED_LIBS@) ++ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5Config "@KF_DEP_VERSION@") ++ ++ if (@HAVE_KWINDOWSYSTEM@) ++ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") ++ endif() ++ ++ if (@WITH_SNORETOAST@) ++ find_dependency(LibSnoreToast) ++ find_dependency(Qt5Network @REQUIRED_QT_VERSION@) ++ endif() ++ ++ if (@HAVE_PHONON4QT5@) ++ find_dependency(Phonon4Qt5) ++ endif() ++ ++ if (@Canberra_FOUND@) ++ find_dependency(Canberra) ++ endif() ++ ++ if (@Qt5TextToSpeech_FOUND@) ++ find_dependency(Qt5TextToSpeech @REQUIRED_QT_VERSION@) ++ endif() ++ ++ if(@X11_FOUND@) ++ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) ++ endif() ++ ++ if(APPLE) ++ find_dependency(Qt5MacExtras @REQUIRED_QT_VERSION@) ++ endif() ++ ++ if(@HAVE_DBUSMENUQT@) ++ find_dependency(dbusmenu-qt5) ++ endif() ++ ++ if (ANDROID) ++ find_dependency(Qt5AndroidExtras @REQUIRED_QT_VERSION@) ++ endif() ++endif() ++ + include("${CMAKE_CURRENT_LIST_DIR}/KF5NotificationsTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index 89a82d7e089168..adcaf0f27bc974 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v5.84.0 SHA512 ee8d2d0531df726f3e372983e30c2365aab887e1a3cdf5fb9c1b788e78b490f984018a44934ce62116bf10827fbf9aeeaf23236a7024a0e3757a1da7e90dca6c HEAD_REF master + PATCHES + fix_config_cmake.patch ) vcpkg_cmake_configure( From 31c65efbbbd7cd03e6275cf719a7a342a2bab8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 20:23:00 +0200 Subject: [PATCH 16/24] [kf5notifications] update versions --- versions/k-/kf5notifications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index b1980a13c9365a..debc9182d4d4be 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "1fe3615a19f84c4e176a48110f1acf3969b09672", + "git-tree": "9af85ca647f28bfa001eec51d5c13e0f64d1dbc9", "version-semver": "5.84.0", "port-version": 0 } From 52e3a42a9d196cbaa5b0f2c4aa5380c07b103ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 20:28:18 +0200 Subject: [PATCH 17/24] [kf5notifications] add androidextras dependency --- ports/kf5notifications/vcpkg.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index 699c768d0cb1e1..cc3095615870d4 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -19,6 +19,10 @@ "name": "libsnoretoast", "platform": "windows" }, + { + "name": "qt5-androidextras", + "platform": "android" + }, "qt5-base", { "name": "qt5-macextras", From 903094fd3581a6f79c303bd2084cb7d6910c1e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 20:28:26 +0200 Subject: [PATCH 18/24] [kf5notifications] update versions --- versions/k-/kf5notifications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index debc9182d4d4be..f9a1055504994f 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "9af85ca647f28bfa001eec51d5c13e0f64d1dbc9", + "git-tree": "37a2e5ec98906c0c6c04b2a43bad191d2f9e3460", "version-semver": "5.84.0", "port-version": 0 } From ab7feaad7f15afd8830a097607d2eb53c8612526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 31 Aug 2021 20:36:14 +0200 Subject: [PATCH 19/24] [kf5notifications] update versions --- versions/k-/kf5notifications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index f9a1055504994f..92192f9aae664d 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "37a2e5ec98906c0c6c04b2a43bad191d2f9e3460", + "git-tree": "ee509a484033e89ca7ae9157930e6faef8324e2b", "version-semver": "5.84.0", "port-version": 0 } From b507a85feaebaa80e27e744d20037671baa6b77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 28 Sep 2021 04:13:22 +0300 Subject: [PATCH 20/24] [kf5newstuff] minimize patch size --- ports/kf5notifications/fix_config_cmake.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ports/kf5notifications/fix_config_cmake.patch b/ports/kf5notifications/fix_config_cmake.patch index 306f2a57aec280..318881cfbfaeea 100644 --- a/ports/kf5notifications/fix_config_cmake.patch +++ b/ports/kf5notifications/fix_config_cmake.patch @@ -1,12 +1,3 @@ -From 1d3b1e0b70fe58f8bf2f1aac8f14536925ea0fa1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Tue, 31 Aug 2021 20:19:56 +0200 -Subject: [PATCH] Add support for static builds - ---- - KF5NotificationsConfig.cmake.in | 42 +++++++++++++++++++++++++++++++++ - 1 file changed, 42 insertions(+) - diff --git a/KF5NotificationsConfig.cmake.in b/KF5NotificationsConfig.cmake.in index eeded42..6b261c0 100644 --- a/KF5NotificationsConfig.cmake.in From 666f681feea4c4c35cb97a22dcd8eb888e1e988b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 28 Sep 2021 04:13:38 +0300 Subject: [PATCH 21/24] [kf5newstuff] use generic, non-semver versioning --- ports/kf5notifications/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index cc3095615870d4..f2b920c1301801 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5notifications", - "version-semver": "5.84.0", + "version": "5.84.0", "description": "Desktop notifications", "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", "dependencies": [ From 5ae6e4d17a6b998fc6860d050032c9aeb7ac0287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 28 Sep 2021 04:13:58 +0300 Subject: [PATCH 22/24] [kf5newstuff] update versions --- versions/k-/kf5notifications.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index 92192f9aae664d..63eaf557d0207f 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "ee509a484033e89ca7ae9157930e6faef8324e2b", - "version-semver": "5.84.0", + "git-tree": "464f86444742df66dacbaa58ab27bf4da9883868", + "version": "5.84.0", "port-version": 0 } ] From a6c0a194cba8cc872f3c024f19772291442a07b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 28 Sep 2021 04:15:25 +0300 Subject: [PATCH 23/24] [kf5notifications] re-enable parallel configure --- ports/kf5notifications/portfile.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index adcaf0f27bc974..afff6c000fc71d 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -8,8 +8,10 @@ vcpkg_from_github( fix_config_cmake.patch ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF From 412fc062391453ffea56ebc5db91fd150042011f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 28 Sep 2021 04:16:10 +0300 Subject: [PATCH 24/24] [kf5notifications] update versions --- versions/k-/kf5notifications.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index 63eaf557d0207f..b837ed00d08145 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "464f86444742df66dacbaa58ab27bf4da9883868", + "git-tree": "a565cfd79777b605b4e3fc57be5bd2957c498c7f", "version": "5.84.0", "port-version": 0 }