Hello community, here is the log from the commit of package kdesdk4-scripts for openSUSE:Factory checked in at 2014-03-18 17:17:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-02-20 07:58:38.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new/kdesdk4-scripts.changes 2014-03-18 17:17:21.000000000 +0100 @@ -1,0 +2,14 @@ +Thu Mar 13 20:50:52 UTC 2014 - [email protected] + +- Update to 4.12.90 + * KDE 4.13 Beta 2 release + * See http://www.kde.org/announcements/announce-4.13-beta2.php + +------------------------------------------------------------------- +Fri Mar 7 11:35:23 UTC 2014 - [email protected] + +- Update to 4.12.80 + * KDE 4.13 Beta 1 release + * See http://www.kde.org/announcements/announce-4.13-beta1.php + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-4.12.2.tar.xz New: ---- kde-dev-scripts-4.12.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4-scripts.spec ++++++ --- /var/tmp/diff_new_pack.reI0D0/_old 2014-03-18 17:17:22.000000000 +0100 +++ /var/tmp/diff_new_pack.reI0D0/_new 2014-03-18 17:17:22.000000000 +0100 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 4.12.2 +Version: 4.12.90 Release: 0 Source0: %{rname}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kde-dev-scripts-4.12.2.tar.xz -> kde-dev-scripts-4.12.90.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/astyle-kdelibs new/kde-dev-scripts-4.12.90/astyle-kdelibs --- old/kde-dev-scripts-4.12.2/astyle-kdelibs 2014-01-22 12:56:36.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/astyle-kdelibs 2014-02-25 23:27:18.000000000 +0100 @@ -1,13 +1,105 @@ #!/bin/sh -# apply kdelibs 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 -# -# requirements: installed astyle +# Apply kdelibs 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 +# +# Requirements: +# - installed astyle, with patches below +# - $QT_NORMALIZE_TOOL pointing to qtrepotools/util/normalize/normalize (after compiling it) +# +# IMPORTANT: astyle misparses the Qt "keywords" like foreach and Q_FOREACH, which +# makes it style wrongly not just the space after the keyword, but also everything +# inside the parenthesis, leading to things like: +# Q_FOREACH(const QString & it, l) // note the space after the '&'. +# +# To fix this, patch astyle with http://www.davidfaure.fr/kde/astyle_qt.diff +# Mentionned upstream in https://sourceforge.net/p/astyle/bugs/154/ +# +# Another feature was implemented: removing spaces before ',' and ';'. +# Apply http://www.davidfaure.fr/kde/astyle_comma.diff +# This has been sent upstream in https://sourceforge.net/p/astyle/bugs/100/ +# +# Instructions for OpenSuSE users: +# zypper si astyle +# cd ~/rpmbuild/SOURCES ; wget http://www.davidfaure.fr/kde/astyle_qt.diff +# wget http://www.davidfaure.fr/kde/astyle_comma.diff +# cd ../SPECS ; wget http://www.davidfaure.fr/kde/astyle.spec.diff +# patch astyle.spec < astyle.spec.diff +# rpmbuild -ba astyle.spec +# sudo rpm -Uvh --force ~/rpmbuild/RPMS/x86_64/astyle-*.rpm -astyle --indent=spaces=4 --brackets=linux \ +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 + echo "Please export QT_NORMALIZE_TOOL=<qt5>/qtrepotools/util/normalize/normalize" + exit 1 +fi + +astyle -n -Q \ + --indent=spaces=4 --style=otbs \ --indent-labels --pad-oper --unpad-paren --pad-header \ - --keep-one-line-statements --convert-tabs \ + --keep-one-line-statements \ + --convert-tabs \ --indent-preprocessor \ - `find -type f -name '*.c' -or -name '*.cpp' -or -name '*.cc' -or -name '*.h'` + --align-pointer=name \ + $files + +# --max-code-length=100 is not used, on purpose. It's a hard limit, sometimes making things +# less readable than if the code is kept on a single line. 100 is just a recommendation +# in the coding style. + +# Watch out for things that lead to method implementations being parsed as if inside other methods, +# e.g. due to '{' inside #ifdef and #else and '}' outside. +grep '^\S* \S*::.*) {$' $files && echo "WARNING: check for wrong '{' placement in method definitions, in above grep results" + +# Remove old emacs mode-lines +perl -pi -e '$_ = "" if /c-basic-offset: [1-8]/' $files + +# Remove old kate mode-lines +perl -pi -e '$_ = "" if /kate: .*indent-width/ || /kate:.*tab-width/' $files + +# Remove old vim mode-lines +perl -pi -e '$_ = "" if /\/\/.* vim:/' $files +# They are often in a two-liner C comment, so we need a bit of perl magic to remove these +perl - $files <<EOF + foreach my \$file (@ARGV) { + open F, "+<", \$file or do { print STDERR "open(\$file) failed : \"\$!\"\n"; next }; + my \$str = join '', <F>; + if( \$str =~ m/vim:/ ) { + #print STDERR "Removing multi-line vim modeline from \$file\n"; + \$str =~ s!/\*\**\s*\**\s*vim:[^\n]*\n\s*\*/!!smg; + seek F, 0, 0; + print F \$str; + truncate F, tell(F); + } + close F; + } +EOF + +# Remove consecutive blank lines +perl - $files <<EOF + foreach my \$file (@ARGV) { + open F, "+<", \$file or do { print STDERR "open(\$file) failed : \"\$!\"\n"; next }; + my \$str = join '', <F>; + if (\$str =~ s/\s*\n\s*\n\s*\n\n*/\n\n/smg ) { + seek F, 0, 0; + print F \$str; + truncate F, tell(F); + } + close F; + } +EOF + +# Normalize signals/slots +$QT_NORMALIZE_TOOL --modify . + +# 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." + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/createtarball/config.ini new/kde-dev-scripts-4.12.90/createtarball/config.ini --- old/kde-dev-scripts-4.12.2/createtarball/config.ini 2014-01-22 12:56:36.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/createtarball/config.ini 2014-02-25 23:27:18.000000000 +0100 @@ -141,7 +141,7 @@ mainmodule = extragear submodule = graphics kde_release = no -version = 0.9 +version = 1.1 docs = yes [kio-gopher] @@ -303,13 +303,11 @@ [kdevelop] mainmodule = extragear submodule = sdk -version = 4.0.0 +version = 4.5.0rc1 kde_release = no -docs = no +docs = yes translations = yes -customlang = pt_BR,en_GB,ca,ca@valencia,zh_CN,zh_TW,da,et,fr,gl,de,it,nds,pt,es,sv,tr,uk -custompo = kdevqthelp,kdevcpp,kdevformatters,kdevelop,kdevcmakebuilder,kdevmakebuilder,kdevcmake,kdevcustommake,kdevgdb,desktop_extragear-sdk_kdevelop - +custompo = kdevcmake,kdevcmakebuilder,kdevcpp,kdevcustombuildsystem,kdevcustommake,kdevelop,kdevformatters,kdevgdb,kdevmakebuilder,kdevmanpage,kdevokteta,kdevqthelp,plasma_applet_kdevelopsessions,plasma_engine_kdevelopsessions,plasma_runner_kdevelopsessions [kdevplatform] mainmodule = extragear @@ -318,8 +316,7 @@ kde_release = no docs = no translations = yes -customlang = pt_BR,en_GB,ca,ca@valencia,zh_CN,zh_TW,da,et,fr,gl,de,it,nds,pt,es,sv,tr,uk -custompo = desktop_extragear-sdk_kdevplatform,kdevdocumentview,kdevcontextbrowser,kdevstandardoutputview,kdevgenericprojectmanager,kdevsnippet,kdevquickopen,kdevsubversion,kdevdocumentswitcher,kdevappwizard,kdevpatchreview,kdevprojectmanagerview,kdevfilemanager,kdevproblemreporter,kdevexecute,kdevkonsole,kdevcvs,kdevgrepview,kdevclassbrowser,kdevplatform +custompo = kdevappwizard,kdevclassbrowser,kdevcodeutils,kdevcontextbrowser,kdevcvs,kdevdocumentswitcher,kdevdocumentview,kdevexecute,kdevexecutescript,kdevexternalscript,kdevfilemanager,kdevgenericprojectmanager,kdevgit,kdevgrepview,kdevkonsole,kdevopenwith,kdevpastebin,kdevpatchreview,kdevplatform,kdevproblemreporter,kdevprojectdashboard,kdevprojectmanagerview,kdevquickopen,kdevreviewboard,kdevsnippet,kdevstandardoutputview,kdevsubversion,kdevswitchtobuddy,kdevvcsprojectintegration [kdevelop-pg-qt] mainmodule = playground @@ -351,7 +348,7 @@ gitModule = yes mainmodule = extragear-base submodule = base -version = 2.2 +version = 2.2.2 kde_release = no docs = no translations = yes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/doc/man-cvscheck.1.docbook new/kde-dev-scripts-4.12.90/doc/man-cvscheck.1.docbook --- old/kde-dev-scripts-4.12.2/doc/man-cvscheck.1.docbook 2014-01-22 12:56:36.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/doc/man-cvscheck.1.docbook 2014-02-25 23:27:18.000000000 +0100 @@ -122,7 +122,7 @@ <title>Authors</title> <para>cvscheck was written by &Dirk.Mueller; &Dirk.Mueller.mail; - and Sirtaj.Singh.Kang; &Sirtaj.Singh.Kang.mail;</para> + and &Sirtaj.Singh.Kang; &Sirtaj.Singh.Kang.mail;</para> <para>This manual page was prepared by <personname><firstname>Ben</firstname> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/fixkdeincludes new/kde-dev-scripts-4.12.90/fixkdeincludes --- old/kde-dev-scripts-4.12.2/fixkdeincludes 2014-01-22 12:56:36.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/fixkdeincludes 2014-02-25 23:27:18.000000000 +0100 @@ -122,6 +122,9 @@ 'kcolordlg.h' => "kcolordialog.h", 'kxmlgui.h' => "kxmlguifactory.h", 'kdebugclasses.h' => "kdebug.h", + +# Qt5/KF5 list + 'QtTest/QtTest' => "QtTest/QTest", # oops, don't include the full module, which includes all of QtCore ); @@ -131,20 +134,23 @@ sub find_fixable_sources ($) { # for now I grep the directory (requires srcdir==builddir) - # actually it should read the Makefile and - # find the _SOURCES / _OBJECTS tags that are put there by + # ideally it should read the CMakeLists.txt to find out the sources actually used my ( $dir ) = @_; opendir (DIR, "$dir") || die "Couldn't read '$dir'\n"; my @sources = grep { /^.*\.$cppExt$/o } readdir(DIR); closedir(DIR); - + + push @sources, "CMakeLists.txt" if ( -f "CMakeLists.txt" ); + print "found sources: [ " . join(' ', @sources) . " ] in $dir\n" if ($verbose); # prefix them with $dir my @retsources = (); foreach $source(@sources) { + # skip platform-specific sources. We assume unix, so we skip win and mac + next if ($source =~ /_mac.cpp/ || $source =~ /_win.cpp/); push @retsources, "$dir/$source"; } @@ -187,6 +193,13 @@ my $cpplevel = 0; $cpplevel = -1 if ($srcfile=~m/^.*\.$hExt$/); # plan for header-protection #ifndef/#define/#endif while (<SRC>) { + # support for removing libs from CMakeLists.txt + if ($srcfile =~ /CMakeLists.txt/ && !/add_library/) { + while (s/(KF5::\w+)//) { + push @includes, $1; + } + next; + } if ($_ =~ m/^\#if/) { $cpplevel = $cpplevel + 1; next; @@ -195,8 +208,9 @@ $cpplevel = $cpplevel - 1; next; } - #if ($cpplevel == 0 && $_ =~ m/^\#include\s*[\"<]([qk]\S*\.h)[\">]\S*/) { - if ($cpplevel == 0 && (($_ =~ m/^\#include\s*\"(\S+\.h)\"\S*/) || ($_ =~ m/^\#include\s*\<([qk]\S+)\>\S*/))) { + if ($cpplevel == 0 && $_ =~ m/^\#include\s*[\"<](.*)[\">]\S*/) { + # We only look for foo.h and q* and k* + #if ($cpplevel == 0 && (($_ =~ m/^\#include\s*\"(\S+\.h)\"\S*/) || ($_ =~ m/^\#include\s*\<([qk]\S+)\>\S*/))) { push @includes, $1; next; } @@ -252,7 +266,7 @@ my @revcontents = reverse @contents; @contents = (); - # we skip all inludes that are somehow ifdefed + # we skip all includes that are somehow ifdefed # note the logic is reversed because it operates # on reversed lines :) my $cpplevel = 0; @@ -270,7 +284,10 @@ next; } - if ($level && $cpplevel == 0 && + if ($srcfile =~ /CMakeLists.txt/ && $line !~ /add_library/) { + # Remove library, keep the rest of the line + $line =~ s/ $include//; + } elsif ($level && $cpplevel == 0 && (($line =~ m/^\#include\s*\"$include\"\S*/) || ($line =~ m/^\#include\s*\<$include\>\S*/))) { $level = $level - 1; # skipping the line.. @@ -304,7 +321,7 @@ my @revcontents = reverse @contents; @contents = (); - # we skip all inludes that are somehow ifdefed + # we skip all includes that are somehow ifdefed # note the logic is reversed because it operates # on reversed lines :) my $cpplevel = 0; @@ -360,6 +377,8 @@ { my $srcfile = shift @_; + return if ($srcfile =~ /CMakeLists.txt/); + my @includes = &find_removable_includes($srcfile); my %inclMap = (); @@ -473,6 +492,7 @@ chdir($srcdir); unlink $srcfile || warn "couldn't unlink $srcfile"; rename $localbackup, $srcfile || warn "couldn't rename $localbackup to $srcfile"; + system("touch $srcfile") if ($srcfile =~ /CMakeLists.txt/); exit(1); } @@ -512,35 +532,33 @@ print "Checking for initial compilation: "; chdir($builddir); my $objextension = "BUG"; - if($srcfile =~ /\.$hExt$/o) { - $output = `$makecmd all 2>&1`; + my $lastcommand = ""; + if($srcfile =~ /\.$hExt$/o || $srcfile =~ /CMakeLists.txt/) { + $lastcommand = "$makecmd all"; + $output = `$lastcommand 2>&1`; $objextension = "all" if ( 0 == ($? >> 8)); } else { - unlink "$blanksrc.lo"; - my $output = `$makecmd $blanksrc.lo 2>&1`; - $objextension = ".lo" if ( 0 == ($? >> 8)); - if($objextension eq "BUG") { - print "failed with .lo... "; - unlink "$blanksrc.o"; - $output = `$makecmd $blanksrc.o 2>&1`; - $objextension = ".o" if ( 0 == ($? >> 8)); - } - if($srcfile =~ /$hExt/) { - $output = `$makecmd $blanksrc.o 2>&1`; - $objextension = ".o" if ( 0 == ($? >> 8)); - } + unlink "$blanksrc.o"; + $lastcommand = "$makecmd $blanksrc.o"; + $output = `$lastcommand 2>&1`; + $objextension = ".o" if ( 0 == ($? >> 8)); } if($objextension eq "BUG") { warn "can't figure out right compile command for $srcfile :-(\n" . "??? unused, or didn't compile in the first place?\n" . + "Tried: $lastcommand, and got:\n" . "$output"; chdir($origdir); + warn "Aborting!\n"; exit 1; } print "worked with $objextension\n"; + my $initialwarnings = grep(/warning:/, $output); + print "got warnings: $initialwarnings\n" if ($verbose); + # now try to drop some includes foreach $include (@includes) { # kdatastream is special because @@ -611,8 +629,11 @@ my $retcode = ($? >> 8); #print "retcode=$retcode\n$output" if ($verbose); + my $warnings = grep(/warning:/, $output); + print "got warnings: $warnings\n" if ($verbose); + chdir($srcdir); - if($retcode == 0) { + if($retcode == 0 and $warnings == $initialwarnings) { # wow, it worked, lets continue! print "SUCCESS!\n"; $SIG{'INT'} = 'DEFAULT'; @@ -631,10 +652,15 @@ else { # better luck next time - print "FATALLY failed\n"; + if ($retcode == 0 and $warnings != $initialwarnings) { + print "FAILED, introduces " . ($warnings - $initialwarnings) . " new warnings\n"; + } else { + print "FATALLY failed\n"; + } } unlink $srcfile; rename $localbackup, $srcfile; + system("touch $srcfile") if ($srcfile =~ /CMakeLists.txt/); $SIG{'INT'} = 'DEFAULT'; $exp_failure = $exp_failure + 1; @@ -688,7 +714,8 @@ sub init_compat_includelist() { - open(L, "md5sum /usr/include/Qt{,3Support,Core,DBus,Gui,Network," . + # We identify identical headers by their md5sum + open(L, "md5sum /usr/include/Qt{3Support,Core,DBus,Gui,Network," . "OpenGL,Script,Sql,Svg,Test,Xml}/* | sort |") || return; my $oldsum = "<invalid>"; @@ -699,7 +726,7 @@ my ($sum, $fname) = ($1, $2); - $fname = $1 if ($fname =~ /\/(Qt.*)/); + $fname = $1 if ($fname =~ /\/(Qt.*)/); # remove /usr/include/, keep only QtFoo/Bar if ($oldsum eq $sum) { $compatmap{$fname} = $oldname; @@ -721,11 +748,11 @@ &init_compat_includelist(); -# warn about modified files -if($modify) { - `cvscheck | grep '^[MmC]'`; - print "WARNING: you have pending local changes. You might commit them by accident!\n\n" if($? >> 8 == 0); -} +# warn about modified files - TODO port to git diff --quiet, but the exit code seems broken +#if($modify) { +#`cvscheck | grep '^[MmC]'`; +#print "WARNING: you have pending local changes. You might commit them by accident!\n\n" if($? >> 8 == 0); +#} if($experimental) { print "WARNING: The experimental mode is indeed experimental.\n"; @@ -764,7 +791,7 @@ foreach $dir(@dirlist) { # check if this directory wants not to be fixed - if(open(M, "$dir/Makefile.am")) { + if(open(M, "$dir/CMakeLists.txt")) { my @mcontents = grep /(\-UQT_NO_COMPAT|\-UKDE_NO_COMPAT)/, <M>; close(M); if ( @mcontents ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/frameworks/split_out_frameworks.sh new/kde-dev-scripts-4.12.90/frameworks/split_out_frameworks.sh --- old/kde-dev-scripts-4.12.2/frameworks/split_out_frameworks.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/frameworks/split_out_frameworks.sh 2014-02-25 23:27:18.000000000 +0100 @@ -0,0 +1,75 @@ +#!/bin/sh + +# This script splits out all the frameworks from kdelibs into separate repositories +# and puts them into ../frameworks/. +# +# For each framework, first it creates an empty repository and it imports the +# current code, into the original subdirectory. For example, kconfig will be a +# repository containing a tier1/kconfig/ directory. Then, in a second commit, +# the code is moved to the root directory of the repository. +# +# Doing the move in two steps like this lets git follow the history better. +# When the old kdelibs history is grafted on the new repositories, the history +# will contain a commit that deletes everything except that framework, and then +# another commit moving the framework to the root. +# +# Finally, in a third commit, the code is reformatted using astyle. + +origproject=kdelibs +origbranch=frameworks +origsha1=`git rev-parse HEAD` + +if [ ! -d tier1 ]; then + "echo Run this script from the toplevel of the monolithic repository, there must be a tier1 subdirectory" + exit 1 +fi + +dest=../frameworks +mkdir -p $dest +here=$PWD + +for dir in tier1/* tier2/* tier3/* tier4/*; do + cd $here + if [ -f $dir ]; then + continue; + fi + frameworkname=`basename $dir` + frameworkdest=$dest/$frameworkname + rm -rf $frameworkdest + # eg. create ../frameworks/kjs/tier1 + mkdir -p $(dirname $frameworkdest/$dir) + # eg. copy tier1/kjs to ../frameworks/kjs/tier1/kjs + cp -a $dir $frameworkdest/$dir/ + cd $frameworkdest + +git init +git add . + +git commit -q -F - <<EOF + +Initial import from the monolithic $origproject. + +This is the beginning of revision history for this module. If you +want to look at revision history older than this, please refer to the +techbase wiki for how to use Git history grafting. At the time of +writing, this wiki is located here: + +http://community.kde.org/Frameworks/GitOldHistory + +If you have already performed the grafting and you don't see any +history beyond this commit, try running "git log" with the "--follow" +argument. + +Branched from the monolithic repo, $origproject $origbranch branch, at commit +$origsha1 + +EOF + +# eg. moves tier1/kconfig/* to . +git mv $dir/* . +git commit -q -m "Move $frameworkname code to the root directory." + +echo "$frameworkdest done." + +done + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/kdedoxygen.sh new/kde-dev-scripts-4.12.90/kdedoxygen.sh --- old/kde-dev-scripts-4.12.2/kdedoxygen.sh 2014-01-22 12:56:36.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/kdedoxygen.sh 2014-02-25 23:27:18.000000000 +0100 @@ -41,7 +41,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = KDE -PROJECT_NUMBER = 4.11 +PROJECT_NUMBER = 4.12 OUTPUT_DIRECTORY = apidocs CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/kf5/convert-kdebug.pl new/kde-dev-scripts-4.12.90/kf5/convert-kdebug.pl --- old/kde-dev-scripts-4.12.2/kf5/convert-kdebug.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/kf5/convert-kdebug.pl 2014-02-25 23:27:18.000000000 +0100 @@ -0,0 +1,44 @@ +#!/usr/bin/perl -w + +# David Faure <[email protected]> +# kDebug() -> qDebug() +# kWarning() -> qWarning() + +use strict; +use File::Basename; +use lib dirname($0); +use functionUtilkde; + +foreach my $file (@ARGV) { + + my $infoVar; + my $urlVar; + + my $modified; + open(my $FILE, "<", $file) or warn "We can't open file $file:$!\n"; + my @l = map { + my $orig = $_; + + s/kDebug\(\)/qDebug\(\)/; + s/kdDebug\(\)/qDebug\(\)/; + s/kWarning\(\)/qWarning\(\)/; + s/kdWarning\(\)/qWarning\(\)/; + s/kError\(\)/qCritical\(\)/; + s/kFatal\(\)/qFatal\(\)/; + s/k_funcinfo/Q_FUNC_INFO/; + s/kdebug\.h/qdebug\.h/; + + s/\<\< endl//; # old stuff + + $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-4.12.2/kf5/convert-kstandarddirs.pl new/kde-dev-scripts-4.12.90/kf5/convert-kstandarddirs.pl --- old/kde-dev-scripts-4.12.2/kf5/convert-kstandarddirs.pl 2014-01-22 12:56:36.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/kf5/convert-kstandarddirs.pl 2014-02-25 23:27:18.000000000 +0100 @@ -32,6 +32,26 @@ "autostart" => "autostart" ); +sub locationAndSubdir +{ + my ($resource, $fileName) = @_; + my $loc; + if (defined $easyResource{$resource}) { + $loc = $easyResource{$resource}; + } elsif (defined $otherResource{$resource}) { + $loc = "QStandardPaths::GenericDataLocation"; + $fileName = $fileName eq "QString()" ? "" : " + $fileName"; + $fileName = "QLatin1String(\"$otherResource{$resource}\/\")$fileName"; + } elsif (defined $xdgconfResource{$resource}) { + $loc = "QStandardPaths::ConfigLocation"; + $fileName = $fileName eq "QString()" ? "" : " + $fileName"; + $fileName = "QLatin1String(\"$xdgconfResource{$resource}\/\")$fileName"; + } else { + print STDERR "Unhandled resource $resource\n"; + } + return ($loc, $fileName); +} + foreach my $file (@ARGV) { my $addconfigprefix = 0; @@ -39,52 +59,44 @@ s/KGlobal::dirs\(\)->findResource\b/KStandardDirs::locate/; s/KGlobal::dirs\(\)->locate/KStandardDirs::locate/; s/KGlobal::dirs\(\)->findExe/KStandardDirs::findExe/; + s/KGlobal::dirs\(\)->localxdgdatadir\(\)/QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '\/'/; + s/KGlobal::dirs\(\)->localxdgconfdir\(\)/QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + '\/'/; s/KStandardDirs::locate\("exe", /KStandardDirs::findExe\(/; + if (/KStandardDirs::locateLocal\(\s*\"(.*)\",\s*(.*)\s*\)/) { - my $resource = $1; - my $fileName = $2; - my $loc; - if (defined $easyResource{$resource}) { - $loc = $easyResource{$resource}; - $fileName = "QLatin1Char('\/') + $fileName"; - } elsif (defined $otherResource{$resource}) { - $loc = "QStandardPaths::GenericDataLocation"; - $fileName = "QLatin1String(\"$otherResource{$resource}\/\") + $fileName"; - } elsif (defined $xdgconfResource{$resource}) { - $loc = "QStandardPaths::ConfigLocation"; - $fileName = "QLatin1String(\"$xdgconfResource{$resource}\/\") + $fileName"; - } else { - print STDERR "Unhandled resource $resource\n"; - } + my ($loc, $fileName) = locationAndSubdir($1, $2); if (defined $loc) { + # prepend a slash + if ($fileName =~ m/QLatin1String/) { + $fileName =~ s/QLatin1String\(\"/QLatin1String(\"\//; + } else { + $fileName = "QLatin1Char('\/') + " . $fileName; + } s/KStandardDirs::locateLocal\(.*\)/QStandardPaths::writableLocation($loc) + $fileName/; } } - if (/KStandardDirs::locate\(\s*\"(.*)\",\s*(.*)\s*\)/) { - my $resource = $1; - my $fileName = $2; - my $loc; - if (defined $easyResource{$resource}) { - $loc = $easyResource{$resource}; - } elsif (defined $otherResource{$resource}) { - $loc = "QStandardPaths::GenericDataLocation"; - $fileName = "QLatin1String(\"$otherResource{$resource}\/\") + $fileName"; - } elsif (defined $xdgconfResource{$resource}) { - $loc = "QStandardPaths::ConfigLocation"; - $fileName = "QLatin1String(\"$xdgconfResource{$resource}\/\") + $fileName"; - } else { - print STDERR "Unhandled resource $resource\n"; - } + if (/KStandardDirs::locate\(\s*\"(.*)\",\s*(.*)\s*\)/ || + /KGlobal::dirs\(\)->findAllResources\(\s*\"(.*)\",\s*(.*)\s*\)/) { + my ($loc, $fileName) = locationAndSubdir($1, $2); if (defined $loc) { # ends with a '/' (in a string literal) ? - print STDERR "fileName=$fileName\n"; + #print STDERR "fileName=$fileName\n"; + my ($search, $replace); + if (/KStandardDirs::locate/) { + $search = "KStandardDirs::locate"; + $replace = "QStandardPaths::locate"; + } elsif (/KGlobal::dirs\(\)->findAllResources/) { + $search = "KGlobal::dirs\(\)->findAllResources"; + $replace = "QStandardPaths::locateAll"; + } if ($fileName =~ s/\/\"$/\"/ || $fileName =~ s/\/\"\)$/\"\)/) { - s/KStandardDirs::locate\(.*\)/QStandardPaths::locate($loc, $fileName, QStandardPaths::LocateDirectory)/; + s/$search\(.*\)/$replace($loc, $fileName, QStandardPaths::LocateDirectory)/; } else { - s/KStandardDirs::locate\(.*\)/QStandardPaths::locate($loc, $fileName)/; + s/$search\(.*\)/$replace($loc, $fileName)/; } } } + if (/KStandardDirs::findExe\(\s*\"(.*)\"(,\s*[^\)]*)?\s*\)/ || /KStandardDirs::findExe\(\s*QLatin1String\s*\(\"(.*)\"\)(,\s*[^\)]*)?\s*\)/) { my $exe = $1; @@ -102,21 +114,11 @@ } } if (/KGlobal::dirs\(\)->saveLocation\(\s*\"([^\"]*)\"(,\s*[^\)]*)?\s*\)/) { - my $resource = $1; my $suffix = $2; + my ($loc, $add) = locationAndSubdir($1, ""); #print STDERR "resource=$resource suffix=$suffix\n"; - my $loc; - my $add = ""; - if (defined $easyResource{$resource}) { - $loc = $easyResource{$resource}; - } elsif (defined $otherResource{$resource}) { - $loc = "QStandardPaths::GenericDataLocation"; - $add = " + QLatin1String(\"$otherResource{$resource}\/\")"; - } elsif (defined $xdgconfResource{$resource}) { - $loc = "QStandardPaths::ConfigLocation"; - $add = " + QLatin1String(\"$xdgconfResource{$resource}\/\")"; - } else { - print STDERR "Unhandled resource $resource for saveLocation:\n$_\n"; + if ($add ne "") { + $add = " + $add"; } if ($suffix) { $suffix =~ s/,\s*//; @@ -126,33 +128,30 @@ s/KGlobal::dirs\(\)->saveLocation\(.*\)/QStandardPaths::writableLocation($loc)$add/ if ($loc); } if (/KGlobal::dirs\(\)->resourceDirs\(\s*\"([^\"]*)\"\s*\)/) { - my $resource = $1; - my $loc; - my $add; - if (defined $easyResource{$resource}) { - $loc = $easyResource{$resource}; - } elsif (defined $otherResource{$resource}) { - $loc = "QStandardPaths::GenericDataLocation"; - $add = "QLatin1String(\"$otherResource{$resource}\")"; - } elsif (defined $xdgconfResource{$resource}) { - $loc = "QStandardPaths::ConfigLocation"; - $add = "QLatin1String(\"$xdgconfResource{$resource}\")"; - } else { - print STDERR "Unhandled resource $resource for saveLocation:\n$_\n"; - } + my ($loc, $add) = locationAndSubdir($1, ""); if ($add) { s/KGlobal::dirs\(\)->resourceDirs\(.*\)/QStandardPaths::locateAll($loc, $add, QStandardPaths::LocateDirectory)/; } elsif ($loc) { s/KGlobal::dirs\(\)->resourceDirs\(.*\)/QStandardPaths::standardLocations($loc) \/* WARNING: no more trailing slashes *\//; } } + # While we're here... + s/KGlobal::config\(\)/KSharedConfig::openConfig()/g; + + # ex: KSharedConfig::openConfig("mimeapps.list", KConfig::NoGlobals, "xdgdata-apps"); + if (my ($file, $flags, $resource) = ($_ =~ m/KSharedConfig::openConfig\(\s*([^,]*), ([^,]*), \s*\"([^\"]*)\"\s*\)/)) { + my ($loc, $fileName) = locationAndSubdir($resource, $file); + if ($loc) { + s/KSharedConfig::openConfig\(.*\)/KSharedConfig::openConfig($fileName, $flags, $loc)/; + } + } } $file; functionUtilkde::addIncludeInFile($file, "config-prefix.h") if ($addconfigprefix); if (not `grep -i dirs $file | grep -v kstandarddirs\.h`) { functionUtilkde::removeIncludeInFile($file, "kstandarddirs.h"); } if (`grep QStandardPaths $file | grep -v '#include'`) { - functionUtilkde::addIncludeInFile($file, "qstandardpaths.h"); + functionUtilkde::addIncludeInFile($file, "QStandardPaths"); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/kf5/dnssd-to-kdnssd.sh new/kde-dev-scripts-4.12.90/kf5/dnssd-to-kdnssd.sh --- old/kde-dev-scripts-4.12.2/kf5/dnssd-to-kdnssd.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/kf5/dnssd-to-kdnssd.sh 2014-02-25 23:27:18.000000000 +0100 @@ -0,0 +1,3 @@ +#!/bin/sh + +sed -i -e 's/\<DNSSD::/KDNSSD::/g' -e 's/\(namespace\s\+\)DNSSD\>/\1KDNSSD/g' \{\} \; "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/kf5/install_forwarding_headers.pl new/kde-dev-scripts-4.12.90/kf5/install_forwarding_headers.pl --- old/kde-dev-scripts-4.12.2/kf5/install_forwarding_headers.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/kf5/install_forwarding_headers.pl 2014-02-25 23:27:18.000000000 +0100 @@ -0,0 +1,123 @@ +#!/usr/bin/perl -w + +# Modifies CMakeLists.txt in the current directory, to install forwarding headers +# using ecm_generate_headers() instead of a manual list of lowercase headers. +# +# Remember to adjust things manually when using namespaced headers: +# - add PREFIX to the ecm_generate_headers call +# - add that "/Prefix" to the directory in target_include_directories(... INTERFACE ...) +# - add that lowercase prefix to the install dir for lowercase headers + +use strict; +my %foundclasses = (); +my $name; +my $basename; +my $file = "CMakeLists.txt"; +my $tid_done; +my $in_install_files; +my $devel_done; +my $install_dir_done; +my $modified = 0; +open(my $FILE, "<", $file) || die; + +my @l = map { + my $orig = $_; + + if (!/ALIAS/ && /add_library\s*\(\s*(\w+)/) { + $name = $1; + $basename = $1 if ($name =~ m/^KF5(\w+)/); + } + if (/BASE_NAME (\w+)/) { + $basename = $1; + } + + if (/target_link_libraries/ && !defined $tid_done) { + $tid_done = 1; + die "didn't find a add_library line before target_link_libraries!" unless defined $name; + $_ = "target_include_directories($name INTERFACE \"\$<INSTALL_INTERFACE:\${INCLUDE_INSTALL_DIR}/$basename>\")\n\n$_"; + } + + if (/install.\s*FILES\s*$/ || defined $in_install_files) { + s/install\( FILES/install\(FILES/; + $in_install_files = 1; + if (/^\s*(\w+\/)?(\w+\.h)/ && !/export\.h/ && !/_p\.h/) { + my $origline = $_; + my $subdir = defined($1) ? $1 : ""; + my $header = $2; + $subdir =~ s,/$,,; + my $foundclass; + my $multipleclasses = ""; + my $path = $subdir eq "" ? $header : "$subdir/$header"; + open(F, "$path") || print STDERR "ERROR: $path not found\n"; + while (<F>) { + if (/^class .*(?:EXPORT|EXPORT_NOISE) \s*(\w+)/) { + if (lc($1).".h" eq lc($header)) { + $foundclass = $1; + } + $multipleclasses .= $1 . " "; + } + if (/^\s*namespace \s*(\w+)/ || /^typedef \w+ (\w+)/) { + if (lc($1).".h" eq lc($header)) { + $foundclass = $1; + $multipleclasses .= $foundclass . " "; + } + } + } + close(F); + if (defined $foundclass) { + $foundclasses{$subdir} = "" unless defined $foundclasses{$subdir}; + $foundclasses{$subdir} .= " " . $foundclass . "\n"; + #print STDERR "inserting into foundclasses{$subdir} : " . $foundclasses{$subdir} . "\n"; + $_ = ""; + } else { + $multipleclasses =~ s/ $//; # remove trailing slash + if ($multipleclasses =~ / /) { + print STDERR "WARNING: multiple exported classes found in $path: $multipleclasses\n"; + } else { + print STDERR "WARNING: No exported class or namespace found in $path, check for a template maybe?\n"; + } + $_ = $origline; + } + } + } + + if (/COMPONENT Devel/ && !defined $devel_done) { + $devel_done = 1; + undef $in_install_files; + die unless defined $basename; + $_ = " \${${basename}_HEADERS}\n" . $_; + s/\${INCLUDE_INSTALL_DIR} /\${INCLUDE_INSTALL_DIR}\/$basename /; + } + + if (defined $devel_done && /\)/) { + my $line = $_; + foreach my $subdir (keys %foundclasses) { + print STDERR "writing out classes for subdir '" . $subdir ."'\n"; + my $theclasses = $foundclasses{$subdir}; + $line .= "ecm_generate_headers(\n$theclasses\n"; + if ($subdir ne "") { + $line .= " RELATIVE $subdir\n"; + } + $line .= " MODULE_NAME $basename\n REQUIRED_HEADERS ${basename}_HEADERS\n)\n"; + } + $_ = $line; + %foundclasses = (); + } + + # happens earlier in the file, but must be last to avoid matching on "COMPONENT Devel" + if (/install.TARGETS/ && !defined $install_dir_done) { + $install_dir_done = 1; + $_ = "<move ecm_generate_headers calls here>\ninstall(DIRECTORY \${CMAKE_CURRENT_BINARY_DIR}/$basename DESTINATION \${INCLUDE_INSTALL_DIR} COMPONENT Devel)\n\n" . $_; + } + + $modified ||= $orig ne $_; + $_; +} <$FILE>; + +if ($modified) { + open (my $OUT, ">", $file); + print $OUT @l; + close ($OUT); +} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/qt4/remove-qt3-support.pl new/kde-dev-scripts-4.12.90/qt4/remove-qt3-support.pl --- old/kde-dev-scripts-4.12.2/qt4/remove-qt3-support.pl 2014-01-22 12:56:36.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/qt4/remove-qt3-support.pl 2014-02-25 23:27:18.000000000 +0100 @@ -103,7 +103,7 @@ s!rootDirPath!rootPath!; s!cleanDirPath!cleanPath!; s!absFilePath!absoluteFilePath!; - s!QDir::All!QDir::TypeMask!; + s!\bQDir::All\b!QDir::TypeMask!; s!QDir::DefaultFilter!QDir::NoFilter!; s!QDir::DefaultSort!QDir::NoSort!; s!simplifyWhiteSpace!simplified!g; @@ -126,8 +126,8 @@ s!Q_UINT64!quint64!g; s!Q_LLONG!qint64!g; s!Q_ULLONG!quint64!g; - s!QMAX!qMax!g; - s!QMIN!qMin!g; + s!\bQMAX\b!qMax!g; + s!\bQMIN\b!qMin!g; s!Qt::ScaleMin!Qt::KeepAspectRatio!g; s!Qt::ScaleMax!Qt::KeepAspectRatioByExpanding!g; s!Qt::ScaleFree!Qt::IgnoreAspectRatio!g; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.12.2/relicensecheck.pl new/kde-dev-scripts-4.12.90/relicensecheck.pl --- old/kde-dev-scripts-4.12.2/relicensecheck.pl 2014-01-22 12:56:36.000000000 +0100 +++ new/kde-dev-scripts-4.12.90/relicensecheck.pl 2014-02-25 23:27:18.000000000 +0100 @@ -30,6 +30,7 @@ 'aacid' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'abryant' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'adawit' => ['gplv23', 'lgplv23', '+eV' ], + 'alexmerry' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'alund' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'amth' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'aseigo' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], @@ -77,6 +78,7 @@ 'kloecker' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'kossebau' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'kylafas' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], + 'lueck' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'mbritton' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'michaelhowell'=> ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'mirko' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], @@ -99,12 +101,14 @@ 'robbilla' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'rpreukschas'=> ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'sanders' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], + 'sars' => ['gplv23', 'lgplv23', '+eV' ], 'sping' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'taj' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'tenharmsel'=> ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'teske' => ['gplv23', 'lgplv23', ], 'tfry' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'tmcguire' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], + 'turbov' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'uga' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+', '+eV' ], 'vkrause' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'waba' => ['gplv23', 'lgplv23', '+eV' ], @@ -121,7 +125,6 @@ ### to the above part of the table so that we don't ask them again. 'adridg' => ['gplv23', 'lgplv23' ], 'ahartmetz' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], - 'alexmerry' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'amantia' => ['gplv23', 'lgplv23' ], 'annma' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], 'apaku' => ['gplv23', 'lgplv23', 'gplv2+', 'lgplv2+' ], -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
