From 62e469eee84bf1d62c8dcc2f9ddbf2aa9230c07c Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Tue, 9 Jun 2020 23:08:08 +0530 Subject: [PATCH 01/31] Add KF5Config --- ports/kf5config/CONTROL | 4 +++ ports/kf5config/portfile.cmake | 45 ++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 ports/kf5config/CONTROL create mode 100644 ports/kf5config/portfile.cmake diff --git a/ports/kf5config/CONTROL b/ports/kf5config/CONTROL new file mode 100644 index 00000000000000..595f0acb3c8a52 --- /dev/null +++ b/ports/kf5config/CONTROL @@ -0,0 +1,4 @@ +Source: kf5config +Version: 5.64.0 +Description: Configuration system +Build-Depends: ecm, qt5-base, qt5-tools \ No newline at end of file diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake new file mode 100644 index 00000000000000..0735b9a75d4b62 --- /dev/null +++ b/ports/kf5config/portfile.cmake @@ -0,0 +1,45 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kconfig + REF v5.64.0 + SHA512 b8919e552a35ed3f4882d2d15205c5576be985e9f6e4e834d26587c9288e85a2ab27504a1531d1af70e8db4dc7ed71a6b0caf91c7310dace81177b68aa6a97e5 + 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() + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/kf5config) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconfig_compiler_kf5.exe ${CURRENT_PACKAGES_DIR}/tools/kf5config/kconfig_compiler_kf5.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconf_update.exe ${CURRENT_PACKAGES_DIR}/tools/kf5config/kconf_update.exe) + +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Config) + +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kconfig_compiler_kf5.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kconf_update.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kreadconfig5.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kwriteconfig5.exe) + +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/kf5config) +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/kf5config/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") +vcpkg_copy_pdbs() + +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/kf5config RENAME copyright) \ No newline at end of file From 5c93c07c4f262dc04ef18d8ba0fc740ef59b987d Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Tue, 9 Jun 2020 23:58:31 +0530 Subject: [PATCH 02/31] Add KF5WidgetsAddons --- ports/kf5widgetsaddons/CONTROL | 4 ++++ ports/kf5widgetsaddons/portfile.cmake | 31 +++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 ports/kf5widgetsaddons/CONTROL create mode 100644 ports/kf5widgetsaddons/portfile.cmake diff --git a/ports/kf5widgetsaddons/CONTROL b/ports/kf5widgetsaddons/CONTROL new file mode 100644 index 00000000000000..94b8d665395db6 --- /dev/null +++ b/ports/kf5widgetsaddons/CONTROL @@ -0,0 +1,4 @@ +Source: kf5widgetsaddons +Version: 5.64.0 +Description: Addons to QtWidgets +Build-Depends: ecm, qt5-base, qt5-tools \ No newline at end of file diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake new file mode 100644 index 00000000000000..556dee370ea947 --- /dev/null +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kwidgetsaddons + REF v5.64.0 + SHA512 f49bade85b97468ad4c2faa34b71c6d04ff95c720c27e5b7adfb9a7b5acf8ff30b91d2beca7472dec6b8241f918b4fb15bddc1429be86a62bcefefe918311307 + 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 + -DBUILD_DESIGNERPLUGIN=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5WidgetsAddons) +vcpkg_copy_pdbs() + +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/kf5widgetsaddons RENAME copyright) \ No newline at end of file From 19d114ccc15035d5b568e19b4874e9f334b1daf4 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 10 Jun 2020 00:04:28 +0530 Subject: [PATCH 03/31] Add KF5Completion --- ports/kf5completion/CONTROL | 4 ++++ ports/kf5completion/portfile.cmake | 31 ++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 ports/kf5completion/CONTROL create mode 100644 ports/kf5completion/portfile.cmake diff --git a/ports/kf5completion/CONTROL b/ports/kf5completion/CONTROL new file mode 100644 index 00000000000000..3a55f5fec35bc5 --- /dev/null +++ b/ports/kf5completion/CONTROL @@ -0,0 +1,4 @@ +Source: kf5completion +Version: 5.64.0 +Description: Text completion helpers and widgets +Build-Depends: ecm, qt5-tools, kf5config, kf5widgetsaddons \ No newline at end of file diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake new file mode 100644 index 00000000000000..6b3b6e95eff3b8 --- /dev/null +++ b/ports/kf5completion/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcompletion + REF v5.64.0 + SHA512 1d597bc0e82d1570b1ff7b254425ab18d4d505a0b7f475a43b51d70566b91e763b86675837421c3f09073544efa77e673e9d2cfef586c12684fc9fe7b0c6a0cc + 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 + -DBUILD_DESIGNERPLUGIN=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Completion) +vcpkg_copy_pdbs() + +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/kf5completion RENAME copyright) \ No newline at end of file From b1309ddd17ee55057f4f4ca8afd53f507d168a2d Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 10 Jun 2020 00:09:59 +0530 Subject: [PATCH 04/31] Add KF5CoreAddons --- ports/kf5coreaddons/CONTROL | 4 ++++ ports/kf5coreaddons/portfile.cmake | 36 ++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 ports/kf5coreaddons/CONTROL create mode 100644 ports/kf5coreaddons/portfile.cmake diff --git a/ports/kf5coreaddons/CONTROL b/ports/kf5coreaddons/CONTROL new file mode 100644 index 00000000000000..4ba3b28805f3d9 --- /dev/null +++ b/ports/kf5coreaddons/CONTROL @@ -0,0 +1,4 @@ +Source: kf5coreaddons +Version: 5.64.0 +Description: Addons to QtCore +Build-Depends: ecm, qt5-base, qt5-tools \ No newline at end of file diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake new file mode 100644 index 00000000000000..e33618130d4049 --- /dev/null +++ b/ports/kf5coreaddons/portfile.cmake @@ -0,0 +1,36 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcoreaddons + REF v5.64.0 + SHA512 b6849c072aa33cd2d93477e7a08ffc8ec7034f7d8530b6492faa9a53e4e15af0da778fc54e5d865e68b36c32aa6559f3d178a03046f5120d11dcb61d35ed7a60 +) + +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 + -DKDE_INSTALL_DATAROOTDIR=data +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5CoreAddons) +vcpkg_copy_pdbs() + +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/desktoptojson.exe ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons/desktoptojson.exe) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons) +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/desktoptojson.exe) +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/kf5coreaddons RENAME copyright) \ No newline at end of file From 08ced90f01fd4e8940cf7bb92d2d1e2269798c0f Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 10 Jun 2020 00:14:24 +0530 Subject: [PATCH 05/31] Add KF5WindowSystem --- ports/kf5windowsystem/CONTROL | 4 ++++ ports/kf5windowsystem/portfile.cmake | 29 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 ports/kf5windowsystem/CONTROL create mode 100644 ports/kf5windowsystem/portfile.cmake diff --git a/ports/kf5windowsystem/CONTROL b/ports/kf5windowsystem/CONTROL new file mode 100644 index 00000000000000..3ceac2ab80a304 --- /dev/null +++ b/ports/kf5windowsystem/CONTROL @@ -0,0 +1,4 @@ +Source: kf5windowsystem +Version: 5.64.0 +Description: Access to the windowing system +Build-Depends: ecm, qt5-winextras, qt5-tools \ No newline at end of file diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake new file mode 100644 index 00000000000000..28548a90c27b50 --- /dev/null +++ b/ports/kf5windowsystem/portfile.cmake @@ -0,0 +1,29 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kwindowsystem + REF v5.64.0 + SHA512 7e1033ac383042b76254f35676c8aa011f02192e80ac2eb0554014a483749b13002062e7e928884f95dc7cb2a1c390bd2a93a7871d3f107b7042f7219dadecf5 +) + +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 + -DKDE_INSTALL_PLUGINDIR=plugins +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5WindowSystem) +vcpkg_copy_pdbs() + +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}/etc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5windowsystem RENAME copyright) \ No newline at end of file From 2d55eb3b8374be1e5e9fe6b3bdf800ee251774be Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 10 Jun 2020 00:19:02 +0530 Subject: [PATCH 06/31] Add KF5GuiAddons --- ports/kf5guiaddons/CONTROL | 4 ++++ ports/kf5guiaddons/portfile.cmake | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 ports/kf5guiaddons/CONTROL create mode 100644 ports/kf5guiaddons/portfile.cmake diff --git a/ports/kf5guiaddons/CONTROL b/ports/kf5guiaddons/CONTROL new file mode 100644 index 00000000000000..4b43edef35643c --- /dev/null +++ b/ports/kf5guiaddons/CONTROL @@ -0,0 +1,4 @@ +Source: kf5guiaddons +Version: 5.64.0 +Description: Addons to QtGui +Build-Depends: ecm, qt5-winextras, qt5-tools \ No newline at end of file diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake new file mode 100644 index 00000000000000..38727595eb6143 --- /dev/null +++ b/ports/kf5guiaddons/portfile.cmake @@ -0,0 +1,30 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kguiaddons + REF v5.64.0 + SHA512 98d07360f02b473997cdbf9e9b832ea8c4a459a73669eff1db5276dfbd63e9a9088e3c1ed99d70cc1433468e1efcbce43d22fefdf75a399f4812e0fc4a4f13b1 + 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/KF5GuiAddons) +vcpkg_copy_pdbs() + +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/kf5guiaddons RENAME copyright) \ No newline at end of file From ce67acab362c9fcbca6fdcde1ad5ccb3c3dbca01 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 10 Jun 2020 00:22:47 +0530 Subject: [PATCH 07/31] Add KF5ItemModels --- ports/kf5itemmodels/CONTROL | 4 ++++ ports/kf5itemmodels/portfile.cmake | 28 ++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 ports/kf5itemmodels/CONTROL create mode 100644 ports/kf5itemmodels/portfile.cmake diff --git a/ports/kf5itemmodels/CONTROL b/ports/kf5itemmodels/CONTROL new file mode 100644 index 00000000000000..b27f4e1190098a --- /dev/null +++ b/ports/kf5itemmodels/CONTROL @@ -0,0 +1,4 @@ +Source: kf5itemmodels +Version: 5.64.0 +Description: Models for Qt Model/View system +Build-Depends: ecm, qt5-tools, qt5-base \ No newline at end of file diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake new file mode 100644 index 00000000000000..0d41c6c0c91eb3 --- /dev/null +++ b/ports/kf5itemmodels/portfile.cmake @@ -0,0 +1,28 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kitemmodels + REF v5.64.0 + SHA512 c29911b5ff521a8d1dae9b72250be59267da7bf059aeb1efec6a7361204957c12a1ae95fd34a00067b277ce3a61d88930326501c361341a316d6c0afb109b7ed +) + +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/KF5ItemModels) +vcpkg_copy_pdbs() + +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}/etc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5itemmodels RENAME copyright) \ No newline at end of file From b9d7302c4617faf5f060d6557bcfa9cc8801714e Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 10 Jun 2020 00:26:48 +0530 Subject: [PATCH 08/31] Add KF5ItemViews --- ports/kf5itemviews/CONTROL | 4 ++++ ports/kf5itemviews/portfile.cmake | 29 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 ports/kf5itemviews/CONTROL create mode 100644 ports/kf5itemviews/portfile.cmake diff --git a/ports/kf5itemviews/CONTROL b/ports/kf5itemviews/CONTROL new file mode 100644 index 00000000000000..d97e476b8f17f1 --- /dev/null +++ b/ports/kf5itemviews/CONTROL @@ -0,0 +1,4 @@ +Source: kf5itemviews +Version: 5.64.0 +Description: Widget addons for Qt Model/View +Build-Depends: ecm, qt5-tools, qt5-base \ No newline at end of file diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake new file mode 100644 index 00000000000000..19467938e07625 --- /dev/null +++ b/ports/kf5itemviews/portfile.cmake @@ -0,0 +1,29 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kitemviews + REF v5.64.0 + SHA512 c40d1dee94badac2e58098138522d72be00082ac9ce70e8f5690b5bd5ae0705fa79a7edc3af391230a86d08a4a8b7dac1c28f148758f7ee8c09195a178e35bcb +) + +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 + -DBUILD_DESIGNERPLUGIN=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5ItemViews) +vcpkg_copy_pdbs() + +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}/etc) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5itemviews RENAME copyright) \ No newline at end of file From 2c848ce7ae423601d6a0372900060c0e6d0f62ea Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 10 Jun 2020 00:32:45 +0530 Subject: [PATCH 09/31] Add KF5i18n --- ports/kf5i18n/CONTROL | 4 ++++ ports/kf5i18n/portfile.cmake | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 ports/kf5i18n/CONTROL create mode 100644 ports/kf5i18n/portfile.cmake diff --git a/ports/kf5i18n/CONTROL b/ports/kf5i18n/CONTROL new file mode 100644 index 00000000000000..1f8d616b4db316 --- /dev/null +++ b/ports/kf5i18n/CONTROL @@ -0,0 +1,4 @@ +Source: kf5i18n +Version: 5.64.0 +Description: Advanced internationalization framework +Build-Depends: ecm, qt5-declarative, qt5-tools \ No newline at end of file diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake new file mode 100644 index 00000000000000..ebfa44735d48b2 --- /dev/null +++ b/ports/kf5i18n/portfile.cmake @@ -0,0 +1,34 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/ki18n + REF v5.64.0 + SHA512 13b5d701003edea704ffc86a886d86b27ff2198d4cde4ee732b9241cf04dba0fba403f1f78b45facd7c2d3b543f8f0a098369035270a61b347331eb495fae1d3 +) + +vcpkg_acquire_msys(MSYS_ROOT PACKAGES mingw-w64-i686-gettext) +set(GETTEXT_PATH ${MSYS_ROOT}/mingw32/bin) +vcpkg_add_to_path(${GETTEXT_PATH}) + +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 + -DKDE_INSTALL_PLUGINDIR=plugins +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5I18n) +vcpkg_copy_pdbs() + +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/kf5i18n RENAME copyright) \ No newline at end of file From dc7d8745e1852206a5cb9262aebc9801eb41d666 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 10 Jun 2020 01:39:16 +0530 Subject: [PATCH 10/31] Initial attempt to port quazip --- ports/quazip/CONTROL | 4 ++++ ports/quazip/portfile.cmake | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 ports/quazip/CONTROL create mode 100644 ports/quazip/portfile.cmake diff --git a/ports/quazip/CONTROL b/ports/quazip/CONTROL new file mode 100644 index 00000000000000..e8dedd3c60e9b1 --- /dev/null +++ b/ports/quazip/CONTROL @@ -0,0 +1,4 @@ +Source: quazip +Version: 0.9.1 +Description: Qt/C++ wrapper over minizip +Build-Depends: qt5-base, zlib \ No newline at end of file diff --git a/ports/quazip/portfile.cmake b/ports/quazip/portfile.cmake new file mode 100644 index 00000000000000..33e0efa4101e19 --- /dev/null +++ b/ports/quazip/portfile.cmake @@ -0,0 +1,20 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO stachenov/quazip + REF v0.9.1 + SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0 +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/QuaZip5/) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/QuaZip5/ RENAME copyright) \ No newline at end of file From dfa61fb061361a8e898fd942ff2949f235b09ed5 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Thu, 11 Jun 2020 15:22:54 +0530 Subject: [PATCH 11/31] Fixed Quazip post installation checks --- ports/quazip/portfile.cmake | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ports/quazip/portfile.cmake b/ports/quazip/portfile.cmake index 33e0efa4101e19..ac767a8cf528f0 100644 --- a/ports/quazip/portfile.cmake +++ b/ports/quazip/portfile.cmake @@ -16,5 +16,14 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/QuaZip5/) vcpkg_copy_pdbs() +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll ${CURRENT_PACKAGES_DIR}/bin/quazip5.dll) +endif() +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5d.dll) + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5d.dll ${CURRENT_PACKAGES_DIR}/debug/bin/quazip5d.dll) +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/QuaZip5/ RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/quazip/ RENAME copyright) \ No newline at end of file From 7c5508a48ae0282fe0043c9632a6864a7e6e5884 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Fri, 12 Jun 2020 12:19:58 +0530 Subject: [PATCH 12/31] Fixed linux builds --- ports/kf5archive/portfile.cmake | 1 + ports/kf5completion/portfile.cmake | 3 ++- ports/kf5config/portfile.cmake | 31 ++++++++++++++++++++-------- ports/kf5coreaddons/portfile.cmake | 17 ++++++++++++--- ports/kf5guiaddons/CONTROL | 2 +- ports/kf5i18n/portfile.cmake | 10 +++++---- ports/kf5itemmodels/portfile.cmake | 3 ++- ports/kf5itemviews/portfile.cmake | 3 ++- ports/kf5windowsystem/CONTROL | 2 +- ports/kf5windowsystem/portfile.cmake | 3 ++- 10 files changed, 53 insertions(+), 22 deletions(-) diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index aaaa48de0bbce0..e6897165f87a6c 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -22,4 +22,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) 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/kf5archive RENAME copyright) diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index 6b3b6e95eff3b8..b0010e782f99de 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -28,4 +28,5 @@ 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/kf5completion RENAME copyright) \ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5completion RENAME copyright) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 0735b9a75d4b62..141a3593743fd1 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -20,26 +20,39 @@ vcpkg_configure_cmake( vcpkg_install_cmake() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/kf5config) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconfig_compiler_kf5.exe ${CURRENT_PACKAGES_DIR}/tools/kf5config/kconfig_compiler_kf5.exe) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconf_update.exe ${CURRENT_PACKAGES_DIR}/tools/kf5config/kconf_update.exe) + +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconfig_compiler_kf5.exe ${CURRENT_PACKAGES_DIR}/tools/kf5config/kconfig_compiler_kf5.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconf_update.exe ${CURRENT_PACKAGES_DIR}/tools/kf5config/kconf_update.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kconfig_compiler_kf5.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kconf_update.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kreadconfig5.exe) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kwriteconfig5.exe) +else() + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5) + file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kreadconfig5) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kwriteconfig5) +endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Config) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kconfig_compiler_kf5.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kconf_update.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kreadconfig5.exe) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kwriteconfig5.exe) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/kf5config) file(APPEND ${CURRENT_PACKAGES_DIR}/tools/kf5config/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") 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/kf5config RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5config RENAME copyright) diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index e33618130d4049..c24508f677b3e8 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -21,16 +21,27 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5CoreAddons) vcpkg_copy_pdbs() +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + set(EXECUTABLE_SUFFIX ".exe") +else() + set(EXECUTABLE_SUFFIX "") +endif() + file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/desktoptojson.exe ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons/desktoptojson.exe) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/desktoptojson${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons/desktoptojson${EXECUTABLE_SUFFIX}) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons) file(APPEND ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/desktoptojson.exe) +file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/desktoptojson${EXECUTABLE_SUFFIX}) 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/kf5coreaddons RENAME copyright) \ No newline at end of file +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + + +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5coreaddons RENAME copyright) diff --git a/ports/kf5guiaddons/CONTROL b/ports/kf5guiaddons/CONTROL index 4b43edef35643c..bec6d27daa3aec 100644 --- a/ports/kf5guiaddons/CONTROL +++ b/ports/kf5guiaddons/CONTROL @@ -1,4 +1,4 @@ Source: kf5guiaddons Version: 5.64.0 Description: Addons to QtGui -Build-Depends: ecm, qt5-winextras, qt5-tools \ No newline at end of file +Build-Depends: ecm, qt5-winextras (windows), qt5-x11extras (linux), qt5-tools diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index ebfa44735d48b2..48ab2954a3afcf 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -7,9 +7,11 @@ vcpkg_from_github( SHA512 13b5d701003edea704ffc86a886d86b27ff2198d4cde4ee732b9241cf04dba0fba403f1f78b45facd7c2d3b543f8f0a098369035270a61b347331eb495fae1d3 ) -vcpkg_acquire_msys(MSYS_ROOT PACKAGES mingw-w64-i686-gettext) -set(GETTEXT_PATH ${MSYS_ROOT}/mingw32/bin) -vcpkg_add_to_path(${GETTEXT_PATH}) +if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + vcpkg_acquire_msys(MSYS_ROOT PACKAGES mingw-w64-i686-gettext) + set(GETTEXT_PATH ${MSYS_ROOT}/mingw32/bin) + vcpkg_add_to_path(${GETTEXT_PATH}) +endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} @@ -31,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/kf5i18n RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5i18n RENAME copyright) diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index 0d41c6c0c91eb3..aa7f6315626bad 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -25,4 +25,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) 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/kf5itemmodels RENAME copyright) \ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5itemmodels RENAME copyright) diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index 19467938e07625..61b18413f15b95 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -26,4 +26,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) 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/kf5itemviews RENAME copyright) \ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5itemviews RENAME copyright) diff --git a/ports/kf5windowsystem/CONTROL b/ports/kf5windowsystem/CONTROL index 3ceac2ab80a304..b0508fe41a28d6 100644 --- a/ports/kf5windowsystem/CONTROL +++ b/ports/kf5windowsystem/CONTROL @@ -1,4 +1,4 @@ Source: kf5windowsystem Version: 5.64.0 Description: Access to the windowing system -Build-Depends: ecm, qt5-winextras, qt5-tools \ No newline at end of file +Build-Depends: ecm, qt5-winextras (windows), qt5-tools diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 28548a90c27b50..6786c52851fed3 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -26,4 +26,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) 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/kf5windowsystem RENAME copyright) \ No newline at end of file +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5windowsystem RENAME copyright) From 0c70d0097e10f3f50a3d7f6b353f1b380c265888 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Fri, 12 Jun 2020 18:07:47 +0530 Subject: [PATCH 13/31] Fixed x64-linux dynamic builds --- ports/kf5config/portfile.cmake | 4 +--- ports/kf5coreaddons/portfile.cmake | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 141a3593743fd1..e493eab2d362d0 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -44,9 +44,7 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/kf5config) file(APPEND ${CURRENT_PACKAGES_DIR}/tools/kf5config/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") 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" "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index c24508f677b3e8..64591ce9b44bb4 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -39,9 +39,7 @@ 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) -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" "${CURRENT_PACKAGES_DIR}/debug/bin") file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5coreaddons RENAME copyright) From fe6265c93d2e38c8b2206501dd33464f32993b1a Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Fri, 12 Jun 2020 19:58:55 +0530 Subject: [PATCH 14/31] Temporary patch for KF5Completion until fixed in upstream --- .../add-qdbus-to-required-libraries.patch | 13 +++++++++++++ ports/kf5completion/portfile.cmake | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 ports/kf5completion/add-qdbus-to-required-libraries.patch diff --git a/ports/kf5completion/add-qdbus-to-required-libraries.patch b/ports/kf5completion/add-qdbus-to-required-libraries.patch new file mode 100644 index 00000000000000..b5c285a652b693 --- /dev/null +++ b/ports/kf5completion/add-qdbus-to-required-libraries.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a86a05e..688bae2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,7 +32,7 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KCOMPLETION + # Dependencies + set(REQUIRED_QT_VERSION 5.11.0) + +-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets) ++find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Widgets DBus) + + find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED) + find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} REQUIRED) diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index b0010e782f99de..b5451988730db8 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -6,6 +6,9 @@ vcpkg_from_github( REF v5.64.0 SHA512 1d597bc0e82d1570b1ff7b254425ab18d4d505a0b7f475a43b51d70566b91e763b86675837421c3f09073544efa77e673e9d2cfef586c12684fc9fe7b0c6a0cc HEAD_REF master + # reported issue, just a manual workaround until the issue is fixed upstream + PATCHES + "add-qdbus-to-required-libraries.patch" ) vcpkg_configure_cmake( From 941793e58d2c31b5c8f0487c0236cfc89e3e3b0f Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Fri, 12 Jun 2020 20:13:58 +0530 Subject: [PATCH 15/31] Add Vc --- ports/vc/CONTROL | 3 +++ ports/vc/correct_cmake_config_path.patch | 22 ++++++++++++++++++++ ports/vc/portfile.cmake | 26 ++++++++++++++++++++++++ 3 files changed, 51 insertions(+) create mode 100644 ports/vc/CONTROL create mode 100644 ports/vc/correct_cmake_config_path.patch create mode 100644 ports/vc/portfile.cmake diff --git a/ports/vc/CONTROL b/ports/vc/CONTROL new file mode 100644 index 00000000000000..b88b525d0bed5a --- /dev/null +++ b/ports/vc/CONTROL @@ -0,0 +1,3 @@ +Source: vc +Version: 1.4.1 +Description: SIMD Vector Classes for C++ . diff --git a/ports/vc/correct_cmake_config_path.patch b/ports/vc/correct_cmake_config_path.patch new file mode 100644 index 00000000000000..bb1d5437b3d5a3 --- /dev/null +++ b/ports/vc/correct_cmake_config_path.patch @@ -0,0 +1,22 @@ +diff --git a/cmake/VcConfig.cmake.in b/cmake/VcConfig.cmake.in +index 36de476..5cb0e5b 100644 +--- a/cmake/VcConfig.cmake.in ++++ b/cmake/VcConfig.cmake.in +@@ -4,7 +4,7 @@ + set_and_check(@PROJECT_NAME@_INSTALL_DIR @PACKAGE_CMAKE_INSTALL_PREFIX@) + set_and_check(@PROJECT_NAME@_INCLUDE_DIR @PACKAGE_CMAKE_INSTALL_PREFIX@/include) + set_and_check(@PROJECT_NAME@_LIB_DIR @PACKAGE_CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@) +-set_and_check(@PROJECT_NAME@_CMAKE_MODULES_DIR ${@PROJECT_NAME@_LIB_DIR}/cmake/Vc) ++set_and_check(@PROJECT_NAME@_CMAKE_MODULES_DIR @PACKAGE_CMAKE_INSTALL_PREFIX@/share/vc) + set(@PROJECT_NAME@_VERSION_STRING "@PROJECT_VERSION@") + + ### Setup @PROJECT_NAME@ defaults +@@ -20,7 +20,7 @@ list(APPEND @PROJECT_NAME@_ALL_FLAGS ${@PROJECT_NAME@_COMPILE_FLAGS}) + list(APPEND @PROJECT_NAME@_ALL_FLAGS ${@PROJECT_NAME@_ARCHITECTURE_FLAGS}) + + ### Import targets +-include("@PACKAGE_CMAKE_INSTALL_PREFIX@/@PACKAGE_INSTALL_DESTINATION@/@PROJECT_NAME@Targets.cmake") ++include(${@PROJECT_NAME@_CMAKE_MODULES_DIR}/@PROJECT_NAME@Targets.cmake) + + ### Define @PROJECT_NAME@_LIBRARIES for backwards compatibility + get_target_property(vc_lib_location @PROJECT_NAME@::Vc INTERFACE_LOCATION) diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake new file mode 100644 index 00000000000000..e820e888196210 --- /dev/null +++ b/ports/vc/portfile.cmake @@ -0,0 +1,26 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO VcDevel/Vc + REF 1.4.1 + SHA512 dd17e214099796c41d70416d365ea038c00c5fda285b05e48d7ee4fe03f4db2671d2be006ca7b98b0d4133bfcb57faf04cecfe35c29c3b006cd91c9a185cc04a + HEAD_REF master + PATCHES + "correct_cmake_config_path.patch" +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Vc/) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/vc RENAME copyright) From fadde0077647af564131f41ebe2a885a53a960af Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Fri, 12 Jun 2020 23:24:23 +0530 Subject: [PATCH 16/31] Add libde265 --- ports/libde265/CONTROL | 3 +++ ports/libde265/portfile.cmake | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 ports/libde265/CONTROL create mode 100644 ports/libde265/portfile.cmake diff --git a/ports/libde265/CONTROL b/ports/libde265/CONTROL new file mode 100644 index 00000000000000..bf3b47e2d85b66 --- /dev/null +++ b/ports/libde265/CONTROL @@ -0,0 +1,3 @@ +Source: libde265 +Version: 1.0.5 +Description: Open h.265 video codec implementation. diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake new file mode 100644 index 00000000000000..1a9e350bc2752e --- /dev/null +++ b/ports/libde265/portfile.cmake @@ -0,0 +1,20 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO strukturag/libde265 + REF v1.0.5 + SHA512 3ff7310fc4621cac0ef1cb9bbc4df61724f8943d57f5263a3663a77f4d90d84716b2a708ee9fec306e909dc8b5e7fe645a641b6a6db795a89a01799be910831e + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libde265/) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libde265 RENAME copyright) From e249c4ea820d84df85d48346272528bfa41a57d8 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Fri, 12 Jun 2020 23:37:55 +0530 Subject: [PATCH 17/31] Add libheif --- ports/libheif/CONTROL | 4 ++++ ports/libheif/portfile.cmake | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 ports/libheif/CONTROL create mode 100644 ports/libheif/portfile.cmake diff --git a/ports/libheif/CONTROL b/ports/libheif/CONTROL new file mode 100644 index 00000000000000..9556f67c98952f --- /dev/null +++ b/ports/libheif/CONTROL @@ -0,0 +1,4 @@ +Source: libheif +Version: 1.7.0 +Description: Open h.265 video codec implementation. +Build-Depends: x265, libde265 diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake new file mode 100644 index 00000000000000..ea67c1a053b80f --- /dev/null +++ b/ports/libheif/portfile.cmake @@ -0,0 +1,17 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO strukturag/libheif + REF v1.7.0 + SHA512 7da6ab9daf253c2493e0c3960c6f817e0234dfbd0463467cd1e5f11f7d6804735e401b73fb1038b8f81cfc6527fafb6ac7f4668c3de9400a0131c1292bdbe660 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA +) +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libheif/) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libheif RENAME copyright) From 0e0a95d43e284ddd7dfa717993fc57b0d95dd5d8 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Sat, 13 Jun 2020 00:03:49 +0530 Subject: [PATCH 18/31] Don't build examples and gdk pixbuf for libheif --- .../dont_build_examples_and_gdk_pixbuf.patch | 13 +++++++++++++ ports/libheif/portfile.cmake | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 ports/libheif/dont_build_examples_and_gdk_pixbuf.patch diff --git a/ports/libheif/dont_build_examples_and_gdk_pixbuf.patch b/ports/libheif/dont_build_examples_and_gdk_pixbuf.patch new file mode 100644 index 00000000000000..78bab905a380dc --- /dev/null +++ b/ports/libheif/dont_build_examples_and_gdk_pixbuf.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4463476..3a5cfbc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,6 +80,6 @@ configure_file(libheif.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libheif.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libheif.pc + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + +-add_subdirectory (examples) ++#add_subdirectory (examples) + add_subdirectory (libheif) +-add_subdirectory (gdk-pixbuf) ++#add_subdirectory (gdk-pixbuf) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index ea67c1a053b80f..3cea867db72aeb 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v1.7.0 SHA512 7da6ab9daf253c2493e0c3960c6f817e0234dfbd0463467cd1e5f11f7d6804735e401b73fb1038b8f81cfc6527fafb6ac7f4668c3de9400a0131c1292bdbe660 HEAD_REF master + PATCHES + dont_build_examples_and_gdk_pixbuf.patch ) vcpkg_configure_cmake( From c50f2b8d73f7a00ab534572804e525d042044133 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Sat, 13 Jun 2020 00:40:21 +0530 Subject: [PATCH 19/31] Add KF5Crash --- ports/kf5crash/CONTROL | 5 +++++ ports/kf5crash/add_x11extras.patch | 13 +++++++++++++ ports/kf5crash/portfile.cmake | 31 ++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) create mode 100644 ports/kf5crash/CONTROL create mode 100644 ports/kf5crash/add_x11extras.patch create mode 100644 ports/kf5crash/portfile.cmake diff --git a/ports/kf5crash/CONTROL b/ports/kf5crash/CONTROL new file mode 100644 index 00000000000000..970c1c93fca762 --- /dev/null +++ b/ports/kf5crash/CONTROL @@ -0,0 +1,5 @@ +Source: kf5crash +Version: 5.64.0 +Description: KCrash provides support for intercepting and handling application crashes. +Supports: linux +Build-Depends: ecm, kf5coreaddons, kf5widgetsaddons diff --git a/ports/kf5crash/add_x11extras.patch b/ports/kf5crash/add_x11extras.patch new file mode 100644 index 00000000000000..a6ff6fc66ce412 --- /dev/null +++ b/ports/kf5crash/add_x11extras.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8a9d1c6..0d5fb3f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,7 +12,7 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) + + set(REQUIRED_QT_VERSION 5.11.0) +-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core) ++find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core X11Extras) + include(KDEInstallDirs) + include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(KDECMakeSettings) diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake new file mode 100644 index 00000000000000..f1284c5a76a370 --- /dev/null +++ b/ports/kf5crash/portfile.cmake @@ -0,0 +1,31 @@ +include(vcpkg_common_functions) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO KDE/kcrash + REF v5.64.0 + SHA512 28749b220002fef756dbd8436cf684b7e3eb1d72ae00ae8b1bfded5c4a446683dc925a3be9beb55ad0872e71d3c23411d32b4fab935909816efa339cedaeda3d + HEAD_REF master + PATCHES + add_x11extras.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS + -DBUILD_TESTING=OFF +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Crash) +vcpkg_copy_pdbs() + +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/kf5crash RENAME copyright) From 42ce4def06ea6dbd9b19bbb23f41d27cfd562d7f Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Mon, 15 Jun 2020 21:24:05 +0530 Subject: [PATCH 20/31] Fix windows builds --- ports/kf5config/portfile.cmake | 5 ++++- ports/kf5coreaddons/portfile.cmake | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index e493eab2d362d0..0175bb1478f4e6 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -44,7 +44,10 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/kf5config) file(APPEND ${CURRENT_PACKAGES_DIR}/tools/kf5config/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 64591ce9b44bb4..052c80c9704983 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -39,7 +39,11 @@ 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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5coreaddons RENAME copyright) From 9bf48af5a576b82dc4061d2d0cc59956684faa42 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Mon, 15 Jun 2020 21:57:12 +0530 Subject: [PATCH 21/31] Add gettext as a dependency of kf5i18n --- ports/kf5i18n/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5i18n/CONTROL b/ports/kf5i18n/CONTROL index 1f8d616b4db316..59ed2c66d7a1b0 100644 --- a/ports/kf5i18n/CONTROL +++ b/ports/kf5i18n/CONTROL @@ -1,4 +1,4 @@ Source: kf5i18n Version: 5.64.0 Description: Advanced internationalization framework -Build-Depends: ecm, qt5-declarative, qt5-tools \ No newline at end of file +Build-Depends: ecm, qt5-declarative, qt5-tools, gettext \ No newline at end of file From 9bfcd603b39a1aab6231b15f8ddb9918e856e54a Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Thu, 18 Jun 2020 20:34:20 +0530 Subject: [PATCH 22/31] Formatting changes applied --- ports/kf5archive/portfile.cmake | 11 ++++++----- ports/kf5completion/portfile.cmake | 17 ++++++++--------- ports/kf5config/portfile.cmake | 23 +++++++++++------------ ports/kf5coreaddons/portfile.cmake | 23 +++++++++++------------ ports/kf5crash/portfile.cmake | 4 +--- ports/kf5guiaddons/portfile.cmake | 13 ++++++------- ports/kf5i18n/portfile.cmake | 15 +++++++-------- ports/kf5itemmodels/portfile.cmake | 11 ++++++----- ports/kf5itemviews/portfile.cmake | 15 +++++++-------- ports/kf5widgetsaddons/portfile.cmake | 15 +++++++-------- ports/kf5windowsystem/portfile.cmake | 15 +++++++-------- ports/libde265/portfile.cmake | 4 +--- ports/libheif/portfile.cmake | 2 +- ports/quazip/portfile.cmake | 4 +--- ports/vc/portfile.cmake | 4 +--- 15 files changed, 81 insertions(+), 95 deletions(-) diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index e6897165f87a6c..c7b99e8526c8de 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -9,10 +9,11 @@ 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_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() @@ -23,4 +24,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) 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/kf5archive RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index b5451988730db8..fc03a3057db2c1 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcompletion @@ -8,17 +6,18 @@ vcpkg_from_github( HEAD_REF master # reported issue, just a manual workaround until the issue is fixed upstream PATCHES - "add-qdbus-to-required-libraries.patch" + "add-qdbus-to-required-libraries.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 - -DBUILD_DESIGNERPLUGIN=OFF + OPTIONS + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF ) vcpkg_install_cmake() @@ -32,4 +31,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) 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/kf5completion RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index 0175bb1478f4e6..b94a964b2c19c1 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kconfig @@ -11,19 +9,20 @@ 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_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/kf5config) +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconfig_compiler_kf5.exe ${CURRENT_PACKAGES_DIR}/tools/kf5config/kconfig_compiler_kf5.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconf_update.exe ${CURRENT_PACKAGES_DIR}/tools/kf5config/kconf_update.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconfig_compiler_kf5.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/kconfig_compiler_kf5.exe) + file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconf_update.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/kconf_update.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kconfig_compiler_kf5.exe) @@ -40,8 +39,8 @@ endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Config) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/kf5config) -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/kf5config/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) @@ -56,4 +55,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/kf5config RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 052c80c9704983..975b024c420cc1 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcoreaddons @@ -10,11 +8,12 @@ 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 - -DKDE_INSTALL_DATAROOTDIR=data + OPTIONS + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF + -DKDE_INSTALL_DATAROOTDIR=data ) vcpkg_install_cmake() @@ -27,10 +26,10 @@ else() set(EXECUTABLE_SUFFIX "") endif() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/desktoptojson${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons/desktoptojson${EXECUTABLE_SUFFIX}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons) -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/kf5coreaddons/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(RENAME ${CURRENT_PACKAGES_DIR}/bin/desktoptojson${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/desktoptojson${EXECUTABLE_SUFFIX}) +vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) @@ -46,4 +45,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) endif() -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/kf5coreaddons RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index f1284c5a76a370..9a649cc8702b1f 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcrash @@ -28,4 +26,4 @@ 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/kf5crash RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index 38727595eb6143..8234e4cd8787ea 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kguiaddons @@ -11,10 +9,11 @@ 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_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() @@ -27,4 +26,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/kf5guiaddons RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 48ab2954a3afcf..a279b70f7bf07f 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/ki18n @@ -16,11 +14,12 @@ endif() 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 - -DKDE_INSTALL_PLUGINDIR=plugins + OPTIONS + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins ) vcpkg_install_cmake() @@ -33,4 +32,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/kf5i18n RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index aa7f6315626bad..08e103c23b3844 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -10,10 +10,11 @@ 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_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF ) vcpkg_install_cmake() @@ -26,4 +27,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) 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/kf5itemmodels RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index 61b18413f15b95..f134b477ceb43a 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kitemviews @@ -10,11 +8,12 @@ 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 - -DBUILD_DESIGNERPLUGIN=OFF + OPTIONS + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF ) vcpkg_install_cmake() @@ -27,4 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) 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/kf5itemviews RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index 556dee370ea947..fe7106e224bd09 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kwidgetsaddons @@ -11,11 +9,12 @@ 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 - -DBUILD_DESIGNERPLUGIN=OFF + OPTIONS + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF + -DBUILD_DESIGNERPLUGIN=OFF ) vcpkg_install_cmake() @@ -28,4 +27,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/kf5widgetsaddons RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 6786c52851fed3..0284c7408e5205 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kwindowsystem @@ -10,11 +8,12 @@ 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 - -DKDE_INSTALL_PLUGINDIR=plugins + OPTIONS + -DBUILD_HTML_DOCS=OFF + -DBUILD_MAN_DOCS=OFF + -DBUILD_QTHELP_DOCS=OFF + -DBUILD_TESTING=OFF + -DKDE_INSTALL_PLUGINDIR=plugins ) vcpkg_install_cmake() @@ -27,4 +26,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) 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/kf5windowsystem RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 1a9e350bc2752e..00a7097ee931ee 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libde265 @@ -17,4 +15,4 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libde265/) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libde265 RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 3cea867db72aeb..3b5d4f50262595 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -16,4 +16,4 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libheif/) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libheif RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/quazip/portfile.cmake b/ports/quazip/portfile.cmake index ac767a8cf528f0..f5040285b35911 100644 --- a/ports/quazip/portfile.cmake +++ b/ports/quazip/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO stachenov/quazip @@ -26,4 +24,4 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5d.dll) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/quazip/ RENAME copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/ RENAME copyright) \ No newline at end of file diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake index e820e888196210..e7fbc822c03a87 100644 --- a/ports/vc/portfile.cmake +++ b/ports/vc/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VcDevel/Vc @@ -23,4 +21,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/vc RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) From 7b525b2500b27cf65328d9dfaeb6a5ece706547a Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Fri, 19 Jun 2020 14:46:25 +0530 Subject: [PATCH 23/31] Add homepages of all the ports --- ports/kf5archive/CONTROL | 3 ++- ports/kf5completion/CONTROL | 1 + ports/kf5config/CONTROL | 3 ++- ports/kf5coreaddons/CONTROL | 3 ++- ports/kf5crash/CONTROL | 1 + ports/kf5guiaddons/CONTROL | 1 + ports/kf5i18n/CONTROL | 3 ++- ports/kf5itemmodels/CONTROL | 3 ++- ports/kf5itemviews/CONTROL | 3 ++- ports/kf5widgetsaddons/CONTROL | 3 ++- ports/kf5windowsystem/CONTROL | 1 + ports/libde265/CONTROL | 1 + ports/libheif/CONTROL | 1 + ports/quazip/CONTROL | 3 ++- ports/vc/CONTROL | 1 + 15 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL index a8f1d30ab2cbb6..337c4d1c6a925d 100644 --- a/ports/kf5archive/CONTROL +++ b/ports/kf5archive/CONTROL @@ -1,4 +1,5 @@ Source: kf5archive -Version: 5.64.0-1 +Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/karchive/html/index.html Description: File compression Build-Depends: ecm, qt5-base[core], zlib, bzip2 diff --git a/ports/kf5completion/CONTROL b/ports/kf5completion/CONTROL index 3a55f5fec35bc5..fb1f4309acea58 100644 --- a/ports/kf5completion/CONTROL +++ b/ports/kf5completion/CONTROL @@ -1,4 +1,5 @@ Source: kf5completion Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/kcompletion/html/index.html Description: Text completion helpers and widgets Build-Depends: ecm, qt5-tools, kf5config, kf5widgetsaddons \ No newline at end of file diff --git a/ports/kf5config/CONTROL b/ports/kf5config/CONTROL index 595f0acb3c8a52..8c0c49e3114d5d 100644 --- a/ports/kf5config/CONTROL +++ b/ports/kf5config/CONTROL @@ -1,4 +1,5 @@ Source: kf5config Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/kconfig/html/index.html Description: Configuration system -Build-Depends: ecm, qt5-base, qt5-tools \ No newline at end of file +Build-Depends: ecm, qt5-base, qt5-tools diff --git a/ports/kf5coreaddons/CONTROL b/ports/kf5coreaddons/CONTROL index 4ba3b28805f3d9..03d14a3545db45 100644 --- a/ports/kf5coreaddons/CONTROL +++ b/ports/kf5coreaddons/CONTROL @@ -1,4 +1,5 @@ Source: kf5coreaddons Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/kcoreaddons/html/index.html Description: Addons to QtCore -Build-Depends: ecm, qt5-base, qt5-tools \ No newline at end of file +Build-Depends: ecm, qt5-base, qt5-tools diff --git a/ports/kf5crash/CONTROL b/ports/kf5crash/CONTROL index 970c1c93fca762..927eca46cd0919 100644 --- a/ports/kf5crash/CONTROL +++ b/ports/kf5crash/CONTROL @@ -1,5 +1,6 @@ Source: kf5crash Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/kcrash/html/index.html Description: KCrash provides support for intercepting and handling application crashes. Supports: linux Build-Depends: ecm, kf5coreaddons, kf5widgetsaddons diff --git a/ports/kf5guiaddons/CONTROL b/ports/kf5guiaddons/CONTROL index bec6d27daa3aec..a364eecc1d79d3 100644 --- a/ports/kf5guiaddons/CONTROL +++ b/ports/kf5guiaddons/CONTROL @@ -1,4 +1,5 @@ Source: kf5guiaddons Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/kguiaddons/html/index.html Description: Addons to QtGui Build-Depends: ecm, qt5-winextras (windows), qt5-x11extras (linux), qt5-tools diff --git a/ports/kf5i18n/CONTROL b/ports/kf5i18n/CONTROL index 59ed2c66d7a1b0..4cb5ce4d594c39 100644 --- a/ports/kf5i18n/CONTROL +++ b/ports/kf5i18n/CONTROL @@ -1,4 +1,5 @@ Source: kf5i18n Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/ki18n/html/index.html Description: Advanced internationalization framework -Build-Depends: ecm, qt5-declarative, qt5-tools, gettext \ No newline at end of file +Build-Depends: ecm, qt5-declarative, qt5-tools, gettext diff --git a/ports/kf5itemmodels/CONTROL b/ports/kf5itemmodels/CONTROL index b27f4e1190098a..f94f20fa9d9fa4 100644 --- a/ports/kf5itemmodels/CONTROL +++ b/ports/kf5itemmodels/CONTROL @@ -1,4 +1,5 @@ Source: kf5itemmodels Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/kitemmodels/html/index.html Description: Models for Qt Model/View system -Build-Depends: ecm, qt5-tools, qt5-base \ No newline at end of file +Build-Depends: ecm, qt5-tools, qt5-base diff --git a/ports/kf5itemviews/CONTROL b/ports/kf5itemviews/CONTROL index d97e476b8f17f1..8d83844ebeae86 100644 --- a/ports/kf5itemviews/CONTROL +++ b/ports/kf5itemviews/CONTROL @@ -1,4 +1,5 @@ Source: kf5itemviews Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/kitemviews/html/index.html Description: Widget addons for Qt Model/View -Build-Depends: ecm, qt5-tools, qt5-base \ No newline at end of file +Build-Depends: ecm, qt5-tools, qt5-base diff --git a/ports/kf5widgetsaddons/CONTROL b/ports/kf5widgetsaddons/CONTROL index 94b8d665395db6..2e5f2eb515d499 100644 --- a/ports/kf5widgetsaddons/CONTROL +++ b/ports/kf5widgetsaddons/CONTROL @@ -1,4 +1,5 @@ Source: kf5widgetsaddons Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/kwidgetsaddons/html/index.html Description: Addons to QtWidgets -Build-Depends: ecm, qt5-base, qt5-tools \ No newline at end of file +Build-Depends: ecm, qt5-base, qt5-tools diff --git a/ports/kf5windowsystem/CONTROL b/ports/kf5windowsystem/CONTROL index b0508fe41a28d6..d5cb904870e089 100644 --- a/ports/kf5windowsystem/CONTROL +++ b/ports/kf5windowsystem/CONTROL @@ -1,4 +1,5 @@ Source: kf5windowsystem Version: 5.64.0 +Homepage: https://api.kde.org/frameworks/kwindowsystem/html/ Description: Access to the windowing system Build-Depends: ecm, qt5-winextras (windows), qt5-tools diff --git a/ports/libde265/CONTROL b/ports/libde265/CONTROL index bf3b47e2d85b66..cae1d9d34a2a5c 100644 --- a/ports/libde265/CONTROL +++ b/ports/libde265/CONTROL @@ -1,3 +1,4 @@ Source: libde265 Version: 1.0.5 +Homepage: https://www.libde265.org/ Description: Open h.265 video codec implementation. diff --git a/ports/libheif/CONTROL b/ports/libheif/CONTROL index 9556f67c98952f..be0476d4deb9b3 100644 --- a/ports/libheif/CONTROL +++ b/ports/libheif/CONTROL @@ -1,4 +1,5 @@ Source: libheif Version: 1.7.0 +Homepage: http://www.libheif.org/ Description: Open h.265 video codec implementation. Build-Depends: x265, libde265 diff --git a/ports/quazip/CONTROL b/ports/quazip/CONTROL index e8dedd3c60e9b1..853be24c058248 100644 --- a/ports/quazip/CONTROL +++ b/ports/quazip/CONTROL @@ -1,4 +1,5 @@ Source: quazip Version: 0.9.1 +Homepage: https://stachenov.github.io/quazip/ Description: Qt/C++ wrapper over minizip -Build-Depends: qt5-base, zlib \ No newline at end of file +Build-Depends: qt5-base, zlib diff --git a/ports/vc/CONTROL b/ports/vc/CONTROL index b88b525d0bed5a..98d488d87f1af2 100644 --- a/ports/vc/CONTROL +++ b/ports/vc/CONTROL @@ -1,3 +1,4 @@ Source: vc Version: 1.4.1 +Homepage: https://github.com/VcDevel/Vc Description: SIMD Vector Classes for C++ . From 0f05646fae5094ed2f4e54d2236d1820d415c9dc Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Fri, 19 Jun 2020 14:53:00 +0530 Subject: [PATCH 24/31] Removed deprecated functions --- ports/kf5config/portfile.cmake | 5 +---- ports/kf5coreaddons/portfile.cmake | 4 +--- ports/kf5i18n/portfile.cmake | 2 +- ports/kf5itemmodels/portfile.cmake | 2 -- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index b94a964b2c19c1..e64752d25fc67e 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_install_cmake() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconfig_compiler_kf5.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/kconfig_compiler_kf5.exe) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconf_update.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/kconf_update.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5.exe) @@ -38,17 +38,14 @@ endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Config) - vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") 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) diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 975b024c420cc1..6dbab16b958e8d 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -20,7 +20,7 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5CoreAddons) vcpkg_copy_pdbs() -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) set(EXECUTABLE_SUFFIX ".exe") else() set(EXECUTABLE_SUFFIX "") @@ -41,8 +41,6 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() - file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index a279b70f7bf07f..f8fdc3e15ea858 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( SHA512 13b5d701003edea704ffc86a886d86b27ff2198d4cde4ee732b9241cf04dba0fba403f1f78b45facd7c2d3b543f8f0a098369035270a61b347331eb495fae1d3 ) -if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") +if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) vcpkg_acquire_msys(MSYS_ROOT PACKAGES mingw-w64-i686-gettext) set(GETTEXT_PATH ${MSYS_ROOT}/mingw32/bin) vcpkg_add_to_path(${GETTEXT_PATH}) diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index 08e103c23b3844..9facbb120bea25 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kitemmodels From e2898aad8fa619f4a65dc4b7cbf3d469be40e888 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Fri, 19 Jun 2020 20:39:57 +0530 Subject: [PATCH 25/31] Fix quazip builds for x64-windows-static triplet --- ports/quazip/portfile.cmake | 6 ++-- ports/quazip/vcpkg_remove_extra_static.patch | 30 ++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 ports/quazip/vcpkg_remove_extra_static.patch diff --git a/ports/quazip/portfile.cmake b/ports/quazip/portfile.cmake index f5040285b35911..61977f70fde526 100644 --- a/ports/quazip/portfile.cmake +++ b/ports/quazip/portfile.cmake @@ -3,6 +3,8 @@ vcpkg_from_github( REPO stachenov/quazip REF v0.9.1 SHA512 db31f3c7e3d7e95c25090ceb8379643e0b49ed69ece009dd015bee120b2b60f42e73408f580caed3138fa19ca64dcd23a05f16435abb54e2b8df21105c7b42c0 + PATCHES + vcpkg_remove_extra_static.patch ) vcpkg_configure_cmake( @@ -18,9 +20,9 @@ if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll ${CURRENT_PACKAGES_DIR}/bin/quazip5.dll) endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5d.dll) +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5.dll) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5d.dll ${CURRENT_PACKAGES_DIR}/debug/bin/quazip5d.dll) + file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5.dll ${CURRENT_PACKAGES_DIR}/debug/bin/quazip5.dll) endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/quazip/vcpkg_remove_extra_static.patch b/ports/quazip/vcpkg_remove_extra_static.patch new file mode 100644 index 00000000000000..223b152416f647 --- /dev/null +++ b/ports/quazip/vcpkg_remove_extra_static.patch @@ -0,0 +1,30 @@ +diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt +index 1efb5e2..9f101cd 100644 +--- a/quazip/CMakeLists.txt ++++ b/quazip/CMakeLists.txt +@@ -10,22 +10,12 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD) + qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) + set(SRCS ${SRCS} ${MOC_SRCS}) + +-add_library(${QUAZIP_LIB_TARGET_NAME} SHARED ${SRCS}) +-add_library(quazip_static STATIC ${SRCS}) +- +-# Windows uses .lib extension for both static and shared library +-# *nix systems use different extensions for SHARED and STATIC library and by convention both libraries have the same name +-if (NOT WIN32) +- set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) +-endif () ++add_library(${QUAZIP_LIB_TARGET_NAME} ${VCPKG_LIBRARY_LINKAGE} ${SRCS}) + + target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) +-target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) +-set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d) + + # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) + target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) +-target_link_libraries(quazip_static ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) + + install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) +-install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) +\ No newline at end of file From 8bf7143bab7322395f44354541458f80ccd87838 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 24 Jun 2020 00:25:05 +0530 Subject: [PATCH 26/31] Put support directives and fixed windows static builds --- ports/libde265/CONTROL | 1 + ports/libde265/portfile.cmake | 6 ++++++ ports/vc/CONTROL | 1 + ports/vc/portfile.cmake | 2 ++ 4 files changed, 10 insertions(+) diff --git a/ports/libde265/CONTROL b/ports/libde265/CONTROL index cae1d9d34a2a5c..09ab2f2318147f 100644 --- a/ports/libde265/CONTROL +++ b/ports/libde265/CONTROL @@ -2,3 +2,4 @@ Source: libde265 Version: 1.0.5 Homepage: https://www.libde265.org/ Description: Open h.265 video codec implementation. +Supports: !(arm|uwp) diff --git a/ports/libde265/portfile.cmake b/ports/libde265/portfile.cmake index 00a7097ee931ee..70cfe2e3015b32 100644 --- a/ports/libde265/portfile.cmake +++ b/ports/libde265/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_ARCH "arm" ON_TARGET "uwp") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO strukturag/libde265 @@ -14,5 +16,9 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/libde265/) +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(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/vc/CONTROL b/ports/vc/CONTROL index 98d488d87f1af2..e56fda2d669037 100644 --- a/ports/vc/CONTROL +++ b/ports/vc/CONTROL @@ -2,3 +2,4 @@ Source: vc Version: 1.4.1 Homepage: https://github.com/VcDevel/Vc Description: SIMD Vector Classes for C++ . +Supports: !arm64 diff --git a/ports/vc/portfile.cmake b/ports/vc/portfile.cmake index e7fbc822c03a87..b5b0da5fb526ec 100644 --- a/ports/vc/portfile.cmake +++ b/ports/vc/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_ARCH "arm64") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO VcDevel/Vc From 6d04a4442c3b322124055d0f5db56f661e92593d Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 24 Jun 2020 00:33:29 +0530 Subject: [PATCH 27/31] Fix KF5Archive branch --- ports/kf5archive/CONTROL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/kf5archive/CONTROL b/ports/kf5archive/CONTROL index 337c4d1c6a925d..16592e34e80d1d 100644 --- a/ports/kf5archive/CONTROL +++ b/ports/kf5archive/CONTROL @@ -1,5 +1,5 @@ Source: kf5archive -Version: 5.64.0 +Version: 5.64.0-1 Homepage: https://api.kde.org/frameworks/karchive/html/index.html Description: File compression Build-Depends: ecm, qt5-base[core], zlib, bzip2 From f2aea52575ce37e1382a2c2358e08b6e1b962b4c Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Mon, 29 Jun 2020 21:07:58 +0530 Subject: [PATCH 28/31] fixing libheif for unix systems --- ports/libheif/portfile.cmake | 1 + ports/libheif/remove_finding_pkgconfig.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 ports/libheif/remove_finding_pkgconfig.patch diff --git a/ports/libheif/portfile.cmake b/ports/libheif/portfile.cmake index 3b5d4f50262595..838734b2d76cd5 100644 --- a/ports/libheif/portfile.cmake +++ b/ports/libheif/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES dont_build_examples_and_gdk_pixbuf.patch + remove_finding_pkgconfig.patch ) vcpkg_configure_cmake( diff --git a/ports/libheif/remove_finding_pkgconfig.patch b/ports/libheif/remove_finding_pkgconfig.patch new file mode 100644 index 00000000000000..ed8913a22b352b --- /dev/null +++ b/ports/libheif/remove_finding_pkgconfig.patch @@ -0,0 +1,18 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3a5cfbc..9a3046e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,10 +52,9 @@ if (has_potentially_evaluated_expression) + endif() + + if (UNIX) +- find_package(PkgConfig) +- pkg_check_modules(LIBDE265 libde265) +- pkg_check_modules(X265 x265) +- pkg_check_modules(AOM aom) ++ find_package(libde265) ++ find_package(x265) ++ find_package(aom) + endif() + + # Create libheif pkgconfig file From 150bda89e169870551417767a11c397ef8104d25 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Wed, 1 Jul 2020 01:12:07 +0530 Subject: [PATCH 29/31] Some linux specific changes --- ports/kf5completion/portfile.cmake | 1 - ports/kf5config/portfile.cmake | 8 +++----- ports/kf5coreaddons/portfile.cmake | 2 +- ports/kf5crash/portfile.cmake | 2 ++ 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index fc03a3057db2c1..d9e697dcf3cd34 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -30,5 +30,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(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index e64752d25fc67e..c378e9ea6b5346 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -25,10 +25,8 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconf_update.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/kconf_update.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5.exe) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kconfig_compiler_kf5.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kconf_update.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kreadconfig5.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kwriteconfig5.exe) + file (GLOB EXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) + file(REMOVE ${EXES}) else() file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5) file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5) @@ -42,7 +40,7 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") vcpkg_copy_pdbs() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index 6dbab16b958e8d..ba3840b7da1c39 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -39,7 +39,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_TARGET_IS_LINUX) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index 9a649cc8702b1f..dc608d37153250 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -1,3 +1,5 @@ +vcpkg_fail_port_install(ON_TARGET "osx" "uwp" "windows") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcrash From b2d63bfd36e2ef2435930defaee7b70d6f354275 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Tue, 14 Jul 2020 16:10:34 +0530 Subject: [PATCH 30/31] Apply suggestions to kde frameworks --- ports/kf5config/portfile.cmake | 2 +- ports/kf5coreaddons/portfile.cmake | 14 +++++--------- ports/kf5i18n/portfile.cmake | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index c378e9ea6b5346..444b1aed5abe24 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -37,7 +37,7 @@ endif() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Config) vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../data") vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index ba3840b7da1c39..14862e07f1188c 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -20,16 +20,12 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5CoreAddons) vcpkg_copy_pdbs() -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - set(EXECUTABLE_SUFFIX ".exe") -else() - set(EXECUTABLE_SUFFIX "") -endif() +vcpkg_copy_tools( + TOOL_NAMES desktoptojson + AUTO_CLEAN +) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(RENAME ${CURRENT_PACKAGES_DIR}/bin/desktoptojson${EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/${PORT}/desktoptojson${EXECUTABLE_SUFFIX}) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../data") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index f8fdc3e15ea858..efa22a577c9f82 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -5,7 +5,7 @@ vcpkg_from_github( SHA512 13b5d701003edea704ffc86a886d86b27ff2198d4cde4ee732b9241cf04dba0fba403f1f78b45facd7c2d3b543f8f0a098369035270a61b347331eb495fae1d3 ) -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) +if(CMAKE_HOST_WIN32) vcpkg_acquire_msys(MSYS_ROOT PACKAGES mingw-w64-i686-gettext) set(GETTEXT_PATH ${MSYS_ROOT}/mingw32/bin) vcpkg_add_to_path(${GETTEXT_PATH}) From eba683ef354a01d086339d97458b52518da697c0 Mon Sep 17 00:00:00 2001 From: Kuntal Majumder Date: Tue, 14 Jul 2020 22:02:44 +0530 Subject: [PATCH 31/31] Update quazip patch as suggested --- ports/quazip/portfile.cmake | 9 --------- ports/quazip/vcpkg_remove_extra_static.patch | 10 +++++----- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/ports/quazip/portfile.cmake b/ports/quazip/portfile.cmake index 61977f70fde526..4c8602b69234a2 100644 --- a/ports/quazip/portfile.cmake +++ b/ports/quazip/portfile.cmake @@ -16,14 +16,5 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/QuaZip5/) vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/quazip5.dll ${CURRENT_PACKAGES_DIR}/bin/quazip5.dll) -endif() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5.dll) - file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/debug/bin) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/quazip5.dll ${CURRENT_PACKAGES_DIR}/debug/bin/quazip5.dll) -endif() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/ RENAME copyright) \ No newline at end of file diff --git a/ports/quazip/vcpkg_remove_extra_static.patch b/ports/quazip/vcpkg_remove_extra_static.patch index 223b152416f647..e600424751c1d1 100644 --- a/ports/quazip/vcpkg_remove_extra_static.patch +++ b/ports/quazip/vcpkg_remove_extra_static.patch @@ -1,8 +1,8 @@ diff --git a/quazip/CMakeLists.txt b/quazip/CMakeLists.txt -index 1efb5e2..9f101cd 100644 +index 1efb5e2..2412b8a 100644 --- a/quazip/CMakeLists.txt +++ b/quazip/CMakeLists.txt -@@ -10,22 +10,12 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD) +@@ -10,22 +10,13 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD) qt_wrap_cpp(MOC_SRCS ${PUBLIC_HEADERS}) set(SRCS ${SRCS} ${MOC_SRCS}) @@ -14,11 +14,12 @@ index 1efb5e2..9f101cd 100644 -if (NOT WIN32) - set_target_properties(quazip_static PROPERTIES OUTPUT_NAME quazip${QUAZIP_LIB_VERSION_SUFFIX}) -endif () -+add_library(${QUAZIP_LIB_TARGET_NAME} ${VCPKG_LIBRARY_LINKAGE} ${SRCS}) ++add_library(${QUAZIP_LIB_TARGET_NAME} ${SRCS}) target_include_directories(${QUAZIP_LIB_TARGET_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) -target_include_directories(quazip_static PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS}) -set_target_properties(${QUAZIP_LIB_TARGET_NAME} quazip_static PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d) ++set_target_properties(${QUAZIP_LIB_TARGET_NAME} PROPERTIES VERSION ${QUAZIP_LIB_VERSION} SOVERSION ${QUAZIP_LIB_SOVERSION} DEBUG_POSTFIX d) # Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty) target_link_libraries(${QUAZIP_LIB_TARGET_NAME} ${QT_QTMAIN_LIBRARY} ${QTCORE_LIBRARIES} ${ZLIB_LIBRARIES}) @@ -26,5 +27,4 @@ index 1efb5e2..9f101cd 100644 install(FILES ${PUBLIC_HEADERS} DESTINATION include/quazip${QUAZIP_LIB_VERSION_SUFFIX}) -install(TARGETS ${QUAZIP_LIB_TARGET_NAME} quazip_static LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) -+install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${LIB_DESTINATION} ARCHIVE DESTINATION ${LIB_DESTINATION} RUNTIME DESTINATION ${LIB_DESTINATION}) -\ No newline at end of file ++install(TARGETS ${QUAZIP_LIB_TARGET_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})