Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package extra-cmake-modules for
openSUSE:Factory checked in at 2023-08-20 00:10:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/extra-cmake-modules (Old)
and /work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "extra-cmake-modules"
Sun Aug 20 00:10:17 2023 rev:116 rq:1104546 version:5.109.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/extra-cmake-modules/extra-cmake-modules.changes
2023-07-09 20:41:01.577377758 +0200
+++
/work/SRC/openSUSE:Factory/.extra-cmake-modules.new.1766/extra-cmake-modules.changes
2023-08-20 00:12:52.343076533 +0200
@@ -1,0 +2,12 @@
+Tue Aug 8 17:42:41 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 5.109.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/frameworks/5/5.109.0
+- Changes since 5.108.0:
+ * KDEInstallDirs: fix description of KXMLGUIDIR & LOCALEDIR
+ * KDEGitCommitHooks: Allow passing in of custom scripts (kde#472361)
+ * qml-plasmoid techbase.kde.org/Projects/Plasma does not exist
+
+-------------------------------------------------------------------
Old:
----
extra-cmake-modules-5.108.0.tar.xz
extra-cmake-modules-5.108.0.tar.xz.sig
New:
----
extra-cmake-modules-5.109.0.tar.xz
extra-cmake-modules-5.109.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ extra-cmake-modules.spec ++++++
--- /var/tmp/diff_new_pack.LZAU6a/_old 2023-08-20 00:12:53.083077989 +0200
+++ /var/tmp/diff_new_pack.LZAU6a/_new 2023-08-20 00:12:53.091078005 +0200
@@ -30,7 +30,7 @@
# Only needed for the package signature condition
%bcond_without released
Name: extra-cmake-modules%{?pkg_suffix}
-Version: 5.108.0
+Version: 5.109.0
Release: 0
Summary: CMake modules
License: BSD-3-Clause
++++++ extra-cmake-modules-5.108.0.tar.xz -> extra-cmake-modules-5.109.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/extra-cmake-modules-5.108.0/CMakeLists.txt
new/extra-cmake-modules-5.109.0/CMakeLists.txt
--- old/extra-cmake-modules-5.108.0/CMakeLists.txt 2023-06-27
18:27:18.000000000 +0200
+++ new/extra-cmake-modules-5.109.0/CMakeLists.txt 2023-08-01
22:10:24.000000000 +0200
@@ -11,7 +11,7 @@
# Preliminary setup
#
-set(VERSION "5.108.0") # handled by release scripts
+set(VERSION "5.109.0") # handled by release scripts
if (POLICY CMP0048)
cmake_policy(SET CMP0048 NEW)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.108.0/kde-modules/KDEGitCommitHooks.cmake
new/extra-cmake-modules-5.109.0/kde-modules/KDEGitCommitHooks.cmake
--- old/extra-cmake-modules-5.108.0/kde-modules/KDEGitCommitHooks.cmake
2023-06-27 18:27:18.000000000 +0200
+++ new/extra-cmake-modules-5.109.0/kde-modules/KDEGitCommitHooks.cmake
2023-08-01 22:10:24.000000000 +0200
@@ -15,10 +15,12 @@
::
kde_configure_pre_commit_hook(
- CHECKS <check1> [<check2> [...]]
+ CHECKS <check1> [<check2> [...]
+ [CUSTOM_SCRIPTS [<script paths> [<script paths> ...]]] # since 5.109
)
This function will create a pre-commit hook which contains all the given
checks.
+In addition to that, you can pass in paths to custom scripts that will be run
as the pre-commit hook.
Checks:
@@ -48,7 +50,7 @@
function(KDE_CONFIGURE_GIT_PRE_COMMIT_HOOK)
set(_oneValueArgs "")
- set(_multiValueArgs CHECKS)
+ set(_multiValueArgs CHECKS CUSTOM_SCRIPTS)
cmake_parse_arguments(ARG "" "${_oneValueArgs}" "${_multiValueArgs}"
${ARGN} )
if(NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
@@ -72,44 +74,52 @@
set(HAS_CLANG_FORMAT_COMMAND_INCLUDED FALSE)
endif()
+ string(REPLACE ";" "\n" PRE_COMMIT_SCRIPTS "${ARG_CUSTOM_SCRIPTS}")
+
set(_write_hook FALSE)
if(KDE_CLANG_FORMAT_EXECUTABLE)
list(FIND ARG_CHECKS "CLANG_FORMAT" _index)
if (${_index} GREATER -1)
set(CLANG_FORMAT_SCRIPT "\"$(git rev-parse
--git-common-dir)\"/hooks/scripts/clang-format.sh")
configure_file(${CLANG_FORMAT_UNIX}
"${GIT_DIR}/hooks/scripts/clang-format.sh" @ONLY)
+ set(PRE_COMMIT_SCRIPTS "\"$(git rev-parse
--git-common-dir)\"/hooks/scripts/clang-format.sh\n${PRE_COMMIT_SCRIPTS}")
set(_write_hook TRUE)
endif()
- else()
- message(WARNING "No clang-format executable was found, skipping the
formatting pre-commit hook")
endif()
- if(NOT _write_hook)
- return()
- endif()
set(_hook_file "${GIT_DIR}/hooks/pre-commit")
- # Doesn't exist? write away
- if(NOT EXISTS ${_hook_file})
- configure_file(${PRE_COMMIT_HOOK_UNIX} "${GIT_DIR}/hooks/pre-commit")
- return()
- endif()
-
- file(READ ${_hook_file} _contents)
-
- # For when CLANG_FORMAT_SCRIPT didn't have the 'git rev-parse
--git-common-dir' part
- set(_old_cmd "./.git/hooks/scripts/clang-format.sh")
- string(FIND "${_contents}" "${_old_cmd}" _idx)
- if (${_idx} GREATER -1)
- string(REPLACE "${_old_cmd}" "${CLANG_FORMAT_SCRIPT}" _contents
"${_contents}")
- file(WRITE ${_hook_file} "${_contents}")
- return()
- endif()
-
- string(FIND "${_contents}" "${CLANG_FORMAT_SCRIPT}" _idx)
- # File exists and doesn't have the clang-format.sh line, append it
- # so as to not overwrite users' customisations
- if (_idx EQUAL -1)
- file(APPEND ${_hook_file} "${CLANG_FORMAT_SCRIPT}")
+ # Appending to the file is quite ugly and causes edge cases. With the
CUSTOM_SCRIPTS arg, this should not be needed though
+ if (ECM_GLOBAL_FIND_VERSION VERSION_GREATER_EQUAL 5.109.0)
+ set(PRE_COMMIT_SCRIPTS "# This file is autogenerated by
kde_configure_pre_commit_hook, any changes will be lost!
\n${PRE_COMMIT_SCRIPTS}")
+ configure_file(${PRE_COMMIT_HOOK_UNIX} "${_hook_file}")
+ else()
+ if(NOT _write_hook)
+ return()
+ message(WARNING "No clang-format executable was found, skipping the
formatting pre-commit hook")
+ endif()
+ # Doesn't exist? write away
+ if(NOT EXISTS ${_hook_file})
+ configure_file(${PRE_COMMIT_HOOK_UNIX} "${_hook_file}")
+ return()
+ endif()
+
+ file(READ ${_hook_file} _contents)
+
+ # For when CLANG_FORMAT_SCRIPT didn't have the 'git rev-parse
--git-common-dir' part
+ set(_old_cmd "./.git/hooks/scripts/clang-format.sh")
+ string(FIND "${_contents}" "${_old_cmd}" _idx)
+ if (${_idx} GREATER -1)
+ string(REPLACE "${_old_cmd}" "${CLANG_FORMAT_SCRIPT}" _contents
"${_contents}")
+ file(WRITE ${_hook_file} "${_contents}")
+ return()
+ endif()
+
+ string(FIND "${_contents}" "${CLANG_FORMAT_SCRIPT}" _idx)
+ # File exists and doesn't have the clang-format.sh line, append it
+ # so as to not overwrite users' customisations
+ if (_idx EQUAL -1)
+ file(APPEND ${_hook_file} "${CLANG_FORMAT_SCRIPT}")
+ endif()
endif()
endfunction()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.108.0/kde-modules/KDEInstallDirs5.cmake
new/extra-cmake-modules-5.109.0/kde-modules/KDEInstallDirs5.cmake
--- old/extra-cmake-modules-5.108.0/kde-modules/KDEInstallDirs5.cmake
2023-06-27 18:27:18.000000000 +0200
+++ new/extra-cmake-modules-5.109.0/kde-modules/KDEInstallDirs5.cmake
2023-08-01 22:10:24.000000000 +0200
@@ -83,7 +83,7 @@
service types for KDE Frameworks 5 (``DATAROOTDIR/kservicetypes5``)
[``SERVICETYPES_INSTALL_DIR``]
``KXMLGUI5DIR`` or (since 5.89) ``KXMLGUIDIR``
- knotify description files (``DATAROOTDIR/kxmlgui5``)
+ kxmlgui .rc files (``DATAROOTDIR/kxmlgui5``)
[``KXMLGUI_INSTALL_DIR``]
``KAPPTEMPLATESDIR``
KAppTemplate and KDevelop templates
(``DATAROOTDIR/kdevappwizard/templates``)
@@ -96,7 +96,7 @@
``ICONDIR``
icons (``DATAROOTDIR/icons``) [``ICON_INSTALL_DIR``]
``LOCALEDIR``
- knotify description files (``DATAROOTDIR/locale``)
+ locale-dependent data (``DATAROOTDIR/locale``)
[``LOCALE_INSTALL_DIR``]
``SOUNDDIR``
sound files (``DATAROOTDIR/sounds``) [``SOUND_INSTALL_DIR``]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.108.0/kde-modules/KDEInstallDirs6.cmake
new/extra-cmake-modules-5.109.0/kde-modules/KDEInstallDirs6.cmake
--- old/extra-cmake-modules-5.108.0/kde-modules/KDEInstallDirs6.cmake
2023-06-27 18:27:18.000000000 +0200
+++ new/extra-cmake-modules-5.109.0/kde-modules/KDEInstallDirs6.cmake
2023-08-01 22:10:24.000000000 +0200
@@ -77,7 +77,7 @@
``KSERVICETYPESDIR``
service types for KDE Frameworks 6 (``DATAROOTDIR/kservicetypes6``)
``KXMLGUIDIR``
- knotify description files (``DATAROOTDIR/kxmlgui6``)
+ kxmlgui .rc files (``DATAROOTDIR/kxmlgui6``)
``KAPPTEMPLATESDIR``
KAppTemplate and KDevelop templates
(``DATAROOTDIR/kdevappwizard/templates``)
``KFILETEMPLATESDIR``
@@ -87,7 +87,7 @@
``ICONDIR``
icons (``DATAROOTDIR/icons``)
``LOCALEDIR``
- knotify description files (``DATAROOTDIR/locale``)
+ locale-dependent data (``DATAROOTDIR/locale``)
``SOUNDDIR``
sound files (``DATAROOTDIR/sounds``)
``TEMPLATEDIR``
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.108.0/kde-modules/KDEInstallDirsCommon.cmake
new/extra-cmake-modules-5.109.0/kde-modules/KDEInstallDirsCommon.cmake
--- old/extra-cmake-modules-5.108.0/kde-modules/KDEInstallDirsCommon.cmake
2023-06-27 18:27:18.000000000 +0200
+++ new/extra-cmake-modules-5.109.0/kde-modules/KDEInstallDirsCommon.cmake
2023-08-01 22:10:24.000000000 +0200
@@ -306,7 +306,7 @@
"icons"
ICON_INSTALL_DIR)
_define_relative(LOCALEDIR DATAROOTDIR "locale"
- "knotify description files"
+ "locale-dependent data"
LOCALE_INSTALL_DIR)
_define_relative(SOUNDDIR DATAROOTDIR "sounds"
"sound files"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.108.0/kde-modules/kde-git-commit-hooks/pre-commit.in
new/extra-cmake-modules-5.109.0/kde-modules/kde-git-commit-hooks/pre-commit.in
---
old/extra-cmake-modules-5.108.0/kde-modules/kde-git-commit-hooks/pre-commit.in
2023-06-27 18:27:18.000000000 +0200
+++
new/extra-cmake-modules-5.109.0/kde-modules/kde-git-commit-hooks/pre-commit.in
2023-08-01 22:10:24.000000000 +0200
@@ -1,3 +1,3 @@
#!/usr/bin/env bash
-${CLANG_FORMAT_SCRIPT}
+${PRE_COMMIT_SCRIPTS}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/extra-cmake-modules-5.108.0/tests/KDEPackageAppTemplatesTest/qml-plasmoid/README
new/extra-cmake-modules-5.109.0/tests/KDEPackageAppTemplatesTest/qml-plasmoid/README
---
old/extra-cmake-modules-5.108.0/tests/KDEPackageAppTemplatesTest/qml-plasmoid/README
2023-06-27 18:27:18.000000000 +0200
+++
new/extra-cmake-modules-5.109.0/tests/KDEPackageAppTemplatesTest/qml-plasmoid/README
2023-08-01 22:10:24.000000000 +0200
@@ -25,8 +25,5 @@
The explanation of the template
http://techbase.kde.org/index.php?title=Development/Tutorials/Plasma/GettingStarted
-Plasma techbase pages
-http://techbase.kde.org/Projects/Plasma
-
Plasma QML API explained
http://techbase.kde.org/Development/Tutorials/Plasma/QML/API
