Hello community, here is the log from the commit of package kdesdk4-scripts for openSUSE:Factory checked in at 2016-08-31 00:07:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk4-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdesdk4-scripts" Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk4-scripts/kdesdk4-scripts.changes 2016-07-24 19:45:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new/kdesdk4-scripts.changes 2016-08-31 00:07:16.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:15:29 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:59:20 UTC 2016 - [email protected] + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-16.04.3.tar.xz New: ---- kde-dev-scripts-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4-scripts.spec ++++++ --- /var/tmp/diff_new_pack.U8cZmL/_old 2016-08-31 00:07:17.000000000 +0200 +++ /var/tmp/diff_new_pack.U8cZmL/_new 2016-08-31 00:07:17.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source0: %{rname}-%{version}.tar.xz Patch0: %{rname}-4.14.3-fix-bashisms.patch ++++++ kde-dev-scripts-16.04.3.tar.xz -> kde-dev-scripts-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/createtarball/config.ini new/kde-dev-scripts-16.08.0/createtarball/config.ini --- old/kde-dev-scripts-16.04.3/createtarball/config.ini 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/createtarball/config.ini 2016-07-14 00:37:47.000000000 +0200 @@ -62,9 +62,18 @@ kde_release = no remove = mailody.kdevelop makechangelog TODO +[libktorrent] +gitModule = yes +mainmodule = extragear +submodule = network +version = 2.0 +docs = no + [ktorrent] +gitModule = yes mainmodule = extragear submodule = network +version = 5.0 [kcoloredit] mainmodule = extragear @@ -376,3 +385,10 @@ translations= yes docs = yes custompo = libmuon,muon,muon-discover,muon-installer,muon-notifier,muon-updater + +[kronometer] +gitModule = yes +gitTag = v2.1.0 +mainmodule = extragear +submodule = utils +version = 2.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/createtarball/create_tarball.rb new/kde-dev-scripts-16.08.0/createtarball/create_tarball.rb --- old/kde-dev-scripts-16.04.3/createtarball/create_tarball.rb 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/createtarball/create_tarball.rb 2016-07-14 00:37:47.000000000 +0200 @@ -1,7 +1,9 @@ #!/usr/bin/ruby # -# Ruby script for generating amaroK tarball releases from KDE SVN +# Ruby script for generating tarball releases of KDE repositories (git or SVN). +# This script can create tarballs with source code, translations and documentation +# for the given KDE4-based project(s). For KF5-based projects, use create_tarball_kf5. # # (c) 2005 Mark Kretschmann <[email protected]> # (c) 2006-2008 Tom Albers <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/createtarball/create_tarball_kf5.rb new/kde-dev-scripts-16.08.0/createtarball/create_tarball_kf5.rb --- old/kde-dev-scripts-16.04.3/createtarball/create_tarball_kf5.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-16.08.0/createtarball/create_tarball_kf5.rb 2016-07-14 00:37:47.000000000 +0200 @@ -0,0 +1,481 @@ +#!/usr/bin/ruby + +# +# Ruby script for generating tarball releases of KDE repositories (git or SVN). +# This script can create tarballs with source code, translations and documentation +# for the given KF5-based project(s). For KDE4-based projects, use create_tarball. +# +# (c) 2005 Mark Kretschmann <[email protected]> +# (c) 2006-2008 Tom Albers <[email protected]> +# (c) 2007 Angelo Naselli <[email protected]> (command line parameters) +# Some parts of this code taken from cvs2dist +# License: GNU General Public License V2 + +require 'optparse' +require 'ostruct' +require 'find' +require 'fileutils' + +# check command line parameters +options = OpenStruct.new +options.help = false +options.https = false +options.ask = true +options.translations = true + +opts = OptionParser.new do |opts| + opts.on("-u", "--user USERNAME", "svn account") do |u| + options.username = u + end + opts.on("-w", "--https", "Using https instead of svn+ssh") do |w| + options.https = w + end + opts.on("-n", "--noaccount", "Using svn://anonsvn.kde.org/ instead of svn+ssh") do |n| + options.anonsvn = n + end + opts.on("-a", "--application APPL", "Application name (all for all, kde_release for apps that have kde_release=yes)") do |a| + options.application = a + options.ask = false + end + opts.on("-v", "--version VER", "Overwrite package version set in config.ini") do |v| + options.ver = v + end + opts.on_tail("-h", "--help", "Show this usage statement") do |h| + options.help = true + end + opts.on("-r", "--revision REV", "Use a specific revision of the repository") do |r| + options.rev = r + end + opts.on("-t", "--no-translations", "Don't include translations") do |t| + options.translations = false + end +end + +begin + opts.parse!(ARGV) +rescue Exception => e + puts e, "", opts + puts + exit +end + +if (options.username) + username = options.username + "@" +end + +if (options.application) + apps = Array.new + apps << options.application +end + +if (options.https) + if (username) + svnbase = "https://#{username}svn.kde.org/home/kde"; + else + puts opts + puts + puts "Username is mandatory with https" + exit + end +else + svnbase = "svn+ssh://#{username}svn.kde.org/home/kde" +end + +if (options.anonsvn) + if (options.https) + puts opts + puts + puts "https or anonsvn please, not both" + exit + end + svnbase = "svn://anonsvn.kde.org/home/kde" +end + +if (options.help) + puts opts + exit +end + +############# START ############# + +kde_version = `svn ls svn://anonsvn.kde.org/home/kde/tags/KDE | sort | tail -n1 | cut -d "/" -f1`.chomp + +#---------------------------------------------------------------- +# initiate. +#---------------------------------------------------------------- + +f = File.new("config.ini") +app = Array.new +begin + while (line = f.readline) + aline = line.chomp + if aline[0,1] == "[" + app << aline[1,(aline.length-2)] + end + end +rescue EOFError + f.close +end + +puts "Last KDE version found: " + kde_version +if (options.ask) + puts "Which apps (multiple sep by space, posibilities: all kde_release " + app.join(" ") + ")?" + apps = gets.split(" ") +end + +kde_release = false; +if apps[0] == "all" + apps = app +elsif apps[0] == "kde_release" + apps = app + kde_release = true; +end + +puts "-> Considering " + apps.join(" & ") +if kde_release + puts " -> Only applications which have kde_release = yes in config " +end +puts + +#---------------------------------------------------------------- +# retrieve apps. +#---------------------------------------------------------------- + +apps.each do |app| + puts + puts "-> Processing " + app + + found = false; + appdata = Hash.new + f = File.new("config.ini") + begin + while (line = f.readline) + aline = line.chomp + if aline == "[" + app + "]" + found = true; + elsif aline.length > 0 && found + data = aline.split("="); + temp = { data[0].strip => data[1].strip } + appdata = appdata.merge(temp) + else + found = false + end + end + rescue EOFError + f.close + end + + if (kde_release && appdata["kde_release"] != "yes") + puts " -> Skipping because kde_release is not set in the config.ini" + next + end + + if (options.ver) + temp = { "version" => options.ver } + appdata = appdata.merge(temp) + else + if !appdata["version"] + temp = { "version" => kde_version } + appdata = appdata.merge(temp) + else + if kde_release + temp = { "version" => appdata["version"] + "-kde" + kde_version } + appdata = appdata.merge(temp) + end + end + end + + if !appdata["name"] + temp = { "name" => app } + appdata = appdata.merge(temp) + end + + if appdata["folder"] + app = appdata["folder"] + end + + if !appdata["folder"] || appdata["name"] + temp = { "folder" => appdata["name"] + "-" + appdata["version"] } + else + temp = { "folder" => appdata["folder"] + "-" + appdata["version"] } + end + appdata = appdata.merge(temp) + + if appdata["addPo"] && appdata["addPo"].length > 0 + temp = { "addPo" => (appdata["addPo"]+" "+app).split(" ") } + else + temp = { "addPo" => [app] } + end + appdata = appdata.merge(temp) + + if appdata["addDocs"] && appdata["addDocs"].length > 0 + temp = { "addDocs" => (appdata["addDocs"]+" "+app).split(" ") } + else + temp = { "addDocs" => [app] } + end + appdata = appdata.merge(temp) + + tmpl10nmodule = appdata["l10nmodule"] + + if appdata["submodule"] && appdata["submodule"].length > 0 + if appdata["mainmodule"] == "extragear" || appdata["mainmodule"] == "playground" + temp = { "submodulepath" => appdata["submodule"] + "/", "l10nmodule" => appdata["mainmodule"] + "-" + appdata["submodule"] } + else + temp = { "submodulepath" => appdata["submodule"] + "/", "l10nmodule" => appdata["mainmodule"] } + end + else + temp = { "submodulepath" => "", "l10nmodule" => appdata["mainmodule"] } + end + appdata = appdata.merge(temp) + + # if l10nmodule is specified in the config file, then use it + if tmpl10nmodule + temp = { "l10nmodule" => tmpl10nmodule } + appdata = appdata.merge(temp) + end + + if !appdata["customlang"] + temp = { "customlang" => [] } + end + appdata = appdata.merge(temp) + + # Preparing + rev = "" + revString = "" + if (options.rev) + rev = "-r " + options.rev + revString = " Rev " + options.rev + end + + if appdata["gitModule"] + if !appdata["gitTag"] + temp = { "gitTag" => "HEAD" } + appdata = appdata.merge(temp) + end + puts "-> Fetching git://anongit.kde.org/" + app + ".git " + appdata["gitTag"] + " into " + appdata["folder"] + "..." + else + puts "-> Fetching " + appdata["mainmodule"] + "/" + appdata["submodulepath"] + app + revString + " into " + appdata["folder"] + "..." + end + # Remove old folder, if exists + `rm -rf #{appdata["folder"]} 2> /dev/null` + `rm -f #{appdata["folder"]}.tar.xz 2> /dev/null` + Dir.mkdir( appdata["folder"] ) + Dir.chdir( appdata["folder"] ) + + if appdata["mainmodule"][0,5] == "trunk" || appdata["mainmodule"][0,8] == "branches" + svnroot = "#{svnbase}/" + else + #trunk is assumed for all mainmodules that don't start with "trunk" or "branches" + svnroot = "#{svnbase}/trunk/" + end + + if !appdata["l10npath"] + temp = { "l10npath" => "." } + appdata = appdata.merge(temp) + end + + # Do the main checkouts. + if appdata["gitModule"] + `git archive --remote git://anongit.kde.org/#{app}.git #{appdata["gitTag"]} | tar -x` + else + if appdata["wholeModule"] + `svn co #{svnroot}/#{appdata["mainmodule"]}/#{appdata["submodulepath"]} #{rev} #{app}-tmp` + else + `svn co #{svnroot}/#{appdata["mainmodule"]}/#{appdata["submodulepath"]}#{app} #{rev} #{app}-tmp` + end + Dir.chdir( app + "-tmp" ) + + if appdata["docs"] != "no" + if !appdata["docpath"] + temp = { "docpath" => "doc/#{app}" } + appdata = appdata.merge(temp) + end + `svn co #{svnroot}/#{appdata["mainmodule"]}/#{appdata["submodulepath"]}/#{appdata["docpath"]} #{rev} doc` + end + + # Move them to the toplevel + `/bin/mv * ..` + Dir.chdir( ".." ) + + `find -name ".svn" | xargs rm -rf` + `rm -rf #{app}-tmp` + end + + # translations + if appdata["translations"] != "no" && options.translations + puts "-> Fetching l10n docs for #{appdata["submodulepath"]}#{app} #{revString}..." + + i18nlangs = `svn cat #{svnroot}/#{appdata["l10npath"]}/l10n-kf5/subdirs #{rev}`.split + i18nlangsCleaned = [] + for lang in i18nlangs + l = lang.chomp + if (l != "x-test") && (appdata["customlang"].empty? || appdata["customlang"].include?(l)) + i18nlangsCleaned += [l]; + end + end + i18nlangs = i18nlangsCleaned + + Dir.mkdir( "po" ) + + Dir.mkdir( "l10n" ) + Dir.chdir( "l10n" ) + + # docs + for lang in i18nlangs + lang.chomp! + + for dg in appdata["addDocs"] + dg.chomp! + `rm -rf #{dg}` + docdirname = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/docs/#{appdata["l10nmodule"]}/#{dg}" + if ( appdata["docs"] != "no" ) + puts " -> Checking if #{lang} has translated documentation...\n" + if dg.include? "/" + `svn co -q #{rev} #{svnroot}/#{docdirname} #{dg} > /dev/null 2>&1` + else + `svn co -q #{rev} #{svnroot}/#{docdirname} > /dev/null 2>&1` + end + end + next unless FileTest.exists?( dg + '/index.docbook' ) + + print " -> Copying #{lang}'s #{dg} documentation over... " + if dg.include? "/" + FileUtils.mkdir_p( "../po/#{lang}/docs/#{dg}" ) + `cp -R #{dg}/* ../po/#{lang}/docs/#{dg}` + else + FileUtils.mkdir_p( "../po/#{lang}/docs/#{dg}/" ) + `cp -R #{dg}/ ../po/#{lang}/docs` + end + + puts( "done.\n" ) + end + end + + # app translations + puts "-> Fetching l10n po for #{appdata["submodulepath"]}#{app}...\n" + + Dir.chdir( ".." ) # in submodule now + + $subdirs = false + + for lang in i18nlangs + lang.chomp! + dest = "po/#{lang}" + + for dg in appdata["addPo"] + dg.chomp! + if appdata["wholeModule"] + print " -> Copying #{lang}'s over ..\n" + pofolder = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/messages/#{appdata["l10nmodule"]}" + `svn co #{svnroot}/#{pofolder} #{dest}` + next if !FileTest.exist?( dest ) + + elsif appdata["custompo"] + valid = false + for sp in appdata["custompo"].split(/,/) + pofilename = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/messages/#{appdata["l10nmodule"]}/#{sp}.po" + `svn cat #{svnroot}/#{pofilename} #{rev} 2> /dev/null | tee l10n/#{sp}.po` + if not FileTest.size( "l10n/#{sp}.po" ) == 0 + valid=true + if !FileTest.exist?( dest ) + Dir.mkdir( dest ) + end + print "\n -> Copying #{lang}'s #{sp}.po over .. " + `mv l10n/#{sp}.po #{dest}` + end + end + next if not valid + else + pofilename = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/messages/#{appdata["l10nmodule"]}/#{dg}.po" + `svn cat #{svnroot}/#{pofilename} #{rev} 2> /dev/null | tee l10n/#{dg}.po` + next if FileTest.size( "l10n/#{dg}.po" ) == 0 + + if !FileTest.exist?( dest ) + Dir.mkdir( dest ) + end + + print " -> Copying #{lang}'s #{dg}.po over .. " + `mv l10n/#{dg}.po #{dest}` + puts( "done.\n" ) + end + end + end + + `rm -rf l10n` + + # add l10n to compilation. + `echo "find_package(KF5I18n CONFIG REQUIRED)" >> CMakeLists.txt` + `echo "ki18n_install(po)" >> CMakeLists.txt` + + if appdata["docs"] != "no" + # add docs to compilation. + `echo "find_package(KF5DocTools CONFIG REQUIRED)" >> CMakeLists.txt` + `echo "kdoctools_install(po)" >> CMakeLists.txt` + end + end + + datafolder = appdata["l10ndata"] + if datafolder + if !FileTest.exists?( "l10ndata_temp" ) + puts "-> Fetching l10n data from #{datafolder} #{revString}..." + + i18nlangs = `svn cat #{svnroot}/#{appdata["l10npath"]}/l10n-kf5/subdirs #{rev}`.split + i18nlangsCleaned = [] + for lang in i18nlangs + l = lang.chomp + if (l != "x-test") && (appdata["customlang"].empty? || appdata["customlang"].include?(l)) + i18nlangsCleaned += [l]; + end + end + i18nlangs = i18nlangsCleaned + + Dir.mkdir( "l10ndata" ) + topmakefile = File.new( "l10ndata/CMakeLists.txt", File::CREAT | File::RDWR | File::TRUNC ) + + # data + for lang in i18nlangs + lang.chomp! + + docdirname = "#{appdata["l10npath"]}/l10n-kf5/#{lang}/data/#{datafolder}" + puts " -> Checking if #{lang} has localized data...\n" + `rm -rf l10ndata_temp` + `svn co -q #{rev} #{svnroot}/#{docdirname} l10ndata_temp 2> /dev/null 2>&1` + next unless FileTest.exists?( 'l10ndata_temp/CMakeLists.txt' ) + + topmakefile << "add_subdirectory( #{lang} )\n" + + print " -> Copying #{lang}'s data over .. " + `mv l10ndata_temp l10ndata/#{lang}` + + puts( "done.\n" ) + end + topmakefile.close() + + # add data to compilation. + `echo "add_subdirectory( l10ndata )" >> CMakeLists.txt` + else + puts "l10ndata_temp folder exists in source, could not add l10ndata" + end + end + + # add doc generation to compilation + if (appdata["docs"] != "no") && (!appdata["gitModule"]) + `echo "add_subdirectory( doc )" >> CMakeLists.txt` + end + + # Remove cruft + `find -name ".svn" | xargs rm -rf` + if ( appdata["remove"] != "") + `/bin/rm -rf #{appdata["remove"]}` + end + + print "-> Compressing .. " + Dir.chdir( ".." ) # root folder + `tar -Jcf #{appdata["folder"]}.tar.xz --group=root --owner=root #{appdata["folder"]}` + #`rm -rf #{appdata["folder"]}` + puts " done." + puts "" + print "md5sum: ", `md5sum #{appdata["folder"]}.tar.xz` + print "sha256sum: ", `sha256sum #{appdata["folder"]}.tar.xz` +end + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/kf5/convert-kabc-to-kcontacts.pl new/kde-dev-scripts-16.08.0/kf5/convert-kabc-to-kcontacts.pl --- old/kde-dev-scripts-16.04.3/kf5/convert-kabc-to-kcontacts.pl 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/kf5/convert-kabc-to-kcontacts.pl 2016-07-14 00:37:47.000000000 +0200 @@ -3,11 +3,62 @@ # Aleix Pol Gonzalez <[email protected]> for FS in `find $PWD -name '*.cpp' -or -name '*.h'`; do - perl -p -i -e 's$#include <KABC/$#include <KContacts/$g' $FS - perl -p -i -e 's$#include <kabc/$#include <kcontacts/$g' $FS - perl -p -i -e 's$#include "kabc/$#include "kcontacts/$g' $FS - perl -p -i -e 's$KABC::$KContacts::$g' $FS - perl -p -i -e 's/namespace KABC/namespace KContacts/g' $FS + perl -p -i -e 's$#include <kabc/addressbook.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/addressbook.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/addresseedialog.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/addresseedialog.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/addresslineedit.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/addresslineedit.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/distributionlistdialog.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/distributionlistdialog.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/distributionlist.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/distributionlist.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/emailselectordialog.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/emailselectordialog.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/errorhandler.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/errorhandler.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/formatfactory.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/formatfactory.h>$$gi' $FS + + perl -p -i -e 's$#include <kabc/format.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/format.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/lock.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/lock.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/locknull.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/locknull.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/stdaddressbook.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/stdaddressbook.h>$$gi' $FS + + perl -p -i -e 's$#include <kabc/vcardformat.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/vcardformat.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/vcard.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/vcard.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/vcardline.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/vcardline.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/vcardparser.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/vcardparser.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/resource.h>$$gi' $FS + perl -p -i -e 's$#include "kabc/resource.h"$$gi' $FS + + perl -p -i -e 's$#include <kabc/$#include <kcontacts/$gi' $FS + perl -p -i -e 's$#include "kabc/$#include "kcontacts/$gi' $FS + + perl -p -i -e 's$KABC::$KContacts::$gi' $FS + perl -p -i -e 's/namespace KABC/namespace KContacts/gi' $FS done for FS in `find $PWD -name '*.cmake' -or -name 'CMakeLists.txt'`; do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/kf5/convert-kstandarddirs.pl new/kde-dev-scripts-16.08.0/kf5/convert-kstandarddirs.pl --- old/kde-dev-scripts-16.04.3/kf5/convert-kstandarddirs.pl 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/kf5/convert-kstandarddirs.pl 2016-07-14 00:37:47.000000000 +0200 @@ -191,7 +191,7 @@ if (`grep QStandardPaths $file | grep -v '#include'`) { functionUtilkde::addIncludeInFile($file, "QStandardPaths"); } - if (`grep KSharedConfig $file | grep -v '#include'`) { + if (`grep KSharedConfig $file | grep -v '#include'` and not `grep ksharedconfig\.h $file`) { functionUtilkde::addIncludeInFile($file, "KSharedConfig"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/kf5/convert-kurl.pl new/kde-dev-scripts-16.08.0/kf5/convert-kurl.pl --- old/kde-dev-scripts-16.04.3/kf5/convert-kurl.pl 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/kf5/convert-kurl.pl 2016-07-14 00:37:47.000000000 +0200 @@ -4,6 +4,11 @@ # KUrl -> QUrl # Usage: convert-kurl.pl *.h *.cpp +# VERY IMPORTANT: add add_definitions(-DQT_NO_URL_CAST_FROM_STRING) to your CMakeLists.txt, to catch +# passing a path to a QUrl via an implicit constructor (and port to QUrl(url) or QUrl::fromLocalFile(path)). + +# See https://community.kde.org/Frameworks/Porting_Notes#URL for more advice + use strict; use File::Basename; use lib dirname($0); @@ -134,15 +139,17 @@ my $url = $1; s/$url\.directory\(\)/$url\.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()/g; } + # url.url(KUrl::RemoveTrailingSlash) + if (/\.url\([KQ]Url::RemoveTrailingSlash\)/) { + s/\.url\([KQ]Url::RemoveTrailingSlash\)/\.adjusted(QUrl::StripTrailingSlash).toString()/g; + } # url.path(KUrl::RemoveTrailingSlash) - if (/(\w+)\.path\(KUrl::RemoveTrailingSlash\)/ && defined $urls{$1}) { - my $url = $1; - s/$url\.path\(KUrl::RemoveTrailingSlash\)/$url\.adjusted(QUrl::StripTrailingSlash).path()/g; + if (/\.path\(KUrl::RemoveTrailingSlash\)/) { + s/\.path\(KUrl::RemoveTrailingSlash\)/\.adjusted(QUrl::StripTrailingSlash).path()/g; } # url.toLocalFile(KUrl::RemoveTrailingSlash) - if (/(\w+)\.toLocalFile\(KUrl::RemoveTrailingSlash\)/ && defined $urls{$1}) { - my $url = $1; - s/$url\.toLocalFile\(KUrl::RemoveTrailingSlash\)/$url\.adjusted(QUrl::StripTrailingSlash).toLocalFile()/g; + if (/\.toLocalFile\(KUrl::RemoveTrailingSlash\)/) { + s/\.toLocalFile\(KUrl::RemoveTrailingSlash\)/\.adjusted(QUrl::StripTrailingSlash).toLocalFile()/g; } # url.adjustPath(KUrl::RemoveTrailingSlash) if (/(\w+)\.adjustPath\(KUrl::RemoveTrailingSlash\)/ && defined $urls{$1}) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-16.04.3/relicensecheck.pl new/kde-dev-scripts-16.08.0/relicensecheck.pl --- old/kde-dev-scripts-16.04.3/relicensecheck.pl 2016-05-31 00:30:55.000000000 +0200 +++ new/kde-dev-scripts-16.08.0/relicensecheck.pl 2016-07-14 00:37:47.000000000 +0200 @@ -65,6 +65,7 @@ 'chani' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'chehrlic' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'clee' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], + 'cmollekopf' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'coates' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'codrea' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'cordlandwehr' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], @@ -85,9 +86,11 @@ 'domi' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'djarvie' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'dyp' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], + 'dvratil' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'egorov' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'ehamberg' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'eliasp' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], + 'elvisangelaccio'=>['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'epignet' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'ereslibre' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'eros' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], @@ -180,6 +183,7 @@ 'nsams' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'ogoffart' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'pdamsten' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], + 'peifengyu' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'pgquiles' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'pino' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'pletourn' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], @@ -352,6 +356,7 @@ my %secondary_mail_addresses = ( '[email protected]' => 'apol', '[email protected]' => 'asensi', + '[email protected]' => 'peifengyu', '[email protected]' => 'schmidt-domine', '[email protected]' => 'schmidt-domine', '[email protected]' => 'alexmerry',
