diff -Nru extra-cmake-modules-5.111.0/CMakeLists.txt extra-cmake-modules-5.112.0/CMakeLists.txt --- extra-cmake-modules-5.111.0/CMakeLists.txt 2023-09-16 00:13:18.000000000 +0000 +++ extra-cmake-modules-5.112.0/CMakeLists.txt 2023-10-19 08:17:56.000000000 +0000 @@ -11,7 +11,7 @@ # Preliminary setup # -set(VERSION "5.111.0") # handled by release scripts +set(VERSION "5.112.0") # handled by release scripts project(ECM VERSION "${VERSION}" diff -Nru extra-cmake-modules-5.111.0/debian/changelog extra-cmake-modules-5.112.0/debian/changelog --- extra-cmake-modules-5.111.0/debian/changelog 2023-10-22 10:34:41.000000000 +0000 +++ extra-cmake-modules-5.112.0/debian/changelog 2023-11-08 09:15:30.000000000 +0000 @@ -1,8 +1,14 @@ -extra-cmake-modules (5.111.0-0ubuntu1~ubuntu23.10~ppa1) mantic; urgency=high +extra-cmake-modules (5.112.0-0ubuntu1~ubuntu23.10~ppa1) mantic; urgency=high + + * New upstream release (5.112.0) + + -- Rik Mills Wed, 08 Nov 2023 09:15:30 +0000 + +extra-cmake-modules (5.111.0-0ubuntu1) noble; urgency=medium * New upstream release (5.111.0) - -- Rik Mills Sun, 22 Oct 2023 11:34:41 +0100 + -- Rik Mills Tue, 07 Nov 2023 23:55:28 +0000 extra-cmake-modules (5.110.0-0ubuntu1) mantic; urgency=medium diff -Nru extra-cmake-modules-5.111.0/kde-modules/clang-format.cmake extra-cmake-modules-5.112.0/kde-modules/clang-format.cmake --- extra-cmake-modules-5.111.0/kde-modules/clang-format.cmake 2023-09-16 00:13:18.000000000 +0000 +++ extra-cmake-modules-5.112.0/kde-modules/clang-format.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ ---- -# SPDX-FileCopyrightText: 2019 Christoph Cullmann -# SPDX-FileCopyrightText: 2019 Gernot Gebhard -# -# SPDX-License-Identifier: MIT - -# This file got automatically created by ECM, do not edit -# See https://clang.llvm.org/docs/ClangFormatStyleOptions.html for the config options -# and https://community.kde.org/Policies/Frameworks_Coding_Style#Clang-format_automatic_code_formatting -# for clang-format tips & tricks ---- -Language: JavaScript -DisableFormat: true ---- - -# Style for C++ -Language: Cpp - -# base is WebKit coding style: https://webkit.org/code-style-guidelines/ -# below are only things set that diverge from this style! -BasedOnStyle: WebKit - -# enforce C++11 (e.g. for std::vector> -Standard: Cpp11 - -# 4 spaces indent -TabWidth: 4 - -# 2 * 80 wide lines -ColumnLimit: 160 - -# sort includes inside line separated groups -SortIncludes: true - -# break before braces on function, namespace and class definitions. -BreakBeforeBraces: Linux - -# CrlInstruction *a; -PointerAlignment: Right - -# horizontally aligns arguments after an open bracket. -AlignAfterOpenBracket: Align - -# don't move all parameters to new line -AllowAllParametersOfDeclarationOnNextLine: false - -# no single line functions -AllowShortFunctionsOnASingleLine: None - -# always break before you encounter multi line strings -AlwaysBreakBeforeMultilineStrings: true - -# don't move arguments to own lines if they are not all on the same -BinPackArguments: false - -# don't move parameters to own lines if they are not all on the same -BinPackParameters: false - -# In case we have an if statement with multiple lines the operator should be at the beginning of the line -# but we do not want to break assignments -BreakBeforeBinaryOperators: NonAssignment - -# format C++11 braced lists like function calls -Cpp11BracedListStyle: true - -# do not put a space before C++11 braced lists -SpaceBeforeCpp11BracedList: false - -# remove empty lines -KeepEmptyLinesAtTheStartOfBlocks: false - -# no namespace indentation to keep indent level low -NamespaceIndentation: None - -# we use template< without space. -SpaceAfterTemplateKeyword: false - -# Always break after template declaration -AlwaysBreakTemplateDeclarations: true - -# macros for which the opening brace stays attached. -ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE , wl_resource_for_each, wl_resource_for_each_safe ] - -# keep lambda formatting multi-line if not empty -AllowShortLambdasOnASingleLine: Empty - -# We do not want clang-format to put all arguments on a new line -AllowAllArgumentsOnNextLine: false diff -Nru extra-cmake-modules-5.111.0/kde-modules/clang-format.in extra-cmake-modules-5.112.0/kde-modules/clang-format.in --- extra-cmake-modules-5.111.0/kde-modules/clang-format.in 1970-01-01 00:00:00.000000000 +0000 +++ extra-cmake-modules-5.112.0/kde-modules/clang-format.in 2023-10-19 08:17:56.000000000 +0000 @@ -0,0 +1,88 @@ +--- +# SPDX-FileCopyrightText: 2019 Christoph Cullmann +# SPDX-FileCopyrightText: 2019 Gernot Gebhard +# +# SPDX-License-Identifier: MIT + +# This file got automatically created by ECM, do not edit +# See https://clang.llvm.org/docs/ClangFormatStyleOptions.html for the config options +# and https://community.kde.org/Policies/Frameworks_Coding_Style#Clang-format_automatic_code_formatting +# for clang-format tips & tricks +--- +Language: JavaScript +DisableFormat: true +--- + +# Style for C++ +Language: Cpp + +# base is WebKit coding style: https://webkit.org/code-style-guidelines/ +# below are only things set that diverge from this style! +BasedOnStyle: WebKit + +# enforce C++11 (e.g. for std::vector> +Standard: Cpp11 + +# 4 spaces indent +TabWidth: 4 + +# 2 * 80 wide lines +ColumnLimit: 160 + +# sort includes inside line separated groups +SortIncludes: true + +# break before braces on function, namespace and class definitions. +BreakBeforeBraces: Linux + +# CrlInstruction *a; +PointerAlignment: Right + +# horizontally aligns arguments after an open bracket. +AlignAfterOpenBracket: Align + +# don't move all parameters to new line +AllowAllParametersOfDeclarationOnNextLine: false + +# no single line functions +AllowShortFunctionsOnASingleLine: None + +# always break before you encounter multi line strings +AlwaysBreakBeforeMultilineStrings: true + +# don't move arguments to own lines if they are not all on the same +BinPackArguments: false + +# don't move parameters to own lines if they are not all on the same +BinPackParameters: false + +# In case we have an if statement with multiple lines the operator should be at the beginning of the line +# but we do not want to break assignments +BreakBeforeBinaryOperators: NonAssignment + +# format C++11 braced lists like function calls +Cpp11BracedListStyle: true + +# do not put a space before C++11 braced lists +SpaceBeforeCpp11BracedList: false + +# remove empty lines +KeepEmptyLinesAtTheStartOfBlocks: false + +# no namespace indentation to keep indent level low +NamespaceIndentation: None + +# we use template< without space. +SpaceAfterTemplateKeyword: false + +# Always break after template declaration +AlwaysBreakTemplateDeclarations: true + +# macros for which the opening brace stays attached. +ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE , wl_resource_for_each, wl_resource_for_each_safe ] + +# keep lambda formatting multi-line if not empty +AllowShortLambdasOnASingleLine: Empty + +# We do not want clang-format to put all arguments on a new line +AllowAllArgumentsOnNextLine: false diff -Nru extra-cmake-modules-5.111.0/kde-modules/KDEClangFormat.cmake extra-cmake-modules-5.112.0/kde-modules/KDEClangFormat.cmake --- extra-cmake-modules-5.111.0/kde-modules/KDEClangFormat.cmake 2023-09-16 00:13:18.000000000 +0000 +++ extra-cmake-modules-5.112.0/kde-modules/KDEClangFormat.cmake 2023-10-19 08:17:56.000000000 +0000 @@ -61,10 +61,10 @@ if(${matchres} EQUAL -1) message(WARNING "The .clang-format file already exists. Please remove it in order to use the file provided by ECM") else() - configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) + configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.in ${CLANG_FORMAT_FILE} @ONLY) endif() else() - configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.cmake ${CLANG_FORMAT_FILE} @ONLY) + configure_file(${CMAKE_CURRENT_LIST_DIR}/clang-format.in ${CLANG_FORMAT_FILE} @ONLY) endif() endif() diff -Nru extra-cmake-modules-5.111.0/kde-modules/KDESetupPrefixScript.cmake extra-cmake-modules-5.112.0/kde-modules/KDESetupPrefixScript.cmake --- extra-cmake-modules-5.111.0/kde-modules/KDESetupPrefixScript.cmake 2023-09-16 00:13:18.000000000 +0000 +++ extra-cmake-modules-5.112.0/kde-modules/KDESetupPrefixScript.cmake 2023-10-19 08:17:56.000000000 +0000 @@ -10,11 +10,11 @@ # Prefix script setup code shared between KDEInstallDirsX.cmake, not public API. # -configure_file(${CMAKE_CURRENT_LIST_DIR}/prefix.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/prefix.sh @ONLY) +configure_file(${CMAKE_CURRENT_LIST_DIR}/prefix.sh.in ${CMAKE_CURRENT_BINARY_DIR}/prefix.sh @ONLY) find_program(FISH_EXECUTABLE fish) if(FISH_EXECUTABLE) - configure_file(${CMAKE_CURRENT_LIST_DIR}/prefix.sh.fish.cmake ${CMAKE_CURRENT_BINARY_DIR}/prefix.sh.fish @ONLY) + configure_file(${CMAKE_CURRENT_LIST_DIR}/prefix.sh.fish.in ${CMAKE_CURRENT_BINARY_DIR}/prefix.sh.fish @ONLY) endif() option(KDE_INSTALL_PREFIX_SCRIPT "Installs ${CMAKE_INSTALL_PREFIX}/prefix.sh that sets up the necessary environment variables" OFF) diff -Nru extra-cmake-modules-5.111.0/kde-modules/prefix.sh.cmake extra-cmake-modules-5.112.0/kde-modules/prefix.sh.cmake --- extra-cmake-modules-5.111.0/kde-modules/prefix.sh.cmake 2023-09-16 00:13:18.000000000 +0000 +++ extra-cmake-modules-5.112.0/kde-modules/prefix.sh.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -export PATH=@KDE_INSTALL_FULL_BINDIR@:$PATH - -# LD_LIBRARY_PATH only needed if you are building without rpath -# export LD_LIBRARY_PATH=@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH - -export XDG_DATA_DIRS=@KDE_INSTALL_FULL_DATADIR@:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/} -export XDG_CONFIG_DIRS=@KDE_INSTALL_FULL_CONFDIR@:${XDG_CONFIG_DIRS:-/etc/xdg} - -export QT_PLUGIN_PATH=@KDE_INSTALL_FULL_QTPLUGINDIR@:$QT_PLUGIN_PATH -export QML2_IMPORT_PATH=@KDE_INSTALL_FULL_QMLDIR@:$QML2_IMPORT_PATH - -export QT_QUICK_CONTROLS_STYLE_PATH=@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2/:$QT_QUICK_CONTROLS_STYLE_PATH diff -Nru extra-cmake-modules-5.111.0/kde-modules/prefix.sh.fish.cmake extra-cmake-modules-5.112.0/kde-modules/prefix.sh.fish.cmake --- extra-cmake-modules-5.111.0/kde-modules/prefix.sh.fish.cmake 2023-09-16 00:13:18.000000000 +0000 +++ extra-cmake-modules-5.112.0/kde-modules/prefix.sh.fish.cmake 1970-01-01 00:00:00.000000000 +0000 @@ -1,22 +0,0 @@ -# SPDX-FileCopyrightText: 2021 Alexander Lohnau -# SPDX-License-Identifier: BSD-3-Clause - -set PATH "@KDE_INSTALL_FULL_BINDIR@:$PATH" - -# LD_LIBRARY_PATH only needed if you are building without rpath -# set -x LD_LIBRARY_PATH "@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH" - -if test -z "$XDG_DATA_DIRS" - set -x --path XDG_DATA_DIRS /usr/local/share/ /usr/share/ -end -set -x --path XDG_DATA_DIRS "@KDE_INSTALL_FULL_DATADIR@" $XDG_DATA_DIRS - -if test -z "$XDG_CONFIG_DIRS" - set -x --path XDG_CONFIG_DIRS /etc/xdg -end -set -x --path XDG_CONFIG_DIRS "@KDE_INSTALL_FULL_CONFDIR@" $XDG_CONFIG_DIRS - -set -x --path QT_PLUGIN_PATH "@KDE_INSTALL_FULL_QTPLUGINDIR@" $QT_PLUGIN_PATH -set -x --path QML2_IMPORT_PATH "@KDE_INSTALL_FULL_QMLDIR@" $QML2_IMPORT_PATH - -set -x --path QT_QUICK_CONTROLS_STYLE_PATH "@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2/" $QT_QUICK_CONTROLS_STYLE_PATH diff -Nru extra-cmake-modules-5.111.0/kde-modules/prefix.sh.fish.in extra-cmake-modules-5.112.0/kde-modules/prefix.sh.fish.in --- extra-cmake-modules-5.111.0/kde-modules/prefix.sh.fish.in 1970-01-01 00:00:00.000000000 +0000 +++ extra-cmake-modules-5.112.0/kde-modules/prefix.sh.fish.in 2023-10-19 08:17:56.000000000 +0000 @@ -0,0 +1,22 @@ +# SPDX-FileCopyrightText: 2021 Alexander Lohnau +# SPDX-License-Identifier: BSD-3-Clause + +set PATH "@KDE_INSTALL_FULL_BINDIR@:$PATH" + +# LD_LIBRARY_PATH only needed if you are building without rpath +# set -x LD_LIBRARY_PATH "@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH" + +if test -z "$XDG_DATA_DIRS" + set -x --path XDG_DATA_DIRS /usr/local/share/ /usr/share/ +end +set -x --path XDG_DATA_DIRS "@KDE_INSTALL_FULL_DATADIR@" $XDG_DATA_DIRS + +if test -z "$XDG_CONFIG_DIRS" + set -x --path XDG_CONFIG_DIRS /etc/xdg +end +set -x --path XDG_CONFIG_DIRS "@KDE_INSTALL_FULL_CONFDIR@" $XDG_CONFIG_DIRS + +set -x --path QT_PLUGIN_PATH "@KDE_INSTALL_FULL_QTPLUGINDIR@" $QT_PLUGIN_PATH +set -x --path QML2_IMPORT_PATH "@KDE_INSTALL_FULL_QMLDIR@" $QML2_IMPORT_PATH + +set -x --path QT_QUICK_CONTROLS_STYLE_PATH "@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2/" $QT_QUICK_CONTROLS_STYLE_PATH diff -Nru extra-cmake-modules-5.111.0/kde-modules/prefix.sh.in extra-cmake-modules-5.112.0/kde-modules/prefix.sh.in --- extra-cmake-modules-5.111.0/kde-modules/prefix.sh.in 1970-01-01 00:00:00.000000000 +0000 +++ extra-cmake-modules-5.112.0/kde-modules/prefix.sh.in 2023-10-19 08:17:56.000000000 +0000 @@ -0,0 +1,12 @@ +export PATH=@KDE_INSTALL_FULL_BINDIR@:$PATH + +# LD_LIBRARY_PATH only needed if you are building without rpath +# export LD_LIBRARY_PATH=@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH + +export XDG_DATA_DIRS=@KDE_INSTALL_FULL_DATADIR@:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/} +export XDG_CONFIG_DIRS=@KDE_INSTALL_FULL_CONFDIR@:${XDG_CONFIG_DIRS:-/etc/xdg} + +export QT_PLUGIN_PATH=@KDE_INSTALL_FULL_QTPLUGINDIR@:$QT_PLUGIN_PATH +export QML2_IMPORT_PATH=@KDE_INSTALL_FULL_QMLDIR@:$QML2_IMPORT_PATH + +export QT_QUICK_CONTROLS_STYLE_PATH=@KDE_INSTALL_FULL_QMLDIR@/QtQuick/Controls.2/:$QT_QUICK_CONTROLS_STYLE_PATH