Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kdesdk-scripts for openSUSE:Factory checked in at 2023-08-31 13:44:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk-scripts.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesdk-scripts" Thu Aug 31 13:44:21 2023 rev:69 rq:1105677 version:23.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk-scripts/kdesdk-scripts.changes 2023-07-07 15:50:31.865343561 +0200 +++ /work/SRC/openSUSE:Factory/.kdesdk-scripts.new.1766/kdesdk-scripts.changes 2023-08-31 13:47:58.889077446 +0200 @@ -1,0 +2,34 @@ +Sun Aug 20 13:59:18 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.08.0/ +- No code change since 23.07.90 + +------------------------------------------------------------------- +Mon Aug 14 08:02:35 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.90 + * New feature release +- No code change since 23.07.80 + +------------------------------------------------------------------- +Tue Aug 1 10:13:37 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.80 + * New feature release +- Changes since 23.04.3: + * Show import module + * Allow to remove unused import module + * Add script for porting to ksvg + * Fix porting script + * Fix scripting + * Fix typo + * Compile against qt6 + * Improve porting script + * Script which allows to port from PlasmaCore to Kirigami + * Add olib to relicensecheck.pl + * Copy the .ui file too, the code for that was missing + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-23.04.3.tar.xz kde-dev-scripts-23.04.3.tar.xz.sig New: ---- kde-dev-scripts-23.08.0.tar.xz kde-dev-scripts-23.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk-scripts.spec ++++++ --- /var/tmp/diff_new_pack.ul6DlQ/_old 2023-08-31 13:48:00.305128059 +0200 +++ /var/tmp/diff_new_pack.ul6DlQ/_new 2023-08-31 13:48:00.317128487 +0200 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: kdesdk-scripts -Version: 23.04.3 +Version: 23.08.0 Release: 0 Summary: Scripts for KDE software development License: GPL-2.0-only AND GFDL-1.2-only ++++++ kde-dev-scripts-23.04.3.tar.xz -> kde-dev-scripts-23.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/.gitlab-ci.yml new/kde-dev-scripts-23.08.0/.gitlab-ci.yml --- old/kde-dev-scripts-23.04.3/.gitlab-ci.yml 2023-03-10 03:12:13.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/.gitlab-ci.yml 2023-06-21 07:20:49.000000000 +0200 @@ -4,3 +4,5 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/.kde-ci.yml new/kde-dev-scripts-23.08.0/.kde-ci.yml --- old/kde-dev-scripts-23.04.3/.kde-ci.yml 2023-03-10 03:12:13.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/.kde-ci.yml 2023-06-21 07:20:49.000000000 +0200 @@ -2,7 +2,13 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@stable' 'frameworks/kdoctools': '@stable' + +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + 'frameworks/kdoctools': '@latest-kf6' + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/CMakeLists.txt new/kde-dev-scripts-23.08.0/CMakeLists.txt --- old/kde-dev-scripts-23.04.3/CMakeLists.txt 2023-03-10 03:12:13.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/CMakeLists.txt 2023-06-21 07:20:49.000000000 +0200 @@ -1,13 +1,23 @@ cmake_minimum_required(VERSION 3.0) project(kde-dev-scripts) -find_package(ECM 1.3.0 REQUIRED NO_MODULE) +set(REQUIRED_QT_VERSION "5.15.2") + +find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(FeatureSummary) include(KDEInstallDirs) -find_package(KF5 COMPONENTS DocTools) +if (QT_MAJOR_VERSION STREQUAL "6") + set(KF_MIN_VERSION "5.240.0") + set(KF_MAJOR_VERSION "6") +else() + set(KF_MAJOR_VERSION "5") +endif() + + +find_package(KF${KF_MAJOR_VERSION} COMPONENTS DocTools) # Note that all of these files should be *scripts* that do not require # compilation, therefore we simply install them. We split out Bourne shell @@ -18,7 +28,7 @@ if(UNIX) #shell program -if(KF5DocTools_FOUND) +if(TARGET KF${KF_MAJOR_VERSION}::DocTools) add_subdirectory(doc) kdoctools_install(po) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/CMakePresets.json new/kde-dev-scripts-23.08.0/CMakePresets.json --- old/kde-dev-scripts-23.04.3/CMakePresets.json 2023-03-10 03:12:13.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/CMakePresets.json 2023-06-21 07:20:49.000000000 +0200 @@ -10,6 +10,26 @@ "hidden": true }, { + "name": "base-qt6", + "displayName": "base preset", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF6}", + "hidden": true + }, + { + "name": "dev-mold", + "displayName": "Build as debug + using mold linker", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold" + }, + "inherits": [ + "base" + ] + }, + { "name": "dev", "displayName": "Build as debug", "cacheVariables": { @@ -30,10 +50,36 @@ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, "inherits": [ - "base" + "base-qt6" ] }, { + "name": "dev-qt6-database", + "displayName": "Build against qt6 with database support (experimental)", + "binaryDir": "${sourceDir}/build-qt6-database", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "BUILD_WITH_QT6": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "EXPERIMENTAL_DATABASE_SUPPORT": "ON" + }, + "inherits": [ + "base-qt6" + ] + }, + { + "name": "release-qt6", + "displayName": "Build as release mode.", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release", + "BUILD_WITH_QT6": "ON", + "BUILD_TESTING": "OFF" + }, + "inherits": [ + "base-qt6" + ] + }, + { "name": "asan", "displayName": "Build with Asan support.", "cacheVariables": { @@ -74,7 +120,8 @@ "name": "release", "displayName": "Build as release mode.", "cacheVariables": { - "CMAKE_BUILD_TYPE": "Release" + "CMAKE_BUILD_TYPE": "Release", + "BUILD_TESTING": "OFF" }, "inherits": [ "base" @@ -131,13 +178,25 @@ ], "buildPresets": [ { + "name": "dev-qt6-database", + "configurePreset": "dev-qt6-database" + }, + { "name": "dev", "configurePreset": "dev" }, + { + "name": "dev-mold", + "configurePreset": "dev-mold" + }, { "name": "dev-qt6", "configurePreset": "dev-qt6" }, + { + "name": "release-qt6", + "configurePreset": "release-qt6" + }, { "name": "dev-clang", "configurePreset": "dev-clang" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/c++-copy-class-and-file new/kde-dev-scripts-23.08.0/c++-copy-class-and-file --- old/kde-dev-scripts-23.04.3/c++-copy-class-and-file 2023-03-10 03:12:13.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/c++-copy-class-and-file 2023-06-21 07:20:49.000000000 +0200 @@ -16,14 +16,17 @@ newfile=`echo $newname | tr A-Z a-z` fi -echo "Copying $oldfile.{cpp,h} to $newfile.{cpp,h}" - if [ ! -f $newfile.h ]; then + echo "Copying $oldfile.{cpp,h} to $newfile.{cpp,h}" cp $oldfile.h $newfile.h cp $oldfile.cpp $newfile.cpp if [ -f ${oldfile}_p.h ]; then cp ${oldfile}_p.h ${newfile}_p.h fi + if [ -f ${oldfile}.ui ]; then + echo "Copying $oldfile.ui to $newfile.ui" + cp ${oldfile}.ui ${newfile}.ui + fi git add $newfile.h git add $newfile.cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/kf6/port_plasma_kirigami.sh new/kde-dev-scripts-23.08.0/kf6/port_plasma_kirigami.sh --- old/kde-dev-scripts-23.04.3/kf6/port_plasma_kirigami.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/kf6/port_plasma_kirigami.sh 2023-06-21 07:20:49.000000000 +0200 @@ -0,0 +1,54 @@ +#!/bin/sh +# Copyright Laurent Montel <[email protected]> 2023 +git grep -l "PlasmaCore.Theme.smallestFont" | xargs perl -pi -e 's,PlasmaCore.Theme.smallestFont,Kirigami.Theme.smallFont,g' +git grep -l "PlasmaCore.Theme.NormalColorGroup" | xargs perl -pi -e 's,PlasmaCore.Theme.NormalColorGroup,Kirigami.Theme.Window,g' +git grep -l "PlasmaCore.ColorScope.colorGroup" | xargs perl -pi -e 's,PlasmaCore.ColorScope.colorGroup,Kirigami.Theme.colorSet,g' +git grep -l "PlasmaCore.ColorScope.inherit" | xargs perl -pi -e 's,PlasmaCore.ColorScope.inherit,Kirigami.Theme.inherit,g' +git grep -l "PlasmaCore.Units.largeSpacing" | xargs perl -pi -e 's,PlasmaCore.Units.largeSpacing,Kirigami.Units.gridUnit,g' +git grep -l "PlasmaCore.Units.roundToIconSize" | xargs perl -pi -e 's,PlasmaCore.Units.roundToIconSize,Kirigami.Units.iconSizes.roundedIconSize,g' +git grep -l "height: PlasmaCore.Units.roundToIconSize" | xargs perl -pi -e 's,height: PlasmaCore.Units.roundToIconSize\(.*\),height: Kirigami.Units.iconSizes.sizeForLabels,g' +git grep -l "PlasmaCore.Units.devicePixelRatio" | xargs perl -pi -e 's,PlasmaCore.Units.devicePixelRatio,1,g' +git grep -l "PlasmaCore.Units." | xargs perl -pi -e 's,PlasmaCore.Units.,Kirigami.Units.,g' +git grep -l "PlasmaCore.ColorScope.inherit" | xargs perl -pi -e 's,PlasmaCore.ColorScope.inherit,Kirigami.Theme.inherit,g' +git grep -l "PlasmaCore.Theme." | xargs perl -pi -e 's,PlasmaCore.Theme.,Kirigami.Theme.,g' + + + +# Add import org.kde.kirigami 2.20 as Kirigami + +list_import=`git grep -l "as PlasmaCore"`; +echo " list file which has import PlasmaCore $list_import"; +for i in $list_import; do + echo "list2222222:::: $i"; + number=`grep 'mport org.kde.kirigami 2.20 as Kirigami' $i|wc -l`; + echo $number; + if test $number == 0 ; then + echo "insert import org.kde.kirigami 2.20 as Kirigam in $i"; + perl -pi -e 's,as PlasmaCore,as PlasmaCore\nimport org.kde.kirigami 2.20 as Kirigami,' $i; + fi +done; + + +#git grep -l "as PlasmaCore" | xargs perl -pi -e 's,as PlasmaCore,as PlasmaCore\nimport org.kde.kirigami 2.20 as Kirigami,' +list_PlasmaKirigami_file=`git grep -l kirigami`; +echo " list file which has kirigami: $list_PlasmaKirigami_file"; +for i in $list_PlasmaKirigami_file; do + echo "list:::: $i"; + number=`grep Kirigami $i|wc -l`; + echo $number; + if test $number == 1 ; then + perl -pi -e 's,import org.kde.kirigami 2.20 as Kirigami\n,,' $i; + fi +done; + + +# Remove import org.kde.plasma.core 2.0 as PlasmaCore if we don't need it +list_PlasmaCore_file=`git grep -l PlasmaCore`; +for i in $list_PlasmaCore_file; do + echo $i; + number=`grep PlasmaCore $i|wc -l`; + if test $number = 1 ; then + perl -pi -e 's,import org.kde.plasma.core 2.0 as PlasmaCore\n,,' $i; + fi +done; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/kf6/port_plasma_ksvg.sh new/kde-dev-scripts-23.08.0/kf6/port_plasma_ksvg.sh --- old/kde-dev-scripts-23.04.3/kf6/port_plasma_ksvg.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/kf6/port_plasma_ksvg.sh 2023-06-21 07:20:49.000000000 +0200 @@ -0,0 +1,45 @@ +#!/bin/sh +# Copyright Laurent Montel <[email protected]> 2023 +git grep -l "PlasmaCore.FrameSvgItem" | xargs perl -pi -e 's,PlasmaCore.FrameSvgItem,KSvg.FrameSvgItem,g' +git grep -l "PlasmaCore.SvgItem" | xargs perl -pi -e 's,PlasmaCore.SvgItem,KSvg.SvgItem,g' +git grep -l "PlasmaCore.Svg" | xargs perl -pi -e 's,PlasmaCore.Svg,KSvg.Svg,g' + +# Add import org.kde.kirigami 2.20 as Kirigami + +list_import=`git grep -l "as PlasmaCore"`; +echo " list file which has import PlasmaCore $list_import"; +for i in $list_import; do + echo "list $i"; + number=`grep 'import org.kde.ksvg 1.0 as KSvg' $i|wc -l`; + echo $number; + if test $number == 0 ; then + echo "import org.kde.ksvg 1.0 as KSvg in $i"; + perl -pi -e 's,as PlasmaCore,as PlasmaCore\nimport org.kde.ksvg 1.0 as KSvg,' $i; + fi +done; + + +list_PlasmaKirigami_file=`git grep -l ksvg`; +echo " list file which has kirigami: $list_PlasmaKirigami_file"; +for i in $list_PlasmaKirigami_file; do + echo "list:::: $i"; + number=`grep KSvg $i|wc -l`; + echo $number; + if test $number == 1 ; then + perl -pi -e 's,import org.kde.ksvg 1.0 as KSvg\n,,' $i; + fi +done; + + +# Remove import org.kde.plasma.core 2.0 as PlasmaCore if we don't need it +list_PlasmaCore_file=`git grep -l PlasmaCore`; +for i in $list_PlasmaCore_file; do + echo $i; + number=`grep KSvg $i|wc -l`; + if test $number = 1 ; then + perl -pi -e 's,import org.kde.plasma.core 2.0 as PlasmaCore\n,,' $i; + fi +done; + +echo " add Svg to CMakeLists.txt file"; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/kf6/remove_unused_qml_namespace.sh new/kde-dev-scripts-23.08.0/kf6/remove_unused_qml_namespace.sh --- old/kde-dev-scripts-23.04.3/kf6/remove_unused_qml_namespace.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/kf6/remove_unused_qml_namespace.sh 2023-06-21 07:20:49.000000000 +0200 @@ -0,0 +1,17 @@ +#!/bin/sh +# Copyright Laurent Montel <[email protected]> 2023 + +list_qml=`find -iname '*.qml'`; +for f in $list_qml; do + list_import=`grep -e "import" $f | grep -e " as " | sed 's/^.*as //' | perl -pi -e 's/ //'`; + for i in $list_import; do + #echo "import namespace $i"; + number=`grep $i $f|wc -l`; + #echo "number namespace '$i' $number in $f"; + if test $number == 1 ; then + echo "remove $i in file $f"; + perl -pi -e "s,import.* as $i\n,," $f; + fi + done; +done; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/kf6/show_duplicate_import_module.sh new/kde-dev-scripts-23.08.0/kf6/show_duplicate_import_module.sh --- old/kde-dev-scripts-23.04.3/kf6/show_duplicate_import_module.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/kf6/show_duplicate_import_module.sh 2023-06-21 07:20:49.000000000 +0200 @@ -0,0 +1,10 @@ +#!/bin/sh +# Copyright Laurent Montel <[email protected]> 2023 + +list_qml=`find -iname '*.qml'`; +for f in $list_qml; do + echo "file $f"; + grep -w "import.*$" $f | sort + echo "end"; +done; + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-23.04.3/relicensecheck.pl new/kde-dev-scripts-23.08.0/relicensecheck.pl --- old/kde-dev-scripts-23.04.3/relicensecheck.pl 2023-03-10 03:12:13.000000000 +0100 +++ new/kde-dev-scripts-23.08.0/relicensecheck.pl 2023-06-21 07:20:49.000000000 +0200 @@ -93,6 +93,7 @@ 'nicolasfella' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'nituldatt' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'okellogg' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'olib' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'ostroffjh' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'redstrate' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'rikkus' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ],
