From 7d93bc9bfef0c79736a2c4e5c792a2e7c57ef70c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sun, 13 Sep 2020 03:06:10 -0400 Subject: [PATCH 01/20] Add kf5bookmarks port --- ports/kf5bookmarks/CONTROL | 5 ++++ .../add-missing-dependencies.patch | 18 ++++++++++++ ports/kf5bookmarks/portfile.cmake | 29 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 ports/kf5bookmarks/CONTROL create mode 100644 ports/kf5bookmarks/add-missing-dependencies.patch create mode 100644 ports/kf5bookmarks/portfile.cmake diff --git a/ports/kf5bookmarks/CONTROL b/ports/kf5bookmarks/CONTROL new file mode 100644 index 00000000000000..780e013352dd5a --- /dev/null +++ b/ports/kf5bookmarks/CONTROL @@ -0,0 +1,5 @@ +Source: kf5bookmarks +Version: 5.73.0 +Homepage: https://api.kde.org/frameworks/kbookmarks/html/index.html +Description: Bookmarks management library +Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5codecs, kf5configwidgets, kf5widgetsaddons, kf5xmlgui, kf5guiaddons \ No newline at end of file diff --git a/ports/kf5bookmarks/add-missing-dependencies.patch b/ports/kf5bookmarks/add-missing-dependencies.patch new file mode 100644 index 00000000000000..a47b971a8a316f --- /dev/null +++ b/ports/kf5bookmarks/add-missing-dependencies.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c40b0f2..1219074 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,6 +49,13 @@ find_package(KF5Codecs ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED) ++find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED) ++find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) ++find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED) ++find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) ++find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) ++find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED) ++ + + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") + ecm_install_po_files_as_qm(po) diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake new file mode 100644 index 00000000000000..e9c244d56dd453 --- /dev/null +++ b/ports/kf5bookmarks/portfile.cmake @@ -0,0 +1,29 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kbookmarks + REF v5.73.0 + SHA512 95fb17d850d104998aa83c4b09e6a16c83f899bd6ab50e8af0a4ea0499bc05e2a83e7ce10ae38f21523e3afb78abdd3e0c5455b221d3fd871d7006a47200a821 + HEAD_REF master + PATCHES + "add-missing-dependencies.patch" +) + +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/KF5Bookmarks) +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 381e8e364f5b00f61686ad0a323e413a69a73bff Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Tue, 15 Sep 2020 20:09:24 +0530 Subject: [PATCH 02/20] Fixed kf5bookmarks in windows --- ports/kf5bookmarks/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index e9c244d56dd453..f5d29cf552a3dc 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -8,6 +8,10 @@ vcpkg_from_github( "add-missing-dependencies.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 From 8c4cd8f652551c473fd93ae15002217313e6b609 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/20] [kf5*] update to 5.75.0 --- ports/kf5bookmarks/CONTROL | 2 +- ports/kf5bookmarks/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/kf5bookmarks/CONTROL b/ports/kf5bookmarks/CONTROL index 780e013352dd5a..cbdb6837e7dc63 100644 --- a/ports/kf5bookmarks/CONTROL +++ b/ports/kf5bookmarks/CONTROL @@ -1,5 +1,5 @@ Source: kf5bookmarks -Version: 5.73.0 +Version: 5.75.0 Homepage: https://api.kde.org/frameworks/kbookmarks/html/index.html Description: Bookmarks management library Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5codecs, kf5configwidgets, kf5widgetsaddons, kf5xmlgui, kf5guiaddons \ No newline at end of file diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index f5d29cf552a3dc..ee7f472ad17ddd 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kbookmarks - REF v5.73.0 - SHA512 95fb17d850d104998aa83c4b09e6a16c83f899bd6ab50e8af0a4ea0499bc05e2a83e7ce10ae38f21523e3afb78abdd3e0c5455b221d3fd871d7006a47200a821 + REF v5.75.0 + SHA512 bb3982479ec0bf7510947c45aabb798e463d3b29453006eee67389f6001eef469c9be22a6c009f13180273709212efd4cfa3ce11d768483f0e8a76653f84fe87 HEAD_REF master PATCHES "add-missing-dependencies.patch" @@ -30,4 +30,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 1bcc0855e139d03cd7ebfaad20175d1a8d5684d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Thu, 26 Aug 2021 13:35:50 +0200 Subject: [PATCH 04/20] [kf5bookmarks] WIP --- ports/kf5bookmarks/CONTROL | 5 ----- ports/kf5bookmarks/portfile.cmake | 12 ++++-------- ports/kf5bookmarks/vcpkg.json | 26 ++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 13 deletions(-) delete mode 100644 ports/kf5bookmarks/CONTROL create mode 100644 ports/kf5bookmarks/vcpkg.json diff --git a/ports/kf5bookmarks/CONTROL b/ports/kf5bookmarks/CONTROL deleted file mode 100644 index cbdb6837e7dc63..00000000000000 --- a/ports/kf5bookmarks/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: kf5bookmarks -Version: 5.75.0 -Homepage: https://api.kde.org/frameworks/kbookmarks/html/index.html -Description: Bookmarks management library -Build-Depends: ecm, qt5-base, qt5-tools, kf5config, kf5coreaddons, kf5codecs, kf5configwidgets, kf5widgetsaddons, kf5xmlgui, kf5guiaddons \ No newline at end of file diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index ee7f472ad17ddd..57b6bc2dd5deba 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -8,21 +8,17 @@ vcpkg_from_github( "add-missing-dependencies.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( + DISABLE_PARALLEL_CONFIGURE 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/KF5Bookmarks) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Bookmarks) vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json new file mode 100644 index 00000000000000..c0d507af0926f4 --- /dev/null +++ b/ports/kf5bookmarks/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "kf5bookmarks", + "version-string": "5.75.0", + "description": "Bookmarks management library", + "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", + "dependencies": [ + "ecm", + "kf5codecs", + "kf5config", + "kf5configwidgets", + "kf5coreaddons", + "kf5guiaddons", + "kf5widgetsaddons", + "kf5xmlgui", + "qt5-base", + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} From bd3fece9a1ce6454bb7fc52ff9f300984254af6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sat, 28 Aug 2021 15:01:22 +0200 Subject: [PATCH 05/20] [kf5bookmarks] remove redundant kf5guiaddons dependnecy --- ports/kf5bookmarks/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json index c0d507af0926f4..70dec4c6e23bc8 100644 --- a/ports/kf5bookmarks/vcpkg.json +++ b/ports/kf5bookmarks/vcpkg.json @@ -9,7 +9,6 @@ "kf5config", "kf5configwidgets", "kf5coreaddons", - "kf5guiaddons", "kf5widgetsaddons", "kf5xmlgui", "qt5-base", From 70b9063cadc4a882ec26584526eb872dd7dd40e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sat, 28 Aug 2021 15:01:35 +0200 Subject: [PATCH 06/20] [kf5bookmarks] remove redundant options --- ports/kf5bookmarks/portfile.cmake | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index 57b6bc2dd5deba..7a7b8b972344dd 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -11,10 +11,8 @@ vcpkg_from_github( vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} - OPTIONS -DBUILD_HTML_DOCS=OFF - -DBUILD_MAN_DOCS=OFF - -DBUILD_QTHELP_DOCS=OFF - -DBUILD_TESTING=OFF + OPTIONS + -DBUILD_TESTING=OFF ) vcpkg_cmake_install() From 9fcfa387f8dfec4c2169780bb445533de2791aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sat, 28 Aug 2021 15:01:51 +0200 Subject: [PATCH 07/20] [kf5bookmarks] only remove what's needed --- ports/kf5bookmarks/portfile.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index 7a7b8b972344dd..ffc50c9dd126c0 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -19,9 +19,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Bookmarks) 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 From 195a75bc6d7ecc1097671b5ce8091fa681df4390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sat, 28 Aug 2021 15:03:08 +0200 Subject: [PATCH 08/20] [kf5bookmarks] wrap paths in quotes --- ports/kf5bookmarks/portfile.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index ffc50c9dd126c0..892372adbcf50d 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -10,7 +10,7 @@ vcpkg_from_github( vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) @@ -19,7 +19,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Bookmarks) 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 76e07c41eed36747581a2d44d0882edf64c5a36b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sat, 28 Aug 2021 15:03:42 +0200 Subject: [PATCH 09/20] [kf5bookmarks] use semVer --- ports/kf5bookmarks/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json index 70dec4c6e23bc8..e7d09eca54e672 100644 --- a/ports/kf5bookmarks/vcpkg.json +++ b/ports/kf5bookmarks/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5bookmarks", - "version-string": "5.75.0", + "version-semver": "5.75.0", "description": "Bookmarks management library", "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", "dependencies": [ From 56ff5a7a256f0250c1301b35e3f53ae50674934c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sat, 28 Aug 2021 15:05:09 +0200 Subject: [PATCH 10/20] [kf5bookmarks] update to 5.84 --- .../add-missing-dependencies.patch | 18 ------------------ ports/kf5bookmarks/portfile.cmake | 6 ++---- ports/kf5bookmarks/vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 ports/kf5bookmarks/add-missing-dependencies.patch diff --git a/ports/kf5bookmarks/add-missing-dependencies.patch b/ports/kf5bookmarks/add-missing-dependencies.patch deleted file mode 100644 index a47b971a8a316f..00000000000000 --- a/ports/kf5bookmarks/add-missing-dependencies.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c40b0f2..1219074 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -49,6 +49,13 @@ find_package(KF5Codecs ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5ConfigWidgets ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) - find_package(KF5XmlGui ${KF5_DEP_VERSION} REQUIRED) -+find_package(KF5ItemViews ${KF5_DEP_VERSION} REQUIRED) -+find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) -+find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED) -+find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) -+find_package(KF5WindowSystem ${KF5_DEP_VERSION} REQUIRED) -+find_package(KF5Archive ${KF5_DEP_VERSION} REQUIRED) -+ - - if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - ecm_install_po_files_as_qm(po) diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index 892372adbcf50d..1dcce91867bc27 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kbookmarks - REF v5.75.0 - SHA512 bb3982479ec0bf7510947c45aabb798e463d3b29453006eee67389f6001eef469c9be22a6c009f13180273709212efd4cfa3ce11d768483f0e8a76653f84fe87 + REF v5.84.0 + SHA512 3ba70c7fb312cd7715f0c14f78a4380150fd8716e93186302c39692609dbedda96d5e82d316ea683ffc9338cc5b4f2c689b24e06d66c3d5d735bae57f36ccad0 HEAD_REF master - PATCHES - "add-missing-dependencies.patch" ) vcpkg_cmake_configure( diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json index e7d09eca54e672..068e07aca48997 100644 --- a/ports/kf5bookmarks/vcpkg.json +++ b/ports/kf5bookmarks/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5bookmarks", - "version-semver": "5.75.0", + "version-semver": "5.84.0", "description": "Bookmarks management library", "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", "dependencies": [ From 732bc54115d5a1551159efb16d825fbc475486fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Sat, 28 Aug 2021 15:42:00 +0200 Subject: [PATCH 11/20] [kf5bookmarks] add missing gettext dep --- ports/kf5bookmarks/vcpkg.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json index 068e07aca48997..63060c4eca12d9 100644 --- a/ports/kf5bookmarks/vcpkg.json +++ b/ports/kf5bookmarks/vcpkg.json @@ -5,6 +5,13 @@ "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", "dependencies": [ "ecm", + { + "name": "gettext", + "host": true, + "features": [ + "tools" + ] + }, "kf5codecs", "kf5config", "kf5configwidgets", From a007049f2b3af93878efd76899edbad344db4acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 30 Aug 2021 16:46:46 +0200 Subject: [PATCH 12/20] [kf5bookmarks] add PACKAGE_NAME to vcpkg_cmake_config_fixup --- ports/kf5bookmarks/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index 1dcce91867bc27..c00fb5a05e8db8 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Bookmarks) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Bookmarks CONFIG_PATH lib/cmake/KF5Bookmarks) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From 1347753a0975389587bf7047ecfc7069e286da27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 30 Aug 2021 16:46:54 +0200 Subject: [PATCH 13/20] [kf5bookmarks] update versions --- versions/baseline.json | 4 ++++ versions/k-/kf5bookmarks.json | 9 +++++++++ 2 files changed, 13 insertions(+) create mode 100644 versions/k-/kf5bookmarks.json diff --git a/versions/baseline.json b/versions/baseline.json index 1252bd05254d8e..1f5d5da3d42d18 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2964,6 +2964,10 @@ "baseline": "5.84.0", "port-version": 2 }, + "kf5bookmarks": { + "baseline": "5.84.0", + "port-version": 0 + }, "kf5codecs": { "baseline": "5.84.0", "port-version": 2 diff --git a/versions/k-/kf5bookmarks.json b/versions/k-/kf5bookmarks.json new file mode 100644 index 00000000000000..d5084dc651b676 --- /dev/null +++ b/versions/k-/kf5bookmarks.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "66c7c736141a4f62063fd232fb3f42d3d6030666", + "version-semver": "5.84.0", + "port-version": 0 + } + ] +} From 0004ef6599c804c5959b5fa9bf32fb759868102d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 30 Aug 2021 20:10:48 +0200 Subject: [PATCH 14/20] [kf5bookmarks] remove static bin files --- ports/kf5bookmarks/portfile.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index c00fb5a05e8db8..def498b2b984d9 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -17,6 +17,10 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Bookmarks CONFIG_PATH lib/cmake/KF5Bookmarks) 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 bbfd33eb1a631d00469786f63907361bfe980d88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 30 Aug 2021 20:11:00 +0200 Subject: [PATCH 15/20] [kf5bookmarks] update versions --- versions/k-/kf5bookmarks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5bookmarks.json b/versions/k-/kf5bookmarks.json index d5084dc651b676..45ecaf3696789f 100644 --- a/versions/k-/kf5bookmarks.json +++ b/versions/k-/kf5bookmarks.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "66c7c736141a4f62063fd232fb3f42d3d6030666", + "git-tree": "377505aee18a63f4ae1f2d3c6294070b1a832624", "version-semver": "5.84.0", "port-version": 0 } From a5ad2c281d6101f1b87e2cce9fab394622fe16af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 30 Aug 2021 22:51:21 +0200 Subject: [PATCH 16/20] [kf5bookmarks] fix config cmake file --- ports/kf5bookmarks/fix_config_cmake.patch | 34 +++++++++++++++++++++++ ports/kf5bookmarks/portfile.cmake | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 ports/kf5bookmarks/fix_config_cmake.patch diff --git a/ports/kf5bookmarks/fix_config_cmake.patch b/ports/kf5bookmarks/fix_config_cmake.patch new file mode 100644 index 00000000000000..c39a55a968e4c6 --- /dev/null +++ b/ports/kf5bookmarks/fix_config_cmake.patch @@ -0,0 +1,34 @@ +From 459cfb91027b27831caaa63584859f51af88d778 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= +Date: Mon, 30 Aug 2021 23:02:11 +0200 +Subject: [PATCH] Add support for static builds + +--- + KF5BookmarksConfig.cmake.in | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/KF5BookmarksConfig.cmake.in b/KF5BookmarksConfig.cmake.in +index 0c4494a..de973f7 100644 +--- a/KF5BookmarksConfig.cmake.in ++++ b/KF5BookmarksConfig.cmake.in +@@ -6,6 +6,17 @@ find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") + find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) + find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) + ++if (NOT @BUILD_SHARED_LIBS@) ++ if (@Qt5DBus_FOUND@) ++ find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) ++ endif() ++ ++ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") ++ find_dependency(KF5Codecs "@KF_DEP_VERSION@") ++ find_dependency(KF5Config "@KF_DEP_VERSION@") ++ find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") ++ find_dependency(KF5XmlGui "@KF_DEP_VERSION@") ++endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5BookmarksTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ +-- +GitLab + diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index def498b2b984d9..5d509a4bf314dd 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v5.84.0 SHA512 3ba70c7fb312cd7715f0c14f78a4380150fd8716e93186302c39692609dbedda96d5e82d316ea683ffc9338cc5b4f2c689b24e06d66c3d5d735bae57f36ccad0 HEAD_REF master + PATCHES + fix_config_cmake.patch ) vcpkg_cmake_configure( From 9d473d955af0370acb92d4940ce6c34589aeafc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Mon, 30 Aug 2021 22:51:33 +0200 Subject: [PATCH 17/20] [kf5bookmarks] update versions --- versions/k-/kf5bookmarks.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/k-/kf5bookmarks.json b/versions/k-/kf5bookmarks.json index 45ecaf3696789f..f006395ba0a06f 100644 --- a/versions/k-/kf5bookmarks.json +++ b/versions/k-/kf5bookmarks.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "377505aee18a63f4ae1f2d3c6294070b1a832624", + "git-tree": "d0e6c89ef7b0abdaa97b7fe1cbf048d97a19bf04", "version-semver": "5.84.0", "port-version": 0 } From 5c610dc6610cfe1c4b3eeaf9afd42e67052d93b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 24 Sep 2021 11:22:13 +0300 Subject: [PATCH 18/20] [kf5bookmarks] remote meta info from patch --- ports/kf5bookmarks/fix_config_cmake.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ports/kf5bookmarks/fix_config_cmake.patch b/ports/kf5bookmarks/fix_config_cmake.patch index c39a55a968e4c6..1a034ccc530bf4 100644 --- a/ports/kf5bookmarks/fix_config_cmake.patch +++ b/ports/kf5bookmarks/fix_config_cmake.patch @@ -1,12 +1,3 @@ -From 459cfb91027b27831caaa63584859f51af88d778 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Mon, 30 Aug 2021 23:02:11 +0200 -Subject: [PATCH] Add support for static builds - ---- - KF5BookmarksConfig.cmake.in | 11 +++++++++++ - 1 file changed, 11 insertions(+) - diff --git a/KF5BookmarksConfig.cmake.in b/KF5BookmarksConfig.cmake.in index 0c4494a..de973f7 100644 --- a/KF5BookmarksConfig.cmake.in From c4c1e58b2411beee218472e826f526f8a75253ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 24 Sep 2021 11:23:18 +0300 Subject: [PATCH 19/20] [kf5bookmarks] use generic, non-semver versioning --- ports/kf5bookmarks/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json index 63060c4eca12d9..e07d045695da9c 100644 --- a/ports/kf5bookmarks/vcpkg.json +++ b/ports/kf5bookmarks/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5bookmarks", - "version-semver": "5.84.0", + "version": "5.84.0", "description": "Bookmarks management library", "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", "dependencies": [ From c90fe9ba423f9331935ccbd7832bcab216fdd7ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= Date: Fri, 24 Sep 2021 11:23:22 +0300 Subject: [PATCH 20/20] [kf5bookmarks] update versions --- versions/k-/kf5bookmarks.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/k-/kf5bookmarks.json b/versions/k-/kf5bookmarks.json index f006395ba0a06f..b98605df0deb5e 100644 --- a/versions/k-/kf5bookmarks.json +++ b/versions/k-/kf5bookmarks.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "d0e6c89ef7b0abdaa97b7fe1cbf048d97a19bf04", - "version-semver": "5.84.0", + "git-tree": "64191caa589d36090d34e4f699e7c90d836a6726", + "version": "5.84.0", "port-version": 0 } ]