Hello community, here is the log from the commit of package kdesdk-scripts for openSUSE:Factory checked in at 2018-04-27 16:03:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk-scripts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesdk-scripts" Fri Apr 27 16:03:34 2018 rev:5 rq:599033 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk-scripts/kdesdk-scripts.changes 2018-03-22 12:00:57.674614547 +0100 +++ /work/SRC/openSUSE:Factory/.kdesdk-scripts.new/kdesdk-scripts.changes 2018-04-27 16:03:35.298911649 +0200 @@ -1,0 +2,32 @@ +Wed Apr 18 07:49:09 CEST 2018 - [email protected] + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * None + +------------------------------------------------------------------- +Fri Apr 06 07:09:20 CEST 2018 - [email protected] + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * Add myself (huoni) to relicensecheck.pl + * Add script for using override keyword + * Fix Qtest support + * add myself (cgerloff) to relicensecheck.pl + * Minor fix + * Add 'michaelh' as 'michelh' to relicensecheck.pl + * Add ngraham to relicensecheck + * Add myself (muhlenpfordt) to relicensecheck + * Remove obsolete reviewboardrc file + * Accept also CCBYSA4 + * update license. + * added pim-build-deps-graphs.py + * Add some qt3d namespace + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-17.12.3.tar.xz New: ---- kde-dev-scripts-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk-scripts.spec ++++++ --- /var/tmp/diff_new_pack.FCCNXx/_old 2018-04-27 16:03:36.018885232 +0200 +++ /var/tmp/diff_new_pack.FCCNXx/_new 2018-04-27 16:03:36.022885085 +0200 @@ -23,7 +23,7 @@ # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Name: kdesdk-scripts -Version: 17.12.3 +Version: 18.04.0 Release: 0 Summary: Scripts for KDE software development License: GPL-2.0-only AND GFDL-1.2-only ++++++ kde-dev-scripts-17.12.3.tar.xz -> kde-dev-scripts-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.12.3/.reviewboardrc new/kde-dev-scripts-18.04.0/.reviewboardrc --- old/kde-dev-scripts-17.12.3/.reviewboardrc 2018-01-10 23:04:45.000000000 +0100 +++ new/kde-dev-scripts-18.04.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -REPOSITORY = "git://anongit.kde.org/kde-dev-scripts" -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -BRANCH = "master" -TARGET_GROUPS = "kdeframeworks" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.12.3/kf5/add_destructor_override.pl new/kde-dev-scripts-18.04.0/kf5/add_destructor_override.pl --- old/kde-dev-scripts-17.12.3/kf5/add_destructor_override.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-18.04.0/kf5/add_destructor_override.pl 2018-03-13 03:44:55.000000000 +0100 @@ -0,0 +1,41 @@ +#!/usr/bin/perl -w + +# Usage: add_destructor_override.pl *.h +# add overide when we have virtual destructor (not perfect as sometimes we define destructor as virtual. +# so you need to test compile. + +use strict; +use File::Basename; +use lib dirname($0); +use functionUtilkde; + +foreach my $file (@ARGV) { + + # I don't use functionUtilkde::substInFile because it touches all files, even those which were not modified. + my $modified; + open(my $FILE, "<", $file) or warn "We can't open file $file:$!\n"; + my @l = map { + my $orig = $_; + + my $regexp = qr/ + ^(\s*) # (1) Indentation + virtual\s*~ # (2) virtual + (.*) # (3) function + \(\);$ + /x; # /x Enables extended whitespace mode + if (my ($indent, $function) = $_ =~ $regexp) { + $_ = $indent . "~" . $function . "() override;" . "\n"; + } + + $modified ||= $orig ne $_; + $_; + } <$FILE>; + + if ($modified) { + open (my $OUT, ">", $file); + print $OUT @l; + close ($OUT); + } +} + +functionUtilkde::diffFile( "@ARGV" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.12.3/kf5/clean-includes.sh new/kde-dev-scripts-18.04.0/kf5/clean-includes.sh --- old/kde-dev-scripts-17.12.3/kf5/clean-includes.sh 2018-01-10 23:04:45.000000000 +0100 +++ new/kde-dev-scripts-18.04.0/kf5/clean-includes.sh 2018-03-13 03:44:55.000000000 +0100 @@ -94,6 +94,9 @@ 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'`; newname=`echo "$new" |perl -pi -e 's!.h!!'`; @@ -381,14 +384,14 @@ fi ;; QTest) - number=`egrep "QCOMPARE|QVERIFY" $file|wc -l`; + number=`egrep "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" $file|wc -l`; if test $number = 0 ; then remove_include; fi ;; QtTest) - number=`egrep "QCOMPARE|QVERIFY" $file|wc -l`; + number=`egrep "QCOMPARE|QVERIFY|QTEST_GUILESS_MAIN|QTEST" $file|wc -l`; if test $number = 0 ; then remove_include; fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.12.3/kf5/convert-qkdebug-to-qcdebug.sh new/kde-dev-scripts-18.04.0/kf5/convert-qkdebug-to-qcdebug.sh --- old/kde-dev-scripts-17.12.3/kf5/convert-qkdebug-to-qcdebug.sh 2018-01-10 23:04:45.000000000 +0100 +++ new/kde-dev-scripts-18.04.0/kf5/convert-qkdebug-to-qcdebug.sh 2018-03-13 03:44:55.000000000 +0100 @@ -33,12 +33,10 @@ find -iname "*.cpp" -o -iname "*.h" | xargs perl -pi -e "s/k_funcinfo/Q_FUNC_INFO/;" -echo "add ecm_qt_declare_logging_category(<file>_SRCS HEADER $debugnamefile.h IDENTIFIER $newcategoryname CATEGORY_NAME $newlogname) to CMakeLists.txt"; - # end -echo "1) Add $debugnamefile.cpp to CMakeLists.txt" +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" +echo "4) If you find bugs fix them please me" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.12.3/pim-build-deps-graphs.py new/kde-dev-scripts-18.04.0/pim-build-deps-graphs.py --- old/kde-dev-scripts-17.12.3/pim-build-deps-graphs.py 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-18.04.0/pim-build-deps-graphs.py 2018-03-13 03:44:55.000000000 +0100 @@ -0,0 +1,196 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- + +# Copyright (C) 2017 Sandro Knauß <[email protected]> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +"""Graph the dependencies of all pim packages. + +The dependencies are minimized, so that only direct dependencies are shown. +The green dots are packages without depdencies inside the set. +The lightblue dots are one end of the build chain. + +If you have something like this: + + a -> b -> c + a -> c +the second depdency is not shown. + +You can enable the full dependency if you replace sgraph -> graph in the last for loop. + +The tier graph shows you a tier based view to pim packages. +One tier is defined as a maximum set of packages, that do not depend on each other and only +depend on lower tiers. Only dependecies from one tier to the next one are shown. Ellipsed shape +packages without arrows are indicating, that they could be built in a higher tier. Diamond shape +indicate that nothing depends on this anymore. + +usage: +git clone kde:kde-build-metadata +<pathto>/pim-build-deps-graphs.py > pim-graphs.dot +dot -T png -o kde-build-metadata-17.12-deps.png pim-graphs.dot > kde-build-metadata-17.12-tier.png +""" + +from __future__ import print_function + +import re +import copy + +__fresh_id = 0 + +def main(): + def get_id(): + global __fresh_id + __fresh_id += 1 + return ("NODE_%d" % __fresh_id) + + def emit_arc(node1, node2): + print(' "%s" -> "%s" ;' % (node1, node2)) + def emit_node(node, dsc=None): + if dsc is None: + print(' "%s";' % (node)) + else: + print(' "%s" [label="%s"];' % (node, dsc)) + def emit_nodecolor(node, color): + print(' "%s" [fillcolor="%s", style="filled"] ;' % (node, color)) + + + line = re.compile(r"^([^#^:]+):\s*([^#]+)\s*(#.*)?$") + graph = {} + for i in open('kde-build-metadata/dependency-data-stable-kf5-qt5').readlines(): + if not i.strip(): + continue + m = line.match(i) + if not m: + continue + pkg = m.group(1).strip() + dep = m.group(2).strip() + if pkg == "kde/kdepim-runtime": + pkg = "kdepim-runtime" + elif pkg == "extragear/libs/libkgapi": + pkg = "libkgapi" + elif not pkg.startswith("kde/pim/"): + continue + else: + pkg = pkg[len("kde/pim/"):] + + if not pkg in graph: + graph[pkg] = set() + + if dep == "extragear/libs/libkgapi": + dep = "libkgapi" + elif not dep.startswith("kde/pim/"): + continue + else: + dep = dep[len("kde/pim/"):] + + if not dep in graph: + graph[dep] = set() + + graph[pkg].add(dep) + + sgraph = {} # minimized graph + fgraph = graph # full dependency graph + + for i in range(10): + changed = False + ograph = fgraph + for pkg in ograph: + deps = copy.copy(ograph[pkg]) + for dep in ograph[pkg]: + deps |= ograph[dep] + if deps != ograph[pkg]: + changed = True + fgraph[pkg] = deps + + if not changed: + break + + for pkg in fgraph: + deps = copy.copy(graph[pkg]) + for dep in graph[pkg]: + deps -= fgraph[dep] + sgraph[pkg] = deps + + pkgs = set(graph.keys()) # packages to order into tiers + tiers = [] # each tier will be one entry + deps = set() # All deps from lower tiers + + while pkgs: + tD = set() + if tiers: + deps |= tiers[-1] + tiers.append(set()) + for pkg in pkgs: + if not (sgraph[pkg] - deps): + tiers[-1].add(pkg) + tD.add(pkg) + pkgs -= tD + + ends = set() + + for pkg in graph: + name = pkg + sDeps = sgraph[pkg] + if sDeps: + for p in sgraph: + if p == pkg: + continue + if pkg in sgraph[p]: + break + else: + ends.add(name) + + print("digraph pim {") + for pkg in graph: + name = pkg + sDeps = sgraph[pkg] + if sDeps == set(): + emit_nodecolor(name, 'darkgreen') + else: + for p in sgraph: + if p == pkg: + continue + if pkg in sgraph[p]: + break + else: + emit_nodecolor(name, 'lightblue') + + for pkg in graph: + name = pkg + sDeps = sgraph[pkg] + for dep in sDeps: + emit_arc(dep, name) + print("}") + + print("digraph pimTier {") + print(" node [shape=diamond,fillcolor=lightblue,style=filled];") + for pkg in ends: # all end notes + emit_node(pkg) + print(" node [shape=ellipse,fillcolor=darkgreen];") + for pkg in tiers[0]: # all dependency free packages - aka tier 0 + emit_node(pkg) + print(" node [shape=ellipse,fillcolor=white];") + for index, tier in enumerate(tiers): + print(" subgraph cluster_{} {{".format(index)) + print(" style=filled;") + print(" color=lightgrey;") + print(' label = "Tier {}";'.format(index)) + for pkg in tier: + emit_node(pkg) + print(" }") + if index > 0: + subTier = tiers[index-1] + for pkg in tier: + for dep in (sgraph[pkg] & subTier): + emit_arc(dep, pkg) + print("}") + + + +if __name__ == '__main__': + main() + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.12.3/relicensecheck.pl new/kde-dev-scripts-18.04.0/relicensecheck.pl --- old/kde-dev-scripts-17.12.3/relicensecheck.pl 2018-01-10 23:04:45.000000000 +0100 +++ new/kde-dev-scripts-18.04.0/relicensecheck.pl 2018-03-13 03:44:55.000000000 +0100 @@ -30,10 +30,16 @@ ### For more information, see http://techbase.kde.org/Projects/KDE_Relicensing my %license_table = ( + 'cgerloff' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'flherne' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'huoni' => ['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' ], 'lueck' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'michelh' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'muhlenpfordt' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], + 'ngraham' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'notmart' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'rkflx' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], 'safaalfulaij' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV', 'CCBYSA4' ], @@ -311,7 +317,6 @@ 'jens' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'jlayt' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'johach' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], - 'kleag' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'krake' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'laidig' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'lunakl' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ],
