From 02b856bcce5eead04290a069852eb54de4d8ad79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 10 Sep 2020 21:26:37 -0400 Subject: [PATCH 01/11] Add kf5auth port --- ports/kf5auth/CONTROL | 5 +++++ ports/kf5auth/portfile.cmake | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 ports/kf5auth/CONTROL create mode 100644 ports/kf5auth/portfile.cmake diff --git a/ports/kf5auth/CONTROL b/ports/kf5auth/CONTROL new file mode 100644 index 00000000000000..459e55cc8128e9 --- /dev/null +++ b/ports/kf5auth/CONTROL @@ -0,0 +1,5 @@ +Source: kf5auth +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/kauth/html/index.html +Description: Execute actions as privileged user +Build-Depends: ecm, qt5-base, qt5-tools, kf5coreaddons diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake new file mode 100644 index 00000000000000..c5b2daee7ad265 --- /dev/null +++ b/ports/kf5auth/portfile.cmake @@ -0,0 +1,34 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kauth + REF v5.73.0 + SHA512 123818bfeebabc780fffea0b4177d42f8cdbf625b83baa67fd1d1bc44cd1b28c2f7589ed1b3951045491c680e97e581547eec91657a3d47f3b77f7a72a306e24 + 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/KF5Auth) + +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 5fd93e4ffc3e78ba7a6ee39e9d1c07e829ae7102 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Tue, 15 Sep 2020 00:11:54 +0530 Subject: [PATCH 02/11] Fixed KF5Auth build for windows --- ports/kf5auth/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index c5b2daee7ad265..33f96c656cb9f0 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -14,6 +14,8 @@ vcpkg_configure_cmake( -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_DATAROOTDIR=data ) vcpkg_install_cmake() From 1d40fa6bd1758f96827569c096f9b4bb991c6baa 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/11] [kf5*] update to 5.75.0 --- ports/kf5auth/CONTROL | 2 +- ports/kf5auth/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/kf5auth/CONTROL b/ports/kf5auth/CONTROL index 459e55cc8128e9..c8ca718e583b60 100644 --- a/ports/kf5auth/CONTROL +++ b/ports/kf5auth/CONTROL @@ -1,5 +1,5 @@ Source: kf5auth -Version: 5.73.0 +Version: 5.75.0 Homepage: https://api.kde.org/frameworks/kauth/html/index.html Description: Execute actions as privileged user Build-Depends: ecm, qt5-base, qt5-tools, kf5coreaddons diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index 33f96c656cb9f0..048677a37a2829 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kauth - REF v5.73.0 - SHA512 123818bfeebabc780fffea0b4177d42f8cdbf625b83baa67fd1d1bc44cd1b28c2f7589ed1b3951045491c680e97e581547eec91657a3d47f3b77f7a72a306e24 + REF v5.75.0 + SHA512 b7bb7c93d68c798a2778a3b774fb8690eba1a3fd4bb86002ae086a1742be895b3e66a0a9d53d4fa55b6ae52803eb37d1a203abd2844f79a3680196a0ec42220b HEAD_REF master ) @@ -33,4 +33,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 3e8a21cae33ae497ce53772c55535ce11d531341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 5 Mar 2021 15:30:33 -0400 Subject: [PATCH 04/11] [kf5auth] convert CONTROL to manifest --- ports/kf5auth/CONTROL | 5 ----- ports/kf5auth/vcpkg.json | 12 ++++++++++++ 2 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 ports/kf5auth/CONTROL create mode 100644 ports/kf5auth/vcpkg.json diff --git a/ports/kf5auth/CONTROL b/ports/kf5auth/CONTROL deleted file mode 100644 index c8ca718e583b60..00000000000000 --- a/ports/kf5auth/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5auth -Version: 5.75.0 -Homepage: https://api.kde.org/frameworks/kauth/html/index.html -Description: Execute actions as privileged user -Build-Depends: ecm, qt5-base, qt5-tools, kf5coreaddons diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json new file mode 100644 index 00000000000000..bf576098f43617 --- /dev/null +++ b/ports/kf5auth/vcpkg.json @@ -0,0 +1,12 @@ +{ + "name": "kf5auth", + "version-string": "5.75.0", + "description": "Execute actions as privileged user", + "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", + "dependencies": [ + "ecm", + "kf5coreaddons", + "qt5-base", + "qt5-tools" + ] +} From ac48f7b2f123f06e3b844efa1c5ac5cde61c3714 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 5 Mar 2021 16:12:02 -0400 Subject: [PATCH 05/11] [kf5auth] update version --- versions/baseline.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/versions/baseline.json b/versions/baseline.json index 8ab78f030b4adb..521a241198a592 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2816,6 +2816,10 @@ "baseline": "5.81.0", "port-version": 0 }, + "kf5auth": { + "baseline": "5.75.0", + "port-version": 0 + }, "kf5completion": { "baseline": "5.81.0", "port-version": 0 From 84a55b367d8642ea7a4c556efef3f0fe85c5da91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 3 May 2021 19:19:17 -0400 Subject: [PATCH 06/11] kf5auth: update to 5.81 --- ports/kf5auth/portfile.cmake | 12 ++++++------ ports/kf5auth/vcpkg.json | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index 048677a37a2829..d7a34bfb01a313 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kauth - REF v5.75.0 - SHA512 b7bb7c93d68c798a2778a3b774fb8690eba1a3fd4bb86002ae086a1742be895b3e66a0a9d53d4fa55b6ae52803eb37d1a203abd2844f79a3680196a0ec42220b + REF v5.81.0 + SHA512 bad803867dadc9ff89531e80793bbe6018afb83309f91890f38b40908cea3c886f33f67ddf64e6f42c34df952ab33369d968eda774cece66012a9d66b3fd88a8 HEAD_REF master ) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS + OPTIONS -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF @@ -23,8 +23,8 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Auth) vcpkg_copy_pdbs() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +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) @@ -33,4 +33,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}/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) diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index bf576098f43617..3cbf9ae9d479b8 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5auth", - "version-string": "5.75.0", + "version": "5.81.0", "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ From f3b5082ee52fb81d8a44a6b10da375d17694aff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 3 May 2021 19:19:35 -0400 Subject: [PATCH 07/11] kf5auth: add version --- versions/baseline.json | 2 +- versions/k-/kf5auth.json | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 versions/k-/kf5auth.json diff --git a/versions/baseline.json b/versions/baseline.json index 521a241198a592..31c26cbd9bf010 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2817,7 +2817,7 @@ "port-version": 0 }, "kf5auth": { - "baseline": "5.75.0", + "baseline": "5.81.0", "port-version": 0 }, "kf5completion": { diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json new file mode 100644 index 00000000000000..70d97a5b6e39c1 --- /dev/null +++ b/versions/k-/kf5auth.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "cc5e8896c1c07e9b61d9ebfee581f01fdef24ed3", + "version": "5.81.0", + "port-version": 0 + } + ] +} From d57e75227a82a251e08c6d61a03f921cfbee659c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 25 May 2021 14:20:27 -0400 Subject: [PATCH 08/11] [kf5auth] migrate to vcpkg_cmake_configure --- ports/kf5auth/portfile.cmake | 7 +++---- ports/kf5auth/vcpkg.json | 10 +++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index d7a34bfb01a313..9275230b932fe6 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -6,9 +6,8 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_HTML_DOCS=OFF -DBUILD_MAN_DOCS=OFF @@ -18,8 +17,8 @@ vcpkg_configure_cmake( -DKDE_INSTALL_DATAROOTDIR=data ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Auth) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Auth CONFIG_PATH lib/cmake/KF5Auth) vcpkg_copy_pdbs() diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index 3cbf9ae9d479b8..f6d987188de60f 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -7,6 +7,14 @@ "ecm", "kf5coreaddons", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } From a8aedfe4f7f0ab81b762e7c6ba1f57a997e6a565 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 25 May 2021 14:20:48 -0400 Subject: [PATCH 09/11] [kf5auth] update versions --- versions/k-/kf5auth.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json index 70d97a5b6e39c1..14717d9c2f13f1 100644 --- a/versions/k-/kf5auth.json +++ b/versions/k-/kf5auth.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "cc5e8896c1c07e9b61d9ebfee581f01fdef24ed3", + "git-tree": "d7753574e9d1e44f07f06afc98fa7f4b02292d69", "version": "5.81.0", "port-version": 0 } From ca4d9a9c3c2170fe7b10acdadced96d27b6a49e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 25 May 2021 14:31:42 -0400 Subject: [PATCH 10/11] [kf5auth] disable parallel configure --- ports/kf5auth/portfile.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index 9275230b932fe6..7dc326825885f4 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -7,6 +7,7 @@ vcpkg_from_github( ) vcpkg_cmake_configure( + DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} OPTIONS -DBUILD_HTML_DOCS=OFF From b8c96bc8ebc5a560b895fb704bff8fc8b2924f75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Tue, 25 May 2021 14:31:48 -0400 Subject: [PATCH 11/11] [kf5auth] update versions --- versions/k-/kf5auth.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json index 14717d9c2f13f1..3c6b8c00425d24 100644 --- a/versions/k-/kf5auth.json +++ b/versions/k-/kf5auth.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d7753574e9d1e44f07f06afc98fa7f4b02292d69", + "git-tree": "4eb7aaf2e4986913b630b57cf640bc62ae811316", "version": "5.81.0", "port-version": 0 }