Hello community, here is the log from the commit of package kdesdk4-scripts for openSUSE:Factory checked in at 2013-08-16 13:46:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-30 16:00:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new/kdesdk4-scripts.changes 2013-08-16 13:46:55.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Aug 8 16:40:19 UTC 2013 - [email protected] + +- Update to 4.11.0 + * KDE 4.11 Final release + * See http://www.kde.org/announcements/4.11/ + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-4.10.97.tar.xz New: ---- kde-dev-scripts-4.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4-scripts.spec ++++++ --- /var/tmp/diff_new_pack.CmBn0O/_old 2013-08-16 13:46:55.000000000 +0200 +++ /var/tmp/diff_new_pack.CmBn0O/_new 2013-08-16 13:46:55.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE Url: http://www.kde.org/ -Version: 4.10.97 +Version: 4.11.0 Release: 0 Source0: %{rname}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kde-dev-scripts-4.10.97.tar.xz -> kde-dev-scripts-4.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-4.10.97/kf5/convert-kurl.pl new/kde-dev-scripts-4.11.0/kf5/convert-kurl.pl --- old/kde-dev-scripts-4.10.97/kf5/convert-kurl.pl 2013-07-10 01:41:25.000000000 +0200 +++ new/kde-dev-scripts-4.11.0/kf5/convert-kurl.pl 2013-08-06 14:49:47.000000000 +0200 @@ -1,7 +1,9 @@ #!/usr/bin/perl -w # David Faure <[email protected]> -# KUrl -> QUrl + QUrlPathInfo +# KUrl -> QUrl +# QUrlPathInfo -> QUrl +# (QUrlPathInfo was a temporary API in kdelibs-frameworks, before QUrl was extended in Qt 5.2) use strict; use File::Basename; @@ -10,13 +12,71 @@ foreach my $file (@ARGV) { - functionUtilkde::substInFile { - if (/(\w*)\.adjustPath\(\s*KUrl::RemoveTrailingSlash\s*\)/) { + my $infoVar; + my $urlVar; + + # 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 = $_; + + # kdelibs: QUrlPathInfo pathInfo(url); + if (/QUrlPathInfo (\w*)\(\s*([\.\-\>_\w]*)\s*\)/) { + # Record info->url association + $infoVar = $1; + $urlVar = $2; + #print STDERR "infoVar=$infoVar urlVar=$urlVar\n"; + } elsif (/^}/) { # end of method + undef $infoVar; + } + # kdelibs: pathInfo.adjustPath(QUrlPathInfo::StripTrailingSlash); + # => url = url.adjusted(QUrl::StripTrailingSlash); + if (defined $infoVar && /$infoVar\.adjustPath\(\s*QUrlPathInfo::StripTrailingSlash\s*\)/) { + s/$infoVar.adjustPath\(\s*QUrlPathInfo::StripTrailingSlash\s*\)/$urlVar = $urlVar\.adjusted(QUrl::StripTrailingSlash)/; + } + # kdelibs: QUrlPathInfo::adjustPath(url, QUrlPathInfo::StripTrailingSlash); + # => url = url.adjusted(QUrl::StripTrailingSlash); + s/QUrlPathInfo::adjustPath\(\s*(\w*)\s*,\s*QUrlPathInfo::StripTrailingSlash\s*\)/$1 = $1\.adjusted(QUrl::StripTrailingSlash)/; + # KDE4 code: url.adjustPath(KUrl::RemoveTrailingSlash); + # => url = url.adjusted(QUrl::StripTrailingSlash); + if (/(\w*).adjustPath\(\s*KUrl::RemoveTrailingSlash\s*\)/) { my $urlvar = $1; - s/$urlvar\./QUrlPathInfo::/; - s/adjustPath\(\s*KUrl::RemoveTrailingSlash\s*/adjustPath\($urlvar, QUrlPathInfo::StripTrailingSlash/; + s/adjustPath\(\s*KUrl::RemoveTrailingSlash\s*/$urlvar = $urlvar\.adjusted(QUrl::StripTrailingSlash)/; + } + + # kdelibs: QUrlPathInfo(url1).url(QUrlPathInfo::StripTrailingSlash); + s/QUrlPathInfo\(\s*([\.\-\>_\w]*)\s*\)\.url\(QUrlPathInfo::StripTrailingSlash\)/$1\.adjusted(QUrl::StripTrailingSlash)/g; + + # kdelibs: QUrlPathInfo(url).directory() + s/QUrlPathInfo\(\s*([\.\-\>_\w]*)\s*\)\.directory\(\)/$1\.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()/g; + # kdelibs: QUrlPathInfo(url).fileName() + s/QUrlPathInfo\(\s*([\.\-\>_\w]*)\s*\)\.fileName\(\)/$1\.fileName()/g; + # kdelibs: QUrlPathInfo(url).directoryUrl() -> url.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash) + s/QUrlPathInfo\(\s*([\.\-\>_\w]*)\s*\)\.directoryUrl\(\)/$1\.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash)/g; + + # pathInfo.fileName() + if (defined $infoVar && /$infoVar\.fileName\(\)/) { + s/$infoVar\.fileName\(\)/$urlVar\.fileName()/g; + } + # pathInfo.directory() + if (defined $infoVar && /$infoVar\.directory\(\)/) { + s/$infoVar\.directory\(\)/$urlVar\.adjusted(QUrl::RemoveFilename|QUrl::StripTrailingSlash).path()/g; } - } $file; + # pathInfo.localPath(QUrlPathInfo::StripTrailingSlash) + if (defined $infoVar && /$infoVar\.localPath\(QUrlPathInfo::StripTrailingSlash\)/) { + s/$infoVar\.localPath\(QUrlPathInfo::StripTrailingSlash\)/$urlVar\.adjusted(QUrl::StripTrailingSlash).toLocalFile()/g; + } + + $modified ||= $orig ne $_; + $_; + } <$FILE>; + + if ($modified) { + open (my $OUT, ">", $file); + print $OUT @l; + close ($OUT); + } } functionUtilkde::diffFile( "@ARGV" ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
