aboutsummaryrefslogtreecommitdiff
path: root/devel/kf5-extra-cmake-modules
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2019-02-12 17:48:25 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2019-02-12 17:48:25 +0000
commit4b87a977f6eb18a15fa80e2705545415b6d96caf (patch)
treeb32e2271f23a59d2a4a1c39de41a751b2e61ed37 /devel/kf5-extra-cmake-modules
parent031fc9bfb6a4547020ec03524ede44c8ba3e359a (diff)
downloadports-4b87a977f6eb18a15fa80e2705545415b6d96caf.tar.gz
ports-4b87a977f6eb18a15fa80e2705545415b6d96caf.zip
Update KDE Frameworks to 5.55.0
Release Announcement: https://www.kde.org/announcements/kde-frameworks-5.55.0.php PR: 235620 Exp-run by: antoine
Notes
Notes: svn path=/head/; revision=492794
Diffstat (limited to 'devel/kf5-extra-cmake-modules')
-rw-r--r--devel/kf5-extra-cmake-modules/Makefile1
-rw-r--r--devel/kf5-extra-cmake-modules/distinfo6
-rw-r--r--devel/kf5-extra-cmake-modules/files/patch-kdephab_D17015.diff199
-rw-r--r--devel/kf5-extra-cmake-modules/pkg-plist17
4 files changed, 18 insertions, 205 deletions
diff --git a/devel/kf5-extra-cmake-modules/Makefile b/devel/kf5-extra-cmake-modules/Makefile
index 57abff891d09..ed5ecadd2da8 100644
--- a/devel/kf5-extra-cmake-modules/Makefile
+++ b/devel/kf5-extra-cmake-modules/Makefile
@@ -3,7 +3,6 @@
PORTNAME= extra-cmake-modules
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
-PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kf5-extra-cmake-modules/distinfo b/devel/kf5-extra-cmake-modules/distinfo
index a5fdd43854e8..155f2d798b5d 100644
--- a/devel/kf5-extra-cmake-modules/distinfo
+++ b/devel/kf5-extra-cmake-modules/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546843253
-SHA256 (KDE/frameworks/5.54.0/extra-cmake-modules-5.54.0.tar.xz) = 91b7a9359f1bfe6f667a5a9c23f6b2178555df26ca2e4dd1bb5c38dc36c77144
-SIZE (KDE/frameworks/5.54.0/extra-cmake-modules-5.54.0.tar.xz) = 324996
+TIMESTAMP = 1549270026
+SHA256 (KDE/frameworks/5.55.0/extra-cmake-modules-5.55.0.tar.xz) = 649453922aef38a24af04258ab6661ddfd566aaba4d1773a9e1f4799344406f5
+SIZE (KDE/frameworks/5.55.0/extra-cmake-modules-5.55.0.tar.xz) = 325208
diff --git a/devel/kf5-extra-cmake-modules/files/patch-kdephab_D17015.diff b/devel/kf5-extra-cmake-modules/files/patch-kdephab_D17015.diff
deleted file mode 100644
index e2a83a01ea05..000000000000
--- a/devel/kf5-extra-cmake-modules/files/patch-kdephab_D17015.diff
+++ /dev/null
@@ -1,199 +0,0 @@
-diff --git a/cmake/FindQHelpGenerator.cmake b/cmake/FindQHelpGenerator.cmake
-new file mode 100644
---- /dev/null
-+++ cmake/FindQHelpGenerator.cmake
-@@ -0,0 +1,94 @@
-+#.rst:
-+# FindQHelpGenerator
-+# ------------------
-+#
-+# Try to find the Qt help generator.
-+# Based on FindQCollectionGenerator.cmake
-+#
-+# This will define the following variables:
-+#
-+# ``QHelpGenerator_FOUND``
-+# True if (the requested version of) Sphinx is available
-+# ``QHelpGenerator_VERSION``
-+# The version of the Qt help generator. Note that this not the
-+# same as the version of Qt it is provided by.
-+# ``QHelpGenerator_QT_VERSION``
-+# The version of Qt that the Qt help generator is from.
-+# ``QHelpGenerator_EXECUTABLE``
-+# The path to the Qt help generator executable.
-+#
-+# If ``QHelpGenerator_FOUND`` is TRUE, it will also define the following
-+# imported target:
-+#
-+# ``QHelpGenerator::Generator``
-+# The Qt help generator.
-+#
-+# In general we recommend using the imported target, as it is easier to use.
-+#
-+# Since 5.53.0.
-+
-+#=============================================================================
-+# Copyright 2015 Alex Merry <alex.merry@kde.org>
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+# notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+# derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+find_program(QHelpGenerator_EXECUTABLE
-+ NAMES
-+ qhelpgenerator-qt5
-+ qhelpgenerator
-+ DOC "Qt help generator"
-+)
-+
-+if (QHelpGenerator_EXECUTABLE)
-+ if(NOT TARGET QHelpGenerator::Generator)
-+ add_executable(QHelpGenerator::Generator IMPORTED)
-+ set_target_properties(QHelpGenerator::Generator PROPERTIES
-+ IMPORTED_LOCATION "${QHelpGenerator_EXECUTABLE}"
-+ )
-+ endif()
-+
-+ execute_process(
-+ COMMAND "${QHelpGenerator_EXECUTABLE}" -v
-+ OUTPUT_VARIABLE _QHelpGenerator_version_raw
-+ ERROR_VARIABLE _QHelpGenerator_version_raw
-+ )
-+ if (_QHelpGenerator_version_raw MATCHES "^Qt Help Generator version ([0-9]+(\\.[0-9]+)*) \\(Qt ([0-9]+(\\.[0-9]+)*)\\)")
-+ set(QHelpGenerator_VERSION "${CMAKE_MATCH_1}")
-+ set(QHelpGenerator_QT_VERSION "${CMAKE_MATCH_3}")
-+ endif()
-+ unset(_QHelpGenerator_version_raw)
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(QHelpGenerator
-+ FOUND_VAR
-+ QHelpGenerator_FOUND
-+ REQUIRED_VARS
-+ QHelpGenerator_EXECUTABLE
-+ VERSION_VAR
-+ QHelpGenerator_VERSION
-+)
-+
-+mark_as_advanced(QHelpGenerator_EXECUTABLE)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
---- docs/CMakeLists.txt
-+++ docs/CMakeLists.txt
-@@ -27,6 +27,7 @@
- #=============================================================================
-
- include(CMakeDependentOption)
-+include("${CMAKE_SOURCE_DIR}/modules/ECMQueryQmake.cmake")
-
- find_package(Sphinx 1.2 MODULE)
- set_package_properties(
-@@ -38,15 +39,39 @@
- PURPOSE "Required to build documentation for Extra CMake Modules."
- )
-
--find_package(QCollectionGenerator MODULE)
--set_package_properties(
-- QCollectionGenerator
-- PROPERTIES
-- URL "http://www.qt.io/"
-- DESCRIPTION "Qt help collection generator."
-- TYPE OPTIONAL
-- PURPOSE "Required to build Extra CMake Modules documentation in Qt Help format."
--)
-+# QCollectionGenerator and QHelpGenerator were merged in Qt 5.12
-+query_qmake(QT_VERSION QT_VERSION)
-+
-+if(QT_VERSION VERSION_LESS 5.12.0)
-+ find_package(QCollectionGenerator MODULE)
-+ set_package_properties(
-+ QCollectionGenerator
-+ PROPERTIES
-+ URL "http://www.qt.io/"
-+ DESCRIPTION "Qt help collection generator"
-+ TYPE OPTIONAL
-+ PURPOSE "Required to build Extra CMake Modules documentation in Qt Help format."
-+ )
-+ if(QCollectionGenerator_FOUND)
-+ set(_ecm_qtdoc_generator QCollectionGenerator::Generator)
-+ endif()
-+else()
-+ find_package(QHelpGenerator MODULE)
-+ set_package_properties(
-+ QHelpGenerator
-+ PROPERTIES
-+ URL "http://www.qt.io/"
-+ DESCRIPTION "Qt help generator"
-+ TYPE OPTIONAL
-+ PURPOSE "Required to build Extra CMake Modules documentation in Qt Help format."
-+ )
-+ if(QHelpGenerator_FOUND)
-+ set(_ecm_qtdoc_generator QHelpGenerator::Generator)
-+ endif()
-+endif()
-+if(DEFINED _ecm_qtdoc_generator)
-+ set(QT_HELP_GENERATOR_FOUND TRUE)
-+endif()
-
- cmake_dependent_option(
- BUILD_HTML_DOCS "Build html help with Sphinx" ON
-@@ -62,7 +87,7 @@
-
- cmake_dependent_option(
- BUILD_QTHELP_DOCS "Build Qt help with Sphinx" OFF
-- "Sphinx_FOUND;QCollectionGenerator_FOUND" OFF
-+ "Sphinx_FOUND;QT_HELP_GENERATOR_FOUND" OFF
- )
- add_feature_info(BUILD_QTHELP_DOCS BUILD_QTHELP_DOCS "Generate QtHelp documentation for installed modules.")
-
-@@ -78,7 +103,7 @@
- list(APPEND doc_formats qthelp)
- set(qthelp_extra_commands
- COMMAND
-- QCollectionGenerator::Generator
-+ "${_ecm_qtdoc_generator}"
- ${CMAKE_CURRENT_BINARY_DIR}/qthelp/ExtraCMakeModules.qhcp
- )
- endif()
-diff --git a/modules/ECMQueryQmake.cmake b/modules/ECMQueryQmake.cmake
---- modules/ECMQueryQmake.cmake
-+++ modules/ECMQueryQmake.cmake
-@@ -1,11 +1,14 @@
- find_package(Qt5Core QUIET)
-
--if (Qt5Core_FOUND)
-- set(_qmake_executable_default "qmake-qt5")
--endif ()
- if (TARGET Qt5::qmake)
- get_target_property(_qmake_executable_default Qt5::qmake LOCATION)
-+else()
-+ # If the project() line contains the 'NONE' keyword, the find_package call
-+ # above will not be able to find Qt5Core.
-+ # We need to look for the executable directly.
-+ find_program(_qmake_executable_default NAMES qmake)
- endif()
-+
- set(QMAKE_EXECUTABLE ${_qmake_executable_default}
- CACHE FILEPATH "Location of the Qt5 qmake executable")
-
-
diff --git a/devel/kf5-extra-cmake-modules/pkg-plist b/devel/kf5-extra-cmake-modules/pkg-plist
index 5d9dd899d1a8..28b26c2e8e70 100644
--- a/devel/kf5-extra-cmake-modules/pkg-plist
+++ b/devel/kf5-extra-cmake-modules/pkg-plist
@@ -68,7 +68,6 @@ share/ECM/modules/ECMQtDeclareLoggingCategory.cmake
share/ECM/modules/ECMQtDeclareLoggingCategory.cpp.in
share/ECM/modules/ECMQtDeclareLoggingCategory.h.in
share/ECM/modules/ECMQueryQmake.cmake
-share/ECM/modules/ECMQueryQmake.cmake.orig
share/ECM/modules/ECMSetupQtPluginMacroNames.cmake
share/ECM/modules/ECMSetupVersion.cmake
share/ECM/modules/ECMUninstallTarget.cmake
@@ -82,19 +81,23 @@ share/ECM/toolchain/ECMAndroidDeployQt.cmake
share/ECM/toolchain/deployment-file.json.in
share/ECM/toolchain/hasMainSymbol.cmake
share/ECM/toolchain/specifydependencies.cmake
-%%HELP%%%%DOCSDIR%%/ExtraCMakeModules.qch
+%%PORTDOCS%%%%DOCSDIR%%/ExtraCMakeModules.qch
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindEGL.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindGLIB2.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindGperf.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindIcoTool.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindInotify.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindKF5.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindLibExiv2.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindLibGit2.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindOpenEXR.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindPhoneNumber.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindPng2Ico.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindPoppler.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindPulseAudio.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindQtWaylandScanner.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindSasl2.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindSeccomp.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindSharedMimeInfo.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindWayland.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/find-module/FindWaylandScanner.rst.txt
@@ -122,17 +125,20 @@ share/ECM/toolchain/specifydependencies.cmake
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMGenerateHeaders.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMGeneratePkgConfigFile.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMGeneratePriFile.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMGenerateQmlTypes.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMInstallIcons.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMMarkAsTest.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMMarkNonGuiExecutable.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMOptionalAddSubdirectory.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMPackageConfigHelpers.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMPoQmTools.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMQMLModules.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMQtDeclareLoggingCategory.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMSetupQtPluginMacroNames.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMSetupVersion.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMUninstallTarget.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMUseFindModules.rst.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/_sources/module/ECMWinResolveSymlinks.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_sources/toolchain/Android.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/html/_static/ajax-loader.gif
%%PORTDOCS%%%%DOCSDIR%%/html/_static/basic.css
@@ -160,16 +166,20 @@ share/ECM/toolchain/specifydependencies.cmake
%%PORTDOCS%%%%DOCSDIR%%/html/_static/websupport.js
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindEGL.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindGLIB2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindGperf.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindIcoTool.html
+%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindInotify.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindKF5.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindLibExiv2.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindLibGit2.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindOpenEXR.html
+%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindPhoneNumber.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindPng2Ico.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindPoppler.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindPulseAudio.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindQtWaylandScanner.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindSasl2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindSeccomp.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindSharedMimeInfo.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindWayland.html
%%PORTDOCS%%%%DOCSDIR%%/html/find-module/FindWaylandScanner.html
@@ -198,17 +208,20 @@ share/ECM/toolchain/specifydependencies.cmake
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMGenerateHeaders.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMGeneratePkgConfigFile.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMGeneratePriFile.html
+%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMGenerateQmlTypes.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMInstallIcons.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMMarkAsTest.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMMarkNonGuiExecutable.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMOptionalAddSubdirectory.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMPackageConfigHelpers.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMPoQmTools.html
+%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMQMLModules.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMQtDeclareLoggingCategory.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMSetupQtPluginMacroNames.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMSetupVersion.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMUninstallTarget.html
%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMUseFindModules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/module/ECMWinResolveSymlinks.html
%%PORTDOCS%%%%DOCSDIR%%/html/search.html
%%PORTDOCS%%%%DOCSDIR%%/html/searchindex.js
%%PORTDOCS%%%%DOCSDIR%%/html/toolchain/Android.html