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 2022-12-09 16:58:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk-scripts.new.1835 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesdk-scripts" Fri Dec 9 16:58:44 2022 rev:61 rq:1041468 version:22.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk-scripts/kdesdk-scripts.changes 2022-11-04 17:38:29.653916687 +0100 +++ /work/SRC/openSUSE:Factory/.kdesdk-scripts.new.1835/kdesdk-scripts.changes 2022-12-09 16:59:20.812275452 +0100 @@ -1,0 +2,20 @@ +Fri Dec 2 12:25:06 UTC 2022 - Christophe Marin <[email protected]> + +- Update to 22.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/22.12.0/ + +------------------------------------------------------------------- +Sat Nov 26 16:44:47 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.11.90 + * New feature release + +------------------------------------------------------------------- +Sat Nov 12 08:53:54 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 22.11.80 + * New feature release + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-22.08.3.tar.xz kde-dev-scripts-22.08.3.tar.xz.sig New: ---- kde-dev-scripts-22.12.0.tar.xz kde-dev-scripts-22.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk-scripts.spec ++++++ --- /var/tmp/diff_new_pack.LHfyfa/_old 2022-12-09 16:59:22.132281987 +0100 +++ /var/tmp/diff_new_pack.LHfyfa/_new 2022-12-09 16:59:22.140282026 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdesdk-scripts # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,10 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: kdesdk-scripts -Version: 22.08.3 +Version: 22.12.0 Release: 0 Summary: Scripts for KDE software development License: GPL-2.0-only AND GFDL-1.2-only -Group: System/GUI/KDE URL: https://www.kde.org/ Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz %if %{with released} @@ -46,7 +45,6 @@ %package kf5-porting Summary: Scripts for porting applications to KF5 -Group: System/GUI/KDE Obsoletes: kdesdk4-scripts-kf5-porting < %{version} Provides: kdesdk4-scripts-kf5-porting = %{version} @@ -70,10 +68,11 @@ %install %kf5_makeinstall -C build -%if %{with released} - %find_lang %{name} --with-man --all-name -%endif + +%find_lang %{name} --with-man --all-name + %{kf5_post_install} + # Copy the KF5 porting scripts mkdir -p %{buildroot}%{_datadir}/kf5-port-scripts cp kf5/* %{buildroot}%{_datadir}/kf5-port-scripts/ @@ -90,8 +89,6 @@ %doc README %{_datadir}/kf5-port-scripts/ -%if %{with released} %files lang -f %{name}.lang -%endif %changelog ++++++ kde-dev-scripts-22.08.3.tar.xz -> kde-dev-scripts-22.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-22.08.3/.gitignore new/kde-dev-scripts-22.12.0/.gitignore --- old/kde-dev-scripts-22.08.3/.gitignore 2022-07-12 18:21:50.000000000 +0200 +++ new/kde-dev-scripts-22.12.0/.gitignore 2022-10-09 17:42:31.000000000 +0200 @@ -1 +1,2 @@ *.pyc +/build*/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-22.08.3/CMakeLists.txt new/kde-dev-scripts-22.12.0/CMakeLists.txt --- old/kde-dev-scripts-22.08.3/CMakeLists.txt 2022-07-12 18:21:50.000000000 +0200 +++ new/kde-dev-scripts-22.12.0/CMakeLists.txt 2022-10-09 17:42:31.000000000 +0200 @@ -94,6 +94,8 @@ kde-systemsettings-tree.py reviewboard-am grantlee_strings_extractor.py + clean-forward-declaration.sh + clean-includes.sh DESTINATION ${KDE_INSTALL_BINDIR}) # SKIP_PO_INSTALL diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-22.08.3/CMakePresets.json new/kde-dev-scripts-22.12.0/CMakePresets.json --- old/kde-dev-scripts-22.08.3/CMakePresets.json 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-22.12.0/CMakePresets.json 2022-10-09 17:42:31.000000000 +0200 @@ -0,0 +1,200 @@ +{ + "version": 3, + "configurePresets": [ + { + "name": "base", + "displayName": "base preset", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF5}", + "hidden": true + }, + { + "name": "dev", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "dev-qt6", + "displayName": "Build against qt6", + "binaryDir": "${sourceDir}/build-qt6", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "BUILD_WITH_QT6": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "asan", + "displayName": "Build with Asan support.", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "ECM_ENABLE_SANITIZERS" : "'address;undefined'" + }, + "inherits": [ + "base" + ] + }, + { + "name": "dev-clang", + "displayName": "dev-clang", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "environment": { + "CXX": "clang++", + "CCACHE_DISABLE": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "unity", + "displayName": "Build with CMake unity support.", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_UNITY_CMAKE_SUPPORT": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "release", + "displayName": "Build as release mode.", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Release" + }, + "inherits": [ + "base" + ] + }, + { + "name": "profile", + "displayName": "profile", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "RelWithDebInfo" + }, + "inherits": [ + "base" + ] + }, + { + "name": "coverage", + "displayName": "coverage", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_UNITY_CMAKE_SUPPORT": "OFF", + "BUILD_COVERAGE": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "clazy", + "displayName": "clazy", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug" + }, + "environment": { + "CXX": "clazy", + "CCACHE_DISABLE": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "pch", + "displayName": "pch", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "USE_PRECOMPILED_HEADERS": "ON", + "BUILD_COVERAGE": "ON" + }, + "inherits": [ + "base" + ] + } + ], + "buildPresets": [ + { + "name": "dev", + "configurePreset": "dev" + }, + { + "name": "dev-qt6", + "configurePreset": "dev-qt6" + }, + { + "name": "dev-clang", + "configurePreset": "dev-clang" + }, + { + "name": "pch", + "configurePreset": "pch" + }, + { + "name": "release", + "configurePreset": "release" + }, + { + "name": "unity", + "configurePreset": "unity" + }, + { + "name": "coverage", + "configurePreset": "coverage" + }, + { + "name": "asan", + "configurePreset": "asan" + }, + { + "name": "clazy", + "configurePreset": "clazy", + "environment": { + "CLAZY_CHECKS" : "level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs,level2,detaching-member,heap-allocated-small-trivial-type,isempty-vs-count,qstring-varargs,qvariant-template-instantiation,raw-environment-function,reserve-candidates,signal-with-return-value,thread-with-slots,no-ctor-missing-parent-argument,no-missing-typeinfo", + "CCACHE_DISABLE" : "ON" + } + } + ], + "testPresets": [ + { + "name": "dev", + "configurePreset": "dev", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": false} + }, + { + "name": "asan", + "configurePreset": "asan", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + }, + { + "name": "unity", + "configurePreset": "unity", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + }, + { + "name": "coverage", + "configurePreset": "coverage", + "output": {"outputOnFailure": true}, + "execution": {"noTestsAction": "error", "stopOnFailure": true} + } + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-22.08.3/clean-forward-declaration.sh new/kde-dev-scripts-22.12.0/clean-forward-declaration.sh --- old/kde-dev-scripts-22.08.3/clean-forward-declaration.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-22.12.0/clean-forward-declaration.sh 2022-10-09 17:42:31.000000000 +0200 @@ -0,0 +1,33 @@ +#!/bin/sh + +# Laurent Montel <[email protected]> (2014) +# cd <directory> ; ./clean-forward-declaration.sh + +#list all .h files. +list=`find -name '*.h' | egrep -v '(\.svn|build)'`; + # list=`ls *.H | egrep -v '(\.svn|build)'`; +for file in $list ; do + #get class line (don't get it when we have "friend"/"template" or "public" word or *Private class) + class=`echo "$file" | xargs grep "class" | egrep -v '(public|friend|template|Private)' `; + if test ! -z "$class" ; then + echo "filename :$file"; + #By default it's defined as "class Kurl;" => remove "class " and ";" + newval=`echo "$class" | perl -pi -e 's!class !!g'`; + newval=`echo "$newval" | perl -pi -e 's!;!!g'`; + + #need to have all class name => use awk to split string, separator is "\n"; + splitline=`echo $newval | awk -F' ' 'END { for (i = 1 ; i <= NF ; i++) { tab[i] = $i ; print tab[i] } } '`; + for i in $splitline ; do + #Look at into file if there is multiple defined of class name => if number == 1 => it's not used + val=`echo "$file" | xargs grep "$i" | wc -l`; + if test "$val" = "1" ; then + # Remove "class <classname>;" when it's not used + perl -pi -e "s!^\s*class $i;\n!!" $file; + echo "$i is unique, we will remove it from file"; + fi + done + fi +done +#look at diff +git diff . + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-22.08.3/clean-includes.sh new/kde-dev-scripts-22.12.0/clean-includes.sh --- old/kde-dev-scripts-22.08.3/clean-includes.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-22.12.0/clean-includes.sh 2022-10-09 17:42:31.000000000 +0200 @@ -0,0 +1,488 @@ +#!/bin/sh + +# Laurent Montel <[email protected]> (2014-2022) +# cd <directory> ; kde-dev-scripts/kf5/clean-includes.sh + + +remove_include() { + echo "$file" |xargs perl -pi -e "s!#include <$originalStr>\n!!" + echo "$file" |xargs perl -pi -e "s!#include \"$originalStr\"\n!!" +} + +file_header() { + filewithoutext=$(echo "$file" |perl -pi -e 's!\.h!!'); + if test "$filewithoutext" != "$file" ; then + echo "$file is a header file"; + existInclude=$(grep -c "$newname" "$file"|grep "#include"); + echo "$newname : $existInclude"; + if test "$existInclude" != 0 ; then + newNameClass=$(grep -c "$newname\s*\*" "$file"); + echo "number $number "; + echo "newNameClass $newNameClass"; + number=$(expr "$number" - 1); + if test "$number" = "$newNameClass"; then + remove_include; + classNumber=$(grep -c "class" "$file"); + if test "$classNumber" != 0 ; then + perl -pi -e "s!class!class $newname;\nclass!g" "$file"; + perl -pi -e "s!#include!#include <$newname>\n#include!g" "$filewithoutext".cpp; + else + perl -pi -e "s!#include!class $newname;\n#include!g" "$file"; + perl -pi -e "s!#include!#include <$newname>\n#include!g" "$filewithoutext".cpp; + fi + fi + fi + fi +} + +test_include() { + for file in $path/* ; + do + if [[ $file == *"build"* ]]; then + continue; + fi + #echo $file; + if test -d "$file" ; then + echo "Check include into directory : $file"; + path=$file; + test_include; + else + # echo "search in file $file"; + include=$(grep "#include" "$file"); + new=$(echo "$include" |perl -pi -e 's!#include !!'); + + new=$(echo "$new" |perl -pi -e 's!\\"!!g'); + new=$(echo "$new" |perl -pi -e 's!<!!g'); + new=$(echo "$new" |perl -pi -e 's!>!!g'); + + newname=$(echo "$new" |perl -pi -e 's!.h!!'); + + + echo "before go : $new"; + for i in $new ; + do + originalStr=$i; + newname=$(echo "$i" | sed 's,.*/,,'); + + newname=$(echo "$newname" |perl -pi -e 's!.h!!'); + if test 1 ; then + echo "egal $i"; + number=$(grep -c "$newname" "$file"); + echo "number $number"; + if test "$number" = 1 ; then + #echo "$file" |xargs perl -pi -e "s!#include <$newname>\n!!"; + # echo "number = 1 $newname class $file"; + firstCar=$(echo "$i" | perl -pi -e "s/^(.)(.*)(.)$/\1/"); + echo "first car : $firstCar"; + if test "$firstCar" = "Q" || test "$firstCar" = "K" ; then + case $newname in + QtMath) + number=$(grep -c "qPow" "$file"); + echo "qPow $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + + QQmlContext) + number=$(grep -c "rootContext()" "$file"); + echo "rootContext() $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + QtQuickTest) + number=$(grep -c "QUICK_TEST_MAIN" "$file"); + echo "QUICK_TEST_MAIN $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + QtConcurrentRun) + number=$(grep -c "QtConcurrent::run" "$file"); + echo "QtConcurrentRun $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + + QObject) + number=$(grep -c "QT_VERSION_CHECK" "$file"); + echo "QObject $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + + KJobUiDelegate) + number=$(grep -c "uiDelegate()" "$file"); + echo "KJobUiDelegate $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + QScopeGuard) + number=$(grep -c "qScopeGuard" "$file"); + echo "QScopeGuard $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + + QtDBus) + number=$(grep -c QDBusInterface "$file"); + echo "QDBusInterface $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + QApplication) + number=$(grep -c qApp "$file"); + echo "qApp $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + QGuiApplication) + number=$(grep -c qGuiApp "$file"); + echo "qApp $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + QDesktopWidget) + number=$(grep -c "Application::desktop" "$file"); + if test "$number" = 0 ; then + number=$(grep -Ec "qApp->desktop()|kApp->desktop()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + fi + ;; + QDBusArgument) + number=$(grep -c "qdbus_cast" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QDBusPendingCall) + number=$(grep -c "QDBusConnection::sessionBus().asyncCall" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + + QDBusMetaType) + number=$(grep -c "qDBusRegisterMetaType" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + + QScrollBar) + number=$(grep -c "verticalScrollBar()" "$file"); + if test "$number" = 0 ; then + number=$(grep -c "horizontalScrollBar()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + fi + ;; + QClipboard) + number=$(grep -Ec "Application::clipboard|clipboard()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QMetaType) + number=$(grep -c "Q_DECLARE_METATYPE" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + KLocale) + number=$(grep -c "i18n" "$file"); + if test "$number" = 0 ; then + number=$(grep -c "locale()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + fi + ;; + KActionCollection) + number=$(grep -c "actionCollection" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + KApplication) + number=$(grep -c '\bkapp\b' "$file"); + echo "qApp $number"; + if test "$number" = 0 ; then + remove_include; + fi + ;; + KDebug) + ;; + KPluginFactory) + ;; + KPluginLoader) + ;; + KXMLGUIFactory) + number=$(grep -c "factory()" "$file"); + if test "$number" = 0 ; then + number=$(grep -c "guiFactory()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + fi + ;; + KGenericFactory) + number=$(grep -c "K_EXPORT_PLUGIN" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QCoreApplication) + number=$(grep -c "qApp" "$file"); + if test "$number" = 0 ; then + number=$(grep -c "qAddPostRoutine" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + fi + ;; + QTreeView) + ;; + + QDateTime) + number=$(grep -c "QDate::currentDate" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + KLineEdit) + number=$(grep -c "lineEdit()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QDBusConnectionInterface) + ;; + KLocalizedString) + number=$(grep -E "i18n|I18N_NOOP" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QAbstractTextDocumentLayout) + ;; + QAbstractItemView) + ;; + QMetaEnum) + number=$(grep -c "enumerator" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + + QLayout) + number=$(grep -c "layout()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QAction) + number=$(grep -c "\baddAction\b" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QTextDocument) + number=$(grep -c "Qt::escape" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QHeaderView) + number=$(grep -c "header()" "$file"); + if test "$number" = 0 ; then + number=$(grep -c "horizontalHeader()" "$file"); + if test "$number" = 0 ; then + number=$(grep -c "verticalHeader()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + fi + fi + ;; + KRecentFilesAction) + number=$(grep -c "KStandardAction::openRecent" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + KStatusBar) + number=$(grep -c "statusBar()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QStatusBar) + number=$(grep -c "statusBar()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + KGlobal) + number=$(grep -c "K_GLOBAL_STATIC" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + KStandardDirs) + number=$(grep -c "KGlobal::dirs()->" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QTabBar) + number=$(grep -c "tabBar()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + KCompletionBox) + number=$(grep -c "completionBox()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + + KIconLoader) + number=$(grep -c "SmallIcon" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + + KZip) + number=$(grep -c "archive()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QDebug) + number=$(grep -Ec "qDebug|qWarning|qCritical" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + #number=`grep "qDebug" $file|wc -l`; + #if test $number = 0 ; then + # number=`grep "qWarning" $file|wc -l`; + # if test $number = 0 ; then + # remove_include; + # fi + #fi + ;; + QtDebug) + number=$(grep -Ec "qDebug|qWarning|qCritical" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + #number=`grep "qDebug" $file|wc -l`; + #if test $number = 0 ; then + # number=`grep "qWarning" $file|wc -l`; + # if test $number = 0 ; then + # remove_include; + # fi + #fi + ;; + + QLoggingCategory) + number=$(grep -Ec "Q_DECLARE_LOGGING_CATEGORY|Q_LOGGING_CATEGORY" "$file"); + if test "$number" = 0 ; then + number=$(grep -Ec "qDebug|qWarning|qCritical" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + fi + ;; + QScreen) + number=$(grep -c "physicalDotsPerInch()" "$file"); + if test "$number" = 0 ; then + number=$(grep -c "screen()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + fi + ;; + QMimeData) + number=$(grep -c "mimeData()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + KToolBar) + number=$(grep -c "toolBar()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QPixmap) + number=$(grep -c "SmallIcon" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QHostAddress) + ;; + QMenuBar) + number=$(grep -c "menuBar()" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QTest) + number=$(grep -Ec "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QtTestGui) + number=$(grep -Ec "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QtTestWidgets) + number=$(grep -Ec "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + QtTest) + number=$(grep -Ec "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" "$file"); + if test "$number" = 0 ; then + remove_include; + fi + ;; + *) + echo "remove it !!!!!"; + remove_include; + ;; + esac + elif [ "$number" -gt 1 ]; then + #file_header; + echo "tot"; + fi + fi + fi + done; + fi +done; +} + +path=$PWD; +test_include +git diff . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-22.08.3/kf5/clean-forward-declaration.sh new/kde-dev-scripts-22.12.0/kf5/clean-forward-declaration.sh --- old/kde-dev-scripts-22.08.3/kf5/clean-forward-declaration.sh 2022-07-12 18:21:50.000000000 +0200 +++ new/kde-dev-scripts-22.12.0/kf5/clean-forward-declaration.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,33 +0,0 @@ -#!/bin/sh - -# Laurent Montel <[email protected]> (2014) -# cd <directory> ; ./clean-forward-declaration.sh - -#list all .h files. -list=`find -name '*.h' | egrep -v '(\.svn|build)'`; - # list=`ls *.H | egrep -v '(\.svn|build)'`; -for file in $list ; do - #get class line (don't get it when we have "friend"/"template" or "public" word or *Private class) - class=`echo "$file" | xargs grep "class" | egrep -v '(public|friend|template|Private)' `; - if test ! -z "$class" ; then - echo "filename :$file"; - #By default it's defined as "class Kurl;" => remove "class " and ";" - newval=`echo "$class" | perl -pi -e 's!class !!g'`; - newval=`echo "$newval" | perl -pi -e 's!;!!g'`; - - #need to have all class name => use awk to split string, separator is "\n"; - splitline=`echo $newval | awk -F' ' 'END { for (i = 1 ; i <= NF ; i++) { tab[i] = $i ; print tab[i] } } '`; - for i in $splitline ; do - #Look at into file if there is multiple defined of class name => if number == 1 => it's not used - val=`echo "$file" | xargs grep "$i" | wc -l`; - if test "$val" = "1" ; then - # Remove "class <classname>;" when it's not used - perl -pi -e "s!^\s*class $i;\n!!" $file; - echo "$i is unique, we will remove it from file"; - fi - done - fi -done -#look at diff -git diff . - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-22.08.3/kf5/clean-includes.sh new/kde-dev-scripts-22.12.0/kf5/clean-includes.sh --- old/kde-dev-scripts-22.08.3/kf5/clean-includes.sh 2022-07-12 18:21:50.000000000 +0200 +++ new/kde-dev-scripts-22.12.0/kf5/clean-includes.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,502 +0,0 @@ -#!/bin/sh - -# Laurent Montel <[email protected]> (2014-2017) -# cd <directory> ; kde-dev-scripts/kf5/clean-includes.sh - - -remove_include() { - echo "$file" |xargs perl -pi -e "s!#include <$newname>\n!!" - echo "$file" |xargs perl -pi -e "s!#include \"$newname\"\n!!" -} - -file_header() { - filewithoutext=`echo "$file" |perl -pi -e 's!\.h!!'`; - if test $filewithoutext != $file ; then - echo "$file is a header file"; - existInclude=`grep $newname $file|grep "#include"|wc -l`; - echo "$newname : $existInclude"; - if test $existInclude != 0 ; then - newNameClass=`grep "$newname\s*\*" $file|wc -l`; - echo "number $number "; - echo "newNameClass $newNameClass"; - number=$(expr $number - 1); - if test $number = $newNameClass; then - remove_include; - classNumber=`grep "class" $file|wc -l`; - if test $classNumber != 0 ; then - perl -pi -e "s!class!class $newname;\nclass!g" $file; - perl -pi -e "s!#include!#include <$newname>\n#include!g" $filewithoutext.cpp; - else - perl -pi -e "s!#include!class $newname;\n#include!g" $file; - perl -pi -e "s!#include!#include <$newname>\n#include!g" $filewithoutext.cpp; - fi - fi - fi - fi -} - -test_include() { -for file in $path/* ; -do - if [[ $file == *"build"* ]]; then - continue; - fi - #echo $file; - if test -d $file ; then - echo "Check include into directory : $file"; - path=$file; - test_include; - else - #echo "search in file $file"; - include=`grep "#include" $file`; - #echo "$include "; - new=`echo "$include" |perl -pi -e 's!#include !!'`; - new=`echo "$new" |perl -pi -e 's!\\"!!g'`; - new=`echo "$new" |perl -pi -e 's!<!!g'`; - new=`echo "$new" |perl -pi -e 's!>!!g'`; - new=`echo "$new" |perl -pi -e 's!QtCore/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtGui/!!g'`; - new=`echo "$new" |perl -pi -e 's!Qt3Support/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtDBus/!!g'`; - new=`echo "$new" |perl -pi -e 's!KDE/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtTest/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtSvg/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtXml/!!g'`; - new=`echo "$new" |perl -pi -e 's!Plasma/!!g'`; - new=`echo "$new" |perl -pi -e 's!KNS/!!g'`; - new=`echo "$new" |perl -pi -e 's!KIO/!!g'`; - new=`echo "$new" |perl -pi -e 's!KABC/!!g'`; - new=`echo "$new" |perl -pi -e 's!KMime/!!g'`; - new=`echo "$new" |perl -pi -e 's!KMBox/!!g'`; - new=`echo "$new" |perl -pi -e 's!KParts/!!g'`; - new=`echo "$new" |perl -pi -e 's!KNS3/!!g'`; - new=`echo "$new" |perl -pi -e 's!KNSCore/!!g'`; - new=`echo "$new" |perl -pi -e 's!KPIMIdentities/!!g'`; - new=`echo "$new" |perl -pi -e 's!KCalCore/!!g'`; - new=`echo "$new" |perl -pi -e 's!KPIMUtils/!!g'`; - new=`echo "$new" |perl -pi -e 's!KCalUtils/!!g'`; - new=`echo "$new" |perl -pi -e 's!KontactInterface/!!g'`; - new=`echo "$new" |perl -pi -e 's!KHolidays/!!g'`; - new=`echo "$new" |perl -pi -e 's!KWallet/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtNetwork/!!g'`; - new=`echo "$new" |perl -pi -e 's!KJobWidgets/!!g'`; - new=`echo "$new" |perl -pi -e 's!KPIMTextEdit/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtSql/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtWidgets/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtPrintSupport/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtQuick/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtDBus/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtDeclarative/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtDesigner/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtQml/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtMultimedia/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtConcurrent/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtQuickWidgets/!!g'`; - new=`echo "$new" |perl -pi -e 's!QtXmlPatterns/!!g'`; - new=`echo "$new" |perl -pi -e 's!KContacts/!!g'`; - new=`echo "$new" |perl -pi -e 's!KIdentityManagement/!!g'`; - new=`echo "$new" |perl -pi -e 's!KAddressBookImportExport/!!g'`; - new=`echo "$new" |perl -pi -e 's!KaddressbookGrantlee/!!g'`; - new=`echo "$new" |perl -pi -e 's!QGpgME/!!g'`; - new=`echo "$new" |perl -pi -e 's!KDAV/!!g'`; - new=`echo "$new" |perl -pi -e 's!Qt3DCore/!!g'`; - new=`echo "$new" |perl -pi -e 's!Qt3DAnimation/!!g'`; - new=`echo "$new" |perl -pi -e 's!Qt3DRender/!!g'`; - new=`echo "$new" |perl -pi -e 's!KSieveUi/!!g'`; - new=`echo "$new" |perl -pi -e 's!KTNEF/!!g'`; - new=`echo "$new" |perl -pi -e 's!KCodecs/!!g'`; - new=`echo "$new" |perl -pi -e 's!KSMTP/!!g'`; - new=`echo "$new" |perl -pi -e 's!KGAPI/!!g'`; - new=`echo "$new" |perl -pi -e 's!KItinerary/!!g'`; - new=`echo "$new" |perl -pi -e 's!KRunner/!!g'`; - new=`echo "$new" |perl -pi -e 's!KIMAP/!!g'`; - new=`echo "$new" |perl -pi -e 's!KLDAP/!!g'`; - new=`echo "$new" |perl -pi -e 's!KCoreAddons/!!g'`; - new=`echo "$new" |perl -pi -e 's!KdepimDBusInterfaces/!!g'`; - new=`echo "$new" |perl -pi -e 's!KScreen/!!g'`; - new=`echo "$new" |perl -pi -e 's!KQuickAddons/!!g'`; - new=`echo "$new" |perl -pi -e 's!KIPI/!!g'`; - new=`echo "$new" |perl -pi -e 's!KIOWidgets/!!g'`; - new=`echo "$new" |perl -pi -e 's!KActivities/Stats/!!g'`; - new=`echo "$new" |perl -pi -e 's!KI18n/!!g'`; - new=`echo "$new" |perl -pi -e 's!KTextEditor/!!g'`; - new=`echo "$new" |perl -pi -e 's!KPackage/!!g'`; - new=`echo "$new" |perl -pi -e 's!KPeople/!!g'`; - new=`echo "$new" |perl -pi -e 's!KActivities/!!g'`; - new=`echo "$new" |perl -pi -e 's!KFileMetaData/!!g'`; - new=`echo "$new" |perl -pi -e 's!KCalendarCore/!!g'`; - new=`echo "$new" |perl -pi -e 's!KDeclarative/!!g'`; - new=`echo "$new" |perl -pi -e 's!KUserFeedback/!!g'`; - new=`echo "$new" |perl -pi -e 's!KAlarmCal/!!g'`; - newname=`echo "$new" |perl -pi -e 's!.h!!'`; - - #echo "before go : $new"; - for i in $new ; - do - #echo $i; - newname=`echo "$i" |perl -pi -e 's!.h!!'`; - - if test $newname = $i ; then - #echo "egal $i"; - number=`grep $i $file|wc -l`; - #echo "number $number"; - if test $number = 1 ; then - #echo "$file" |xargs perl -pi -e "s!#include <$newname>\n!!"; - echo "number = 1 $newname class $file"; - firstCar=`echo "$i" | perl -pi -e "s/^(.)(.*)(.)$/\1/"`; - echo "first car : $firstCar"; - if test $firstCar = "Q" || test $firstCar = "K" ; then - case $newname in - QtDBus) - number=`grep QDBusInterface $file|wc -l`; - echo "QDBusInterface $number"; - if test $number = 0 ; then - remove_include; - fi - ;; - QApplication) - number=`grep qApp $file|wc -l`; - echo "qApp $number"; - if test $number = 0 ; then - remove_include; - fi - ;; - QGuiApplication) - number=`grep qGuiApp $file|wc -l`; - echo "qApp $number"; - if test $number = 0 ; then - remove_include; - fi - ;; - QDesktopWidget) - number=`grep "Application::desktop" $file|wc -l`; - if test $number = 0 ; then - number=`egrep "qApp->desktop()|kApp->desktop()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - fi - ;; - QDBusArgument) - number=`grep "qdbus_cast" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QDBusPendingCall) - number=`grep "QDBusConnection::sessionBus().asyncCall" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - - QDBusMetaType) - number=`grep "qDBusRegisterMetaType" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - - QScrollBar) - number=`grep "verticalScrollBar()" $file|wc -l`; - if test $number = 0 ; then - number=`grep "horizontalScrollBar()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - fi - ;; - QClipboard) - number=`egrep "Application::clipboard|clipboard()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QMetaType) - number=`grep "Q_DECLARE_METATYPE" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - KLocale) - number=`grep "i18n" $file|wc -l`; - if test $number = 0 ; then - number=`grep "locale()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - fi - ;; - KActionCollection) - number=`grep "actionCollection" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - KApplication) - number=`grep '\bkapp\b' $file|wc -l`; - echo "qApp $number"; - if test $number = 0 ; then - remove_include; - fi - ;; - KDebug) - ;; - KPluginFactory) - ;; - KPluginLoader) - ;; - KXMLGUIFactory) - number=`grep "factory()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - KGenericFactory) - number=`grep "K_EXPORT_PLUGIN" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QCoreApplication) - number=`grep "qApp" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QTreeView) - ;; - - KToolBar) - number=`grep "toolbar()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QDateTime) - number=`grep "QDate::currentDate" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - KLineEdit) - number=`grep "lineEdit()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QDBusConnectionInterface) - ;; - KLocalizedString) - number=`egrep "i18n|I18N_NOOP" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QAbstractTextDocumentLayout) - ;; - QAbstractItemView) - ;; - QMetaEnum) - number=`grep "enumerator" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - - QLayout) - number=`grep "layout()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QAction) - number=`grep "\baddAction\b" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QTextDocument) - number=`grep "Qt::escape" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QHeaderView) - number=`grep "header()" $file|wc -l`; - if test $number = 0 ; then - number=`grep "horizontalHeader()" $file|wc -l`; - if test $number = 0 ; then - number=`grep "verticalHeader()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - fi - fi - ;; - KRecentFilesAction) - number=`grep "KStandardAction::openRecent" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - KStatusBar) - number=`grep "statusBar()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QStatusBar) - number=`grep "statusBar()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - KGlobal) - number=`grep "K_GLOBAL_STATIC" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - KStandardDirs) - number=`grep "KGlobal::dirs()->" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QTabBar) - number=`grep "tabBar()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - KCompletionBox) - number=`grep "completionBox()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - - KIconLoader) - number=`grep "SmallIcon" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - - KZip) - number=`grep "archive()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QDebug) - number=`egrep "qDebug|qWarning|qCritical" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - #number=`grep "qDebug" $file|wc -l`; - #if test $number = 0 ; then - # number=`grep "qWarning" $file|wc -l`; - # if test $number = 0 ; then - # remove_include; - # fi - #fi - ;; - QtDebug) - number=`egrep "qDebug|qWarning|qCritical" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - #number=`grep "qDebug" $file|wc -l`; - #if test $number = 0 ; then - # number=`grep "qWarning" $file|wc -l`; - # if test $number = 0 ; then - # remove_include; - # fi - #fi - ;; - - QLoggingCategory) - number=`egrep "Q_DECLARE_LOGGING_CATEGORY|Q_LOGGING_CATEGORY" $file|wc -l`; - if test $number = 0 ; then - number=`egrep "qDebug|qWarning|qCritical" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - fi - ;; - QScreen) - number=`grep "physicalDotsPerInch()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QMimeData) - number=`grep "mimeData()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - KToolBar) - number=`grep "toolBar()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QPixmap) - number=`grep "SmallIcon" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QHostAddress) - ;; - QMenuBar) - number=`grep "menuBar()" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QTest) - number=`egrep "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QtTestGui) - number=`egrep "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QtTestWidgets) - number=`egrep "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - QtTest) - number=`egrep "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" $file|wc -l`; - if test $number = 0 ; then - remove_include; - fi - ;; - *) - remove_include; - ;; - esac - fi - elif test $number > 1 ; then - #file_header; - echo "tot"; - fi - fi - done; - fi -done; -} - -path=$PWD; -test_include -git diff . diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-22.08.3/relicensecheck.pl new/kde-dev-scripts-22.12.0/relicensecheck.pl --- old/kde-dev-scripts-22.08.3/relicensecheck.pl 2022-07-12 18:21:50.000000000 +0200 +++ new/kde-dev-scripts-22.12.0/relicensecheck.pl 2022-10-09 17:42:31.000000000 +0200 @@ -68,6 +68,7 @@ 'johanneszarl' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'jpoelen' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'jriddell' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'jsuhaas' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'kezik' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'kleag' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', 'CCBYSA4' ], 'lesliezhai' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], @@ -108,6 +109,7 @@ 'tleupold' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'vladz' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'vjoshi' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'whiting' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'wxiao' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'wbauer' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'xyquadrat' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ] @@ -328,7 +330,6 @@ 'vrusu' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'waba' => ['gplv23', 'lgplv23', '+eV' ], # NOTE: explicit consent given for relicensing LGPL-2.0-only to LGPL-2.1-only in addition to the stated grants 'wheeler' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], - 'whiting' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'willy' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'woebbe' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'wstephens' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ],
