early-access version 2853

externals/vcpkg/ports/ecm/fix_canberra.patch

@@ -0,0 +1,39 @@
+From 203c65c562453385e3ffc4485844b15e80b93107 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
+Date: Fri, 17 Sep 2021 00:07:08 +0200
+Subject: [PATCH] FindCanberra: link against target provided by pkgconfig
+
+target_link_libraries() against the target generated by
+pkg_check_modules() so that the additional linker options are not
+lost, such as the additional libraries to link against when
+building statically.
+
+BUG: 442555
+---
+ find-modules/FindCanberra.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/find-modules/FindCanberra.cmake b/find-modules/FindCanberra.cmake
+index c54adf99..f9561118 100644
+--- a/find-modules/FindCanberra.cmake
++++ b/find-modules/FindCanberra.cmake
+@@ -34,7 +34,7 @@ Since 5.56.0.
+ #]=======================================================================]
+ 
+ find_package(PkgConfig QUIET)
+-pkg_check_modules(PC_Canberra libcanberra QUIET)
++pkg_check_modules(PC_Canberra IMPORTED_TARGET libcanberra QUIET)
+ 
+ find_library(Canberra_LIBRARIES
+     NAMES canberra
+@@ -66,6 +66,7 @@ if(Canberra_FOUND AND NOT TARGET Canberra::Canberra)
+         INTERFACE_COMPILE_OPTIONS "${PC_Canberra_CFLAGS}"
+         INTERFACE_INCLUDE_DIRECTORIES "${Canberra_INCLUDE_DIRS}"
+     )
++    target_link_libraries(Canberra::Canberra INTERFACE PkgConfig::PC_Canberra)
+ endif()
+ 
+ mark_as_advanced(Canberra_LIBRARIES Canberra_INCLUDE_DIRS Canberra_VERSION)
+-- 
+GitLab
+

externals/vcpkg/ports/ecm/fix_generateqmltypes.patch

@@ -0,0 +1,31 @@
+diff --git a/modules/ECMGenerateQmlTypes.cmake b/modules/ECMGenerateQmlTypes.cmake
+index d6e124266308028b8533203da63f572f6e99b308..7d7cecb5201521019764102eba0da2abf8b4d911 100644
+--- a/modules/ECMGenerateQmlTypes.cmake
++++ b/modules/ECMGenerateQmlTypes.cmake
+@@ -1,4 +1,5 @@
+ # SPDX-FileCopyrightText: 2017 Aleix Pol Gonzalez <aleixpol@kde.org>
++# SPDX-FileCopyrightText: 2021 Dawid Wrobel <me@dawidwrobel.com>
+ #
+ # SPDX-License-Identifier: BSD-3-Clause
+ 
+@@ -18,10 +19,7 @@ our project offers. These files offer introspection upon our plugin and are
+ useful for integrating with IDE language support of our plugin. It offers
+ information about the objects its methods and their argument types.
+ 
+-The developer will be in charge of making sure that these files are up to date.
+-The plugin.qmltypes file will sit in the source directory. This function will
+-include the code that installs the file in the right place and a small unit
+-test named qmltypes-pluginname-version that makes sure that it doesn't need updating.
++This function installs the file in DESTINATION folder.
+ 
+ 
+ Since 5.33.0
+@@ -40,7 +38,7 @@ function(ecm_generate_qmltypes)
+     set(targetname "qmltypes-${ARG_UNPARSED_ARGUMENTS}")
+     string(REPLACE ";" - targetname "${targetname}")
+ 
+-    set(generatedFile ${CMAKE_CURRENT_SOURCE_DIR}/plugins.qmltypes)
++    set(generatedFile plugins.qmltypes)
+     add_custom_target(${targetname}
+         BYPRODUCTS ${generatedFile}
+         COMMAND qmlplugindump -nonrelocatable ${ARG_UNPARSED_ARGUMENTS} ${KDE_INSTALL_QMLDIR} > ${generatedFile}

externals/vcpkg/ports/ecm/fix_libmount.patch

@@ -0,0 +1,23 @@
+diff --git a/find-modules/FindLibMount.cmake b/find-modules/FindLibMount.cmake
+index 3fcde4c5435a79c61c53bbd27e1932441a056d98..1f53f0218faa82fdf9713ab768080ab7c1d72b4a 100644
+--- a/find-modules/FindLibMount.cmake
++++ b/find-modules/FindLibMount.cmake
+@@ -30,7 +30,7 @@ Since 5.83.0
+ #]=======================================================================]
+ 
+ find_package(PkgConfig QUIET)
+-pkg_check_modules(PC_LIBMOUNT QUIET mount)
++pkg_check_modules(PC_LIBMOUNT QUIET IMPORTED_TARGET mount)
+ 
+ find_path(LibMount_INCLUDE_DIRS NAMES libmount/libmount.h HINTS ${PC_LIBMOUNT_INCLUDE_DIRS})
+ find_library(LibMount_LIBRARIES NAMES mount HINTS ${PC_LIBMOUNT_LIBRARY_DIRS})
+@@ -62,6 +62,9 @@ if(LibMount_FOUND AND NOT TARGET LibMount::LibMount)
+         INTERFACE_INCLUDE_DIRECTORIES "${LibMount_INCLUDE_DIRS}"
+         INTERFACE_COMPILE_DEFINITIONS "${PC_LIBMOUNT_CFLAGS_OTHER}"
+     )
++    if (TARGET PkgConfig::PC_LIBMOUNT)
++        target_link_libraries(LibMount::LibMount INTERFACE PkgConfig::PC_LIBMOUNT)
++    endif()
+ endif()
+ 
+ include(FeatureSummary)

externals/vcpkg/ports/ecm/portfile.cmake

@@ -0,0 +1,32 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/extra-cmake-modules
+    REF v5.89.0
+    SHA512 1c3f6ad5dbe1485d1602e297989d6cd53e7646aa99dc28ac1159d0aa22134c97efd74b2c01923e74732f59c861ce05486adb7cff7de050237a35b0980e92cbcf
+    HEAD_REF master
+    PATCHES
+        fix_canberra.patch         # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/187
+        fix_libmount.patch         # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/200
+        fix_generateqmltypes.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/201
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_HTML_DOCS=OFF
+        -DBUILD_MAN_DOCS=OFF
+        -DBUILD_QTHELP_DOCS=OFF
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+
+# Remove debug files
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")
+
+file(COPY "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+# Allow empty include directory
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)

externals/vcpkg/ports/ecm/usage

@@ -0,0 +1,9 @@
+The package ecm provides CMake targets:
+
+    find_package(ECM CONFIG REQUIRED NO_MODULE)
+    set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+    include(KDEInstallDirs)
+    include(KDECompilerSettings)
+    include(KDECMakeSettings)
+
+For more infomation, see https://api.kde.org/ecm/

externals/vcpkg/ports/ecm/vcpkg.json

@@ -0,0 +1,12 @@
+{
+  "name": "ecm",
+  "version": "5.89.0",
+  "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake",
+  "homepage": "https://github.com/KDE/extra-cmake-modules",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}