Hello community, here is the log from the commit of package kdesdk-scripts for openSUSE:Factory checked in at 2019-01-08 12:20:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk-scripts.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesdk-scripts" Tue Jan 8 12:20:59 2019 rev:13 rq:658384 version:18.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk-scripts/kdesdk-scripts.changes 2018-11-13 17:18:33.338188243 +0100 +++ /work/SRC/openSUSE:Factory/.kdesdk-scripts.new.28833/kdesdk-scripts.changes 2019-01-08 12:21:09.672754744 +0100 @@ -1,0 +2,46 @@ +Fri Dec 14 06:09:08 UTC 2018 - [email protected] + +- Update to 18.12.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.0.php +- Changes since 18.11.90: + * No code changes since 18.11.90 + +------------------------------------------------------------------- +Mon Dec 03 20:55:55 UTC 2018 - [email protected] + +- Update to 18.11.90 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-rc.php +- Changes since 18.11.80: + * No code changes since 18.11.80 + +------------------------------------------------------------------- +Tue Nov 20 06:22:14 UTC 2018 - Luca Beltrame <[email protected]> + +- Run spec-cleaner + +------------------------------------------------------------------- +Tue Nov 20 05:56:57 UTC 2018 - [email protected] + +- Update to 18.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12-beta.php +- Changes since 18.08.3: + * Fix generate code + * Add support for override too + * Do not spellcheck the file with mistakes + * Small fixes for convert-qkdebug-to-qcdebug.sh + * Add my account (aheinecke) to relicensecheck + * Improve it + * Add my account (Andrew Crouthamel, acrouthamel) + * createtarball: krusader version bump (v2.7.1) + * createtarball: switched translation branch to stable for krusader + * Add myself (jpoelen) to relicensecheck.pl + * uncrustify-kf5: support custom config file in current dir; add command line options --qt, --commit, --ignore-connects + * Add phabricator config file + +------------------------------------------------------------------- @@ -47 +93 @@ - * https://www.kde.org/announcements/announce-applications-18.07.80.php + * https://www.kde.org/announcements/announce-applications-18.08-beta.php @@ -108 +154 @@ - * https://www.kde.org/announcements/announce-applications-18.03.90.php + * https://www.kde.org/announcements/announce-applications-18.04-rc.php @@ -262 +308 @@ - * https://www.kde.org/announcements/announce-applications-17.07.90.php + * https://www.kde.org/announcements/announce-applications-17.08-rc.php @@ -322 +368 @@ - * https://www.kde.org/announcements/announce-applications-17.03.80.php + * https://www.kde.org/announcements/announce-applications-17.04-beta.php @@ -427 +473 @@ - * https://www.kde.org/announcements/announce-applications-16.07.90.php + * https://www.kde.org/announcements/announce-applications-16.08-rc.php @@ -543 +589 @@ - * https://www.kde.org/announcements/announce-applications-15.07.90.php + * https://www.kde.org/announcements/announce-applications-15.08-rc.php Old: ---- kde-dev-scripts-18.08.3.tar.xz New: ---- kde-dev-scripts-18.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk-scripts.spec ++++++ --- /var/tmp/diff_new_pack.Ak6PUZ/_old 2019-01-08 12:21:10.480753851 +0100 +++ /var/tmp/diff_new_pack.Ak6PUZ/_new 2019-01-08 12:21:10.496753833 +0100 @@ -16,19 +16,18 @@ # -%bcond_without lang - %define rname kde-dev-scripts %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} +%bcond_without lang Name: kdesdk-scripts -Version: 18.08.3 +Version: 18.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: http://www.kde.org/ +URL: http://www.kde.org/ Source0: %{rname}-%{version}.tar.xz Patch0: kde-dev-scripts-4.14.3-fix-bashisms.patch BuildRequires: extra-cmake-modules @@ -83,18 +82,20 @@ cp kf5/* %{buildroot}%{_datadir}/kf5-port-scripts/ %files -%doc COPYING COPYING.DOC README +%license COPYING COPYING.DOC +%doc README %{_kf5_bindir}/* %{_mandir}/man1/*%{ext_man} %{_kf5_appsdir}/uncrustify/ %files kf5-porting -%doc COPYING COPYING.DOC README +%license COPYING COPYING.DOC +%doc README %{_datadir}/kf5-port-scripts/ %if %{with lang} %files lang -f %{name}.lang -%doc COPYING* +%license COPYING* %endif %changelog ++++++ kde-dev-scripts-18.08.3.tar.xz -> kde-dev-scripts-18.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-18.08.3/.arcconfig new/kde-dev-scripts-18.12.0/.arcconfig --- old/kde-dev-scripts-18.08.3/.arcconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-18.12.0/.arcconfig 2018-11-09 08:01:52.000000000 +0100 @@ -0,0 +1,4 @@ +{ + "phabricator.uri" : "https://phabricator.kde.org/project/profile/60/";, + "history.immutable" : true +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-18.08.3/.krazy new/kde-dev-scripts-18.12.0/.krazy --- old/kde-dev-scripts-18.08.3/.krazy 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-18.12.0/.krazy 2018-11-09 08:01:52.000000000 +0100 @@ -0,0 +1 @@ +SKIP kde-spellcheck.pl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-18.08.3/createtarball/config.ini new/kde-dev-scripts-18.12.0/createtarball/config.ini --- old/kde-dev-scripts-18.08.3/createtarball/config.ini 2018-07-03 07:12:09.000000000 +0200 +++ new/kde-dev-scripts-18.12.0/createtarball/config.ini 2018-11-09 08:01:52.000000000 +0100 @@ -185,10 +185,11 @@ [krusader] gitModule = yes -gitTag = v2.7.0 -version = 2.7.0 +gitTag = v2.7.1 +version = 2.7.1 kde_release = no -mainmodule = extragear +mainmodule = branches +l10npath = branches/stable l10nmodule = extragear-utils addPo = krusader translations = yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-18.08.3/kf5/convert-qkdebug-to-qcdebug.sh new/kde-dev-scripts-18.12.0/kf5/convert-qkdebug-to-qcdebug.sh --- old/kde-dev-scripts-18.08.3/kf5/convert-qkdebug-to-qcdebug.sh 2018-07-03 07:12:09.000000000 +0200 +++ new/kde-dev-scripts-18.12.0/kf5/convert-qkdebug-to-qcdebug.sh 2018-11-09 08:01:52.000000000 +0100 @@ -36,7 +36,10 @@ # end echo "1) ecm_qt_declare_logging_category(<file>_SRCS HEADER $debugnamefile.h IDENTIFIER $newcategoryname CATEGORY_NAME $newlogname) to CMakeLists.txt" -echo "2) Add #include \"$debugnamefile.h\" to each file which was changed" -echo "3) Verify that it compiles :)" -echo "4) If you find bugs fix them please me" +echo "2) Add #include \"$debugnamefile.h\" to each file which was changed if it is not there yet" +echo "3) Add include(ECMQtDeclareLoggingCategory) to CMakeLists.txt" +echo "4) Add '$newlogname <description> IDENTIFIER [$newcategoryname]' to <name>.categories" +echo "4) install( FILES <name>.categories DESTINATION \${KDE_INSTALL_CONFDIR} ) to CMakeLists.txt" +echo "5) Verify that it compiles :)" +echo "6) If you find bugs fix them please me" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-18.08.3/kf5/convert-to-new-signal-slot-signal.pl new/kde-dev-scripts-18.12.0/kf5/convert-to-new-signal-slot-signal.pl --- old/kde-dev-scripts-18.08.3/kf5/convert-to-new-signal-slot-signal.pl 2018-07-03 07:12:09.000000000 +0200 +++ new/kde-dev-scripts-18.12.0/kf5/convert-to-new-signal-slot-signal.pl 2018-11-09 08:01:52.000000000 +0100 @@ -167,7 +167,7 @@ if ( defined $_ ) { return $_; } else { - return "&" . "$classname::$function"; + return "&" . "$classname" . "::" . "$function"; } } @@ -579,7 +579,7 @@ my $isPrivateSlot; if ( (defined $varname{$sender}) and (defined $varname{$receiver}) ) { $signal = cast_overloaded_signal($varname{$sender}, $signalArgument, $signal); - $slot = "$varname{$receiver}::$slot"; + $slot = "$varname{$receiver}" . "::" . "$slot"; if ( defined $localSenderVariable) { $sender = "&" . $sender; } @@ -629,7 +629,7 @@ $signal = "&QAction::$signal"; } elsif ( $sender =~ /(.*)::self\(\)/) { my $class = $1; - $signal = "&" . "$class::$signal"; + $signal = "&" . "$class" . "::" . "$signal"; } else { # It's not specific to ui class. It can be a private class too if ( $sender =~ /(\w+)\.(.*)/ || $sender =~ /(\w+)\-\>(.*)/) { @@ -672,16 +672,16 @@ if ( defined $varname{$receiver} ) { $slot = "$varname{$receiver}::$slot"; } elsif ( defined $varnamewithpointer{$receiver} ) { - $slot = "$varnamewithpointer{$receiver}::$slot"; + $slot = "$varnamewithpointer{$receiver}" . "::" ." $slot"; $receiverWithQPointer = 1; } elsif ( defined $privateVariableWithPointer{$receiver} ) { - $slot = "$privateVariableWithPointer{$receiver}::$slot"; + $slot = "$privateVariableWithPointer{$receiver}" . "::". "$slot"; $receiverWithQPointer = 1; } elsif ( $receiver eq "this") { if ( $headerclassname eq "" ) { $notpossible = "no current classname"; } - $slot = "$headerclassname::$slot"; + $slot = "$headerclassname" . "::" . "$slot"; } else { if ( $receiver =~ /(\w+)\.(.*)/ || $receiver =~ /(\w+)\-\>(.*)/) { my $uivariable = $1; @@ -697,7 +697,7 @@ if (defined $activateDebug) { warn "vartype found $varname{$varui} \n"; } - $slot = "$varname{$varui}::$slot"; + $slot = "$varname{$varui}" . "::" ." $slot"; } else { $notpossible = "unknown variable $varui"; } @@ -794,12 +794,11 @@ if ( $headerclassname eq "" ) { $notpossible = "no current classname"; } - if ( defined $varname{$sender} ) { - $slot = "$headerclassname::$slot"; + $slot = "$headerclassname" . "::" . "$slot"; $signal = cast_overloaded_signal($varname{$sender}, $signalArgument, $signal); } else { - $slot = "$headerclassname::$slot"; + $slot = "$headerclassname" . "::" . "$slot"; if ( $sender eq "this") { $signal = cast_overloaded_signal($headerclassname, $signalArgument, $signal); } elsif ( $sender eq "qApp") { @@ -812,7 +811,7 @@ $signal = "&QAction::$signal"; } elsif ( $sender =~ /(.*)::self\(\)/) { my $class = "&" . $1; - $signal = "$class::$signal"; + $signal = "$class" . "::" . "$signal"; } else { if ( $sender =~ /(\w+)\.(.*)/ || $sender =~ /(\w+)\-\>(.*)/) { my $uivariable = $1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-18.08.3/kf5/remove_virtual_prefix.pl new/kde-dev-scripts-18.12.0/kf5/remove_virtual_prefix.pl --- old/kde-dev-scripts-18.08.3/kf5/remove_virtual_prefix.pl 2018-07-03 07:12:09.000000000 +0200 +++ new/kde-dev-scripts-18.12.0/kf5/remove_virtual_prefix.pl 2018-11-09 08:01:52.000000000 +0100 @@ -36,6 +36,27 @@ $_ = $indent . $function . "Q_DECL_OVERRIDE" . $end . "\n"; } + my $regexp2 = qr/ + ^(\s*) # (1) Indentation + virtual\s* # (2) virtual + (.*) # (3) function + override(.*)$ + /x; # /x Enables extended whitespace mode + if (my ($indent, $function, $end) = $_ =~ $regexp2) { + $_ = $indent . $function . "override" . $end . "\n"; + } + + my $regexpComment2 = qr/ + ^(\s*) # (1) Indentation + \/\*\s*reimp\s*\*\/\s* # (2) reimp comment + (.*) # (3) function + override(.*)$ + /x; # /x Enables extended whitespace mode + if (my ($indent, $function, $end) = $_ =~ $regexpComment2) { + $_ = $indent . $function . "override" . $end . "\n"; + } + + $modified ||= $orig ne $_; $_; } <$FILE>; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-18.08.3/relicensecheck.pl new/kde-dev-scripts-18.12.0/relicensecheck.pl --- old/kde-dev-scripts-18.08.3/relicensecheck.pl 2018-07-03 07:12:09.000000000 +0200 +++ new/kde-dev-scripts-18.12.0/relicensecheck.pl 2018-11-09 08:01:52.000000000 +0100 @@ -30,9 +30,12 @@ ### For more information, see http://techbase.kde.org/Projects/KDE_Relicensing my %license_table = ( + 'acrouthamel' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'aheinecke' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'cgerloff' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'flherne' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'huoni' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'jpoelen' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'jriddell' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'kleag' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', 'CCBYSA4' ], 'ltoscano' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-18.08.3/uncrustify-kf5 new/kde-dev-scripts-18.12.0/uncrustify-kf5 --- old/kde-dev-scripts-18.08.3/uncrustify-kf5 2018-07-03 07:12:09.000000000 +0200 +++ new/kde-dev-scripts-18.12.0/uncrustify-kf5 2018-11-09 08:01:52.000000000 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -# Apply KF5 coding style to all c, cpp and header files in and below the current directory +# Apply KF5, Qt or custom coding style to all c, cpp and header files in and below the current directory # # The coding style is defined in http://techbase.kde.org/Policies/Kdelibs_Coding_Style # @@ -13,24 +13,66 @@ # Documentation of the uncrustify options at http://uncrustify.sourceforge.net/default.cfg # +help() { + echo "`basename $0` [--qt] [--commit] - Apply KF5, Qt or custom coding style to all c, cpp and header files in and below the current directory" + echo "Simply chdir to the directory containing your code and run this program." + echo + echo "Options:" + echo " --qt - use Qt style (default is KDE Frameworks 5 style, which could be overriden by a file uncrustify.cfg in the current directory)" + echo " --commit - commit changes" + echo " --ignore-connects - do not reformat connects" + echo + echo +} + +qt=0 +commit=0 +no_slots=1 +until [ -z "$1" ]; do + case $1 in + --qt) + qt=1 + ;; + --commit) + commit=1 + ;; + --ignore-connects) + ignore_connects=1 + ;; + *) + help + exit 1 + ;; + esac + shift +done + files=`find -type f -name '*.c' -or -name '*.cpp' -or -name '*.cc' -or -name '*.h'` if [ -z "$files" ]; then # nothing to do exit 0 fi -if test -z "$QT_NORMALIZE_TOOL"; then +if test -z "$QT_NORMALIZE_TOOL" && test "$ignore_connects" == "0"; then echo "Please export QT_NORMALIZE_TOOL=<qt5>/qtrepotools/util/normalize/normalize" exit 1 fi -# Change this to uncrustify-qt.cfg to reformat Qt code (TODO: command-line option?) -cfgfile=uncrustify-kf5.cfg - -cfg=`qtpaths --locate-file GenericDataLocation uncrustify/$cfgfile` -if test -z "$cfg"; then - echo "Config file uncrustify/$cfgfile not found in prefix/share (GenericDataLocation). Check that XDG_DATA_DIRS contains the install prefix for kde-dev-scripts." - exit 1 +cfg=uncrustify.cfg +if ! test -f "$cfg"; then + if test "$qt" == "1"; then + cfgfile=uncrustify-qt.cfg + else + cfgfile=uncrustify-kf5.cfg + fi + cfg=`qtpaths --locate-file GenericDataLocation uncrustify/$cfgfile` + if test -z "$cfg"; then + cfg=$(dirname $0)/$cfgfile + if ! test -f "$cfg"; then + echo "Config file uncrustify/$cfgfile not found in prefix/share (GenericDataLocation) or $(dirname $0). Check that XDG_DATA_DIRS contains the install prefix for kde-dev-scripts." + exit 1 + fi + fi fi uncrustify --no-backup -c "$cfg" $files @@ -78,10 +120,12 @@ EOF # Normalize signals/slots -$QT_NORMALIZE_TOOL --modify . +if test -n "$QT_NORMALIZE_TOOL" && test "$ignore_connects" == "1"; then + $QT_NORMALIZE_TOOL --modify . +fi -# TODO: add command-line option to trigger this -# It's not wanted when working on a fix -#git commit -q -a -m "Code reformatted using kde-dev-scripts/astyle-kdelibs. -#Use git blame -w `git rev-parse --short HEAD` to show authorship as it was before this commit." +if test "$commit" == "1"; then + git commit -q -a -m "Code reformatted using kde-dev-scripts/`basename $0`" +fi +#Use git blame -w `git rev-parse --short HEAD` to show authorship as it was before this commit."
