commit kdesdk4-scripts for openSUSE:Factory

28 Aug 2017

Hello community,

here is the log from the commit of package kdesdk4-scripts for openSUSE:Factory checked in at 2017-08-28 15:06:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdesdk4-scripts (Old)
 and      /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kdesdk4-scripts"

Mon Aug 28 15:06:24 2017 rev:54 rq:516351 version:17.08.0

Changes:
--------

--- /work/SRC/openSUSE:Factory/kdesdk4-scripts/kdesdk4-scripts.changes	2017-07-29 08:56:42.372680832 +0200
+++ /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new/kdesdk4-scripts.changes	2017-08-28 15:06:45.484531575 +0200
@@ -1,0 +2,25 @@
+Fri Aug 11 22:45:22 UTC 2017 - christophe@krop.fr
+
+- Update to KDE Applications 17.08.0
+  * New feature release
+  * https://www.kde.org/announcements/announce-applications-17.08.0.php
+- Changes since 17.04.3 :
+  * Release Simon from the correct branch 
+  * Add translated docs to kio-gdrive 
+  * package proper translations 
+  * 	config for kirigami2 
+  * cmakelint.pl - fix a regex 
+  * Bump Krusader version 
+  * Fix downloading docs for Krusader twice 
+  * convert to modern method 
+  * Update to modern method 
+
+-------------------------------------------------------------------
+Sat Aug  5 18:17:24 UTC 2017 - christophe@krop.fr
+
+- Update to KDE Applications 17.07.90
+  * KDE Applications 17.07.90
+  * https://www.kde.org/announcements/announce-applications-17.07.90.php
+
+
+-------------------------------------------------------------------

Old:
----
  kde-dev-scripts-17.04.3.tar.xz

New:
----
  kde-dev-scripts-17.08.0.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdesdk4-scripts.spec ++++++
--- /var/tmp/diff_new_pack.Sv8C4P/_old	2017-08-28 15:06:46.388404434 +0200
+++ /var/tmp/diff_new_pack.Sv8C4P/_new	2017-08-28 15:06:46.392403871 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package kdesdk4-scripts
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,15 +19,15 @@
 %define rname kde-dev-scripts
 
 Name:           kdesdk4-scripts
-Version:	    17.04.3
+Version:        17.08.0
 Release:        0
 %define kf5_version 5.26.0
-# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
+# 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}')}
 Summary:        Scripts for KDE Development
 License:        GPL-2.0 and GFDL-1.2
 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:  libkde4-devel

++++++ kde-dev-scripts-17.04.3.tar.xz -> kde-dev-scripts-17.08.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/cmakelint.pl new/kde-dev-scripts-17.08.0/cmakelint.pl
--- old/kde-dev-scripts-17.04.3/cmakelint.pl	2017-05-25 19:42:05.000000000 +0200
+++ new/kde-dev-scripts-17.08.0/cmakelint.pl	2017-08-10 17:44:14.000000000 +0200
@@ -2,7 +2,7 @@
 
 ###############################################################################
 # Sanity checks CMakeLists.txt files.                                         #
-# Copyright (C) 2006-2012 by Allen Winter <winter@kde.org>                    #
+# Copyright (C) 2006-2012,2017 by Allen Winter <winter@kde.org>               #
 # Copyright (C) 2008-2010 by Laurent Montel <montel@kde.org>                  #
 #                                                                             #
 # This program is free software; you can redistribute it and/or modify        #
@@ -34,7 +34,7 @@
 use Cwd 'abs_path';
 
 my($Prog) = 'cmakelint.pl';
-my($Version) = '1.30';
+my($Version) = '1.31';
 
 my($help) = '';
 my($version) = '';
@@ -170,7 +170,7 @@
                           'replace "{$" with "${", or garbage detected');
 
     $issues += &checkLine($line,$linecnt,
-                          '[[^:print:]]\{\$',
+                          '[^[:print:]]\{\$',
                           'non-printable characters detected');
 
     $issues += &checkLine($line,$linecnt,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/createtarball/config.ini new/kde-dev-scripts-17.08.0/createtarball/config.ini
--- old/kde-dev-scripts-17.04.3/createtarball/config.ini	2017-05-25 19:42:05.000000000 +0200
+++ new/kde-dev-scripts-17.08.0/createtarball/config.ini	2017-08-10 17:44:14.000000000 +0200
@@ -190,9 +190,8 @@
 addPo        = krusader
 kde_release  = no
 translations = yes
-version      = 2.5.0
+version      = 2.6.0
 docs         = yes
-addDocs      = krusader
 
 [krecipes]
 mainmodule = extragear
@@ -421,14 +420,15 @@
 submodule   = utils
 version     = 2.1.3
 
-[kirigami]
+[kirigami2]
+folder      = kirigami
 gitModule   = yes
-gitTag      = v1.0.0
+gitTag      = v2.1.0
 mainmodule  = extragear
 submodule   = libs
-version     = 1.0.0
+version     = 2.1.1
 translations= yes
-custompo    = libkirigamiplugin_qt
+custompo    = libkirigami2plugin_qt,kirigami
 
 [krita]
 gitModule   = yes
@@ -442,19 +442,21 @@
 
 [kio-gdrive]
 gitModule   = yes
-gitTag      = v1.1.0
+gitTag      = v1.1.2
 mainmodule  = extragear
 submodule   = network
-version     = 1.1.0
-docs        = no
+version     = 1.1.2
+docs        = yes
 custompo    = kio5_gdrive
+addDocs     = kioslave5/gdrive
 
 [simon]
 gitModule    = yes
 mainmodule   = extragear-kde4
 l10nmodule   = extragear-accessibility
 submodule    = accessibility
+gitTag       = 0.5
 kde_release  = no
 docs         = yes
 translations = yes
-version      = 0.4.80
+version      = 0.4.90
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/kde.supp new/kde-dev-scripts-17.08.0/kde.supp
--- old/kde-dev-scripts-17.04.3/kde.supp	2017-05-25 19:42:05.000000000 +0200
+++ new/kde-dev-scripts-17.08.0/kde.supp	2017-08-10 17:44:14.000000000 +0200
@@ -233,21 +233,38 @@
    fun:_ZN6QMutex4lockEv
 }
 {
-   # Qt5 in release mode doesn't see the atomic-operation calls inside QMutex
-   Qt5_release_lockInternal
+   # Qt5: helgrind doesn't understand the atomic-operation calls inside QMutex
+   Qt5_lockInternal
    Helgrind:Race
+   ...
    fun:_ZN11QBasicMutex12lockInternalEv
 }
 {
-   # Qt5 in release mode doesn't see the atomic-operation calls inside QMutex
-   Qt5_release_unlockInternal
+   # Qt5: helgrind doesn't understand the atomic-operation calls inside QMutex
+   Qt5_unlockInternal
    Helgrind:Race
+   ...
    fun:_ZN11QBasicMutex14unlockInternalEv
 }
 {
-   # Qt5 in release mode doesn't see the atomic-operation calls inside RefCount
+   # Qt5: helgrind doesn't understand the atomic-operation calls inside QMutex
+   Qt5_QMutex_unlock
+   Helgrind:Race
+   ...
+   fun:_ZN6QMutex6unlockEv
+}
+{
+   # Qt5: helgrind doesn't understand the atomic-operation calls inside QMutex
+   Qt5_QMutex_lock
+   Helgrind:Race
+   ...
+   fun:_ZN6QMutex4lockEv
+}
+{
+   # Qt5: helgrind doesn't understand the atomic-operation calls
    Qt5_release_refcount
    Helgrind:Race
+   ...
    fun:_ZN9QtPrivate8RefCount3refEv
 }
 {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/kf5/adapt_cmakelists_file.pl new/kde-dev-scripts-17.08.0/kf5/adapt_cmakelists_file.pl
--- old/kde-dev-scripts-17.04.3/kf5/adapt_cmakelists_file.pl	2017-05-25 19:42:05.000000000 +0200
+++ new/kde-dev-scripts-17.08.0/kf5/adapt_cmakelists_file.pl	2017-08-10 17:44:14.000000000 +0200
@@ -16,11 +16,11 @@
      $modified = 1;
   }
   if (/KDE4_INCLUDE_DIR/) {
-     $_ =~ s/\${KDE4_INCLUDE_DIR}//;
+     $_ =~ s/\$\{KDE4_INCLUDE_DIR\}//;
      $modified = 1;
   }
   if (/QT_INCLUDES/ ) {
-     $_ =~ s/\${QT_INCLUDES}//;
+     $_ =~ s/\$\{QT_INCLUDES\}//;
      $modified = 1;
   }
   if (/kde4_install_icons/i) {
@@ -72,124 +72,124 @@
       $modified = 1;
   }
   if (/KDE4_KCALCORE_LIBS/) {
-     $_ =~ s/\${KDE4_KCALCORE_LIBS}/KF5::CalendarCore/;
+     $_ =~ s/\$\{KDE4_KCALCORE_LIBS\}/KF5::CalendarCore/;
      $modified = 1;
   }
   if (/KDE4_KMIME_LIBRARY/) {
-     $_ =~ s/\${KDE4_KMIME_LIBRARY}/KF5::Mime/;
+     $_ =~ s/\$\{KDE4_KMIME_LIBRARY\}/KF5::Mime/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_AKONADI_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_AKONADI_LIBS}/KF5::AkonadiCore/;
+     $_ =~ s/\$\{KDEPIMLIBS_AKONADI_LIBS\}/KF5::AkonadiCore/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KCALCORE_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KCALCORE_LIBS}/KF5::CalendarCore/;
+     $_ =~ s/\$\{KDEPIMLIBS_KCALCORE_LIBS\}/KF5::CalendarCore/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KPIMUTILS_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KPIMUTILS_LIBS}//;
+     $_ =~ s/\$\{KDEPIMLIBS_KPIMUTILS_LIBS\}//;
      $modified = 1;
   }
   if (/KDEPIMLIBS_MAILTRANSPORT_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_MAILTRANSPORT_LIBS}/KF5::MailTransport/;
+     $_ =~ s/\$\{KDEPIMLIBS_MAILTRANSPORT_LIBS\}/KF5::MailTransport/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KMIME_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KMIME_LIBS}/KF5::Mime/;
+     $_ =~ s/\$\{KDEPIMLIBS_KMIME_LIBS\}/KF5::Mime/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KPIMIDENTITIES_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KPIMIDENTITIES_LIBS}/KF5::PimIdentities/;
+     $_ =~ s/\$\{KDEPIMLIBS_KPIMIDENTITIES_LIBS\}/KF5::PimIdentities/;
      $modified = 1;
   }
   if (/KDE4_KIO_LIBS/) {
-     $_ =~ s/\${KDE4_KIO_LIBS}/KF5::KIOCore/;
+     $_ =~ s/\$\{KDE4_KIO_LIBS\}/KF5::KIOCore/;
      $modified = 1;
   }
   if (/KDE4_KROSSCORE_LIBS/) {
-     $_ =~ s/\${KDE4_KROSSCORE_LIBS}/KF5::KrossCore/;
+     $_ =~ s/\$\{KDE4_KROSSCORE_LIBS\}/KF5::KrossCore/;
      $modified = 1;
   }
   if (/QT_QTDBUS_LIBRARY/) {
-     $_ =~ s/\${QT_QTDBUS_LIBRARY}/Qt5::DBus/;
+     $_ =~ s/\$\{QT_QTDBUS_LIBRARY\}/Qt5::DBus/;
      $modified = 1;
   }
   if (/QT_QTXML_LIBRARY/) {
-     $_ =~ s/\${QT_QTXML_LIBRARY}/Qt5::Xml/;
+     $_ =~ s/\$\{QT_QTXML_LIBRARY\}/Qt5::Xml/;
      $modified = 1;
   }
   if (/QT_QTXML_LIBRARIES/) {
-     $_ =~ s/\${QT_QTXML_LIBRARIES}/Qt5::Xml/;
+     $_ =~ s/\$\{QT_QTXML_LIBRARIES\}/Qt5::Xml/;
      $modified = 1;
   }
   if (/QT_QTCORE_LIBRARY/) {
-     $_ =~ s/\${QT_QTCORE_LIBRARY}/Qt5::Core/;
+     $_ =~ s/\$\{QT_QTCORE_LIBRARY\}/Qt5::Core/;
      $modified = 1;
   }
   if (/QT_QTCORE_LIBRARIES/) {
-     $_ =~ s/\${QT_QTCORE_LIBRARIES}/Qt5::Core/;
+     $_ =~ s/\$\{QT_QTCORE_LIBRARIES\}/Qt5::Core/;
      $modified = 1;
   }
   if (/QT_QTGUI_LIBRARY/) {
-     $_ =~ s/\${QT_QTGUI_LIBRARY}/Qt5::Gui/;
+     $_ =~ s/\$\{QT_QTGUI_LIBRARY\}/Qt5::Gui/;
      $modified = 1;
   }
   if (/QT_QTGUI_LIBRARIES/) {
-     $_ =~ s/\${QT_QTGUI_LIBRARIES}/Qt5::Gui/;
+     $_ =~ s/\$\{QT_QTGUI_LIBRARIES\}/Qt5::Gui/;
      $modified = 1;
   }
   if (/QT_QTHELP_LIBRARIES/) {
-     $_ =~ s/\${QT_QTHELP_LIBRARIES}/Qt5::Help/;
+     $_ =~ s/\$\{QT_QTHELP_LIBRARIES\}/Qt5::Help/;
      $modified = 1;
   }
   if (/QT_QTNETWORK_LIBRARY/) {
-     $_ =~ s/\${QT_QTNETWORK_LIBRARY}/Qt5::Network/;
+     $_ =~ s/\$\{QT_QTNETWORK_LIBRARY\}/Qt5::Network/;
      $modified = 1;
   }
   if (/QT_QTSCRIPT_LIBRARY/) {
-     $_ =~ s/\${QT_QTSCRIPT_LIBRARY}/Qt5::Script/;
+     $_ =~ s/\$\{QT_QTSCRIPT_LIBRARY\}/Qt5::Script/;
      $modified = 1;
   }
   if (/KDE4_KDECORE_LIBS/) {
-     $_ =~ s/\${KDE4_KDECORE_LIBS}/KF5::KDELibs4Support/;
+     $_ =~ s/\$\{KDE4_KDECORE_LIBS}/KF5::KDELibs4Support/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KIMAP_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KIMAP_LIBS}/KF5::IMAP/;
+     $_ =~ s/\$\{KDEPIMLIBS_KIMAP_LIBS}/KF5::IMAP/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_AKONADI_KMIME_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_AKONADI_KMIME_LIBS}/KF5::AkonadiMime/;
+     $_ =~ s/\$\{KDEPIMLIBS_AKONADI_KMIME_LIBS}/KF5::AkonadiMime/;
      $modified = 1;
   }
   if (/KDE4_KNOTIFYCONFIG_LIBS/) {
-     $_ =~ s/\${KDE4_KNOTIFYCONFIG_LIBS}/KF5::NotifyConfig/;
+     $_ =~ s/\$\{KDE4_KNOTIFYCONFIG_LIBS}/KF5::NotifyConfig/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KPIMTEXTEDIT_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KPIMTEXTEDIT_LIBS}/KF5::PimTextEdit/;
+     $_ =~ s/\$\{KDEPIMLIBS_KPIMTEXTEDIT_LIBS}/KF5::PimTextEdit/;
      $modified = 1;
   }
   if (/KDE4_KDEWEBKIT_LIBRARY/) {
-     $_ =~ s/\${KDE4_KDEWEBKIT_LIBRARY}/KF5::WebKit/;
+     $_ =~ s/\$\{KDE4_KDEWEBKIT_LIBRARY}/KF5::WebKit/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KMBOX_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KMBOX_LIBS}/KF5::Mbox/;
+     $_ =~ s/\$\{KDEPIMLIBS_KMBOX_LIBS}/KF5::Mbox/;
      $modified = 1;
   }
   if (/QT_QTUITOOLS_LIBRARY/) {
-     $_ =~ s/\${QT_QTUITOOLS_LIBRARY}/Qt5::UiTools/;
+     $_ =~ s/\$\{QT_QTUITOOLS_LIBRARY\}/Qt5::UiTools/;
      $modified = 1;
 
   }
   if (/KDEPIMLIBS_KALARMCAL_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KALARMCAL_LIBS}/KF5::AlarmCalendar/;
+     $_ =~ s/\$\{KDEPIMLIBS_KALARMCAL_LIBS}/KF5::AlarmCalendar/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KABC_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KABC_LIBS}/KF5::Contacts/;
+     $_ =~ s/\$\{KDEPIMLIBS_KABC_LIBS}/KF5::Contacts/;
      $modified = 1;
   }
   if (/KF5::Abc/) {
@@ -198,67 +198,67 @@
   }
 
   if (/KDEPIMLIBS_AKONADI_CONTACT_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_AKONADI_CONTACT_LIBS}/KF5::AkonadiContact/;
+     $_ =~ s/\$\{KDEPIMLIBS_AKONADI_CONTACT_LIBS}/KF5::AkonadiContact/;
      $modified = 1;
   }
   if (/KDE4_KDEUI_LIBS/) {
-     $_ =~ s/\${KDE4_KDEUI_LIBS}//;
+     $_ =~ s/\$\{KDE4_KDEUI_LIBS}//;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KTNEF_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KTNEF_LIBS}/KF5::KTnef/;
+     $_ =~ s/\$\{KDEPIMLIBS_KTNEF_LIBS}/KF5::KTnef/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KBLOG_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KBLOG_LIBS}/KF5::Blog/;
+     $_ =~ s/\$\{KDEPIMLIBS_KBLOG_LIBS}/KF5::Blog/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_AKONADI_KABC_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_AKONADI_KABC_LIBS}/KF5::AkonadiAbc/;
+     $_ =~ s/\$\{KDEPIMLIBS_AKONADI_KABC_LIBS}/KF5::AkonadiAbc/;
      $modified = 1;
   }
   if (/KDE4_KNEWSTUFF3_LIBS/) {
-     $_ =~ s/\${KDE4_KNEWSTUFF3_LIBS}/KF5::NewStuff/;
+     $_ =~ s/\$\{KDE4_KNEWSTUFF3_LIBS}/KF5::NewStuff/;
      $modified = 1;
   }
   if (/KDE4_KNEWSTUFF3_LIBRARY/) {
-     $_ =~ s/\${KDE4_KNEWSTUFF3_LIBRARY}/KF5::NewStuff/;
+     $_ =~ s/\$\{KDE4_KNEWSTUFF3_LIBRARY}/KF5::NewStuff/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KLDAP_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KLDAP_LIBS}/KF5::KLdap/;
+     $_ =~ s/\$\{KDEPIMLIBS_KLDAP_LIBS}/KF5::KLdap/;
      $modified = 1;
   }
   if (/BALOO_LIBRARIES/) {
-     $_ =~ s/\${BALOO_LIBRARIES}/Baloo/;
+     $_ =~ s/\$\{BALOO_LIBRARIES}/Baloo/;
      $modified = 1;
   }
   if (/KDE4_KCMUTILS_LIBS/) {
-     $_ =~ s/\${KDE4_KCMUTILS_LIBS}/KF5::KCMUtils/;
+     $_ =~ s/\$\{KDE4_KCMUTILS_LIBS}/KF5::KCMUtils/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KCALUTILS_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KCALUTILS_LIBS}/KF5::CalendarUtils/;
+     $_ =~ s/\$\{KDEPIMLIBS_KCALUTILS_LIBS}/KF5::CalendarUtils/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KHOLIDAYS_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KHOLIDAYS_LIBS}/KF5::Holidays/;
+     $_ =~ s/\$\{KDEPIMLIBS_KHOLIDAYS_LIBS}/KF5::Holidays/;
      $modified = 1;
   }
   if (/KDE4_KUTILS_LIBS/) {
-     $_ =~ s/\${KDE4_KUTILS_LIBS}//;
+     $_ =~ s/\$\{KDE4_KUTILS_LIBS}//;
      $modified = 1;
   }
   if (/KDE4_KDECORE_LIBRARY/) {
-     $_ =~ s/\${KDE4_KDECORE_LIBRARY}//;
+     $_ =~ s/\$\{KDE4_KDECORE_LIBRARY}//;
      $modified = 1;
   }
   if (/KDE4_KDEUI_LIBRARY/) {
-     $_ =~ s/\${KDE4_KDEUI_LIBRARY}//;
+     $_ =~ s/\$\{KDE4_KDEUI_LIBRARY}//;
      $modified = 1;
   }
   if (/KDE4_KTEXTEDITOR_LIBS/) {
-     $_ =~ s/\${KDE4_KTEXTEDITOR_LIBS}/KF5::TextEditor/;
+     $_ =~ s/\$\{KDE4_KTEXTEDITOR_LIBS}/KF5::TextEditor/;
      $modified = 1;
   }
   if (/qt4_wrap_cpp/i) {
@@ -266,50 +266,50 @@
      $modified = 1;
   }
   if (/KDEPIMLIBS_SYNDICATION_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_SYNDICATION_LIBS}/KF5::Syndication/;
+     $_ =~ s/\$\{KDEPIMLIBS_SYNDICATION_LIBS}/KF5::Syndication/;
      $modified = 1;
   }
   if (/KDE4_KHTML_LIBS/) {
-     $_ =~ s/\${KDE4_KHTML_LIBS}/KF5::KHtml/;
+     $_ =~ s/\$\{KDE4_KHTML_LIBS}/KF5::KHtml/;
      $modified = 1;
   }
   if (/KDEPIMLIBS_KONTACTINTERFACE_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_KONTACTINTERFACE_LIBS}/KF5::KontactInterface/;
+     $_ =~ s/\$\{KDEPIMLIBS_KONTACTINTERFACE_LIBS}/KF5::KontactInterface/;
      $modified = 1;
   }
   if (/KDE4_KNOTIFYCONFIG_LIBRARY/) {
-     $_ =~ s/\${KDE4_KNOTIFYCONFIG_LIBRARY}/KF5::NotifyConfig/;
+     $_ =~ s/\$\{KDE4_KNOTIFYCONFIG_LIBRARY}/KF5::NotifyConfig/;
      $modified = 1;
   }
   if (/QT_QTDECLARATIVE_LIBRARY/) {
-     $_ =~ s/\${QT_QTDECLARATIVE_LIBRARY}/Qt5::Declarative/;
+     $_ =~ s/\$\{QT_QTDECLARATIVE_LIBRARY\}/Qt5::Declarative/;
      $modified = 1;
   }
   if (/QT_QTDECLARATIVE_LIBRARIES/) {
-     $_ =~ s/\${QT_QTDECLARATIVE_LIBRARIES}/Qt5::Declarative/;
+     $_ =~ s/\$\{QT_QTDECLARATIVE_LIBRARIES\}/Qt5::Declarative/;
      $modified = 1;
   }
 
   if (/KDE4_KPARTS_LIBS/) {
-     $_ =~ s/\${KDE4_KPARTS_LIBS}/KF5::Parts/;
+     $_ =~ s/\$\{KDE4_KPARTS_LIBS}/KF5::Parts/;
      $modified = 1;
   }
   if (/KDE4_KPARTS_LIBRARY/) {
-     $_ =~ s/\${KDE4_KPARTS_LIBRARY}/KF5::Parts/;
+     $_ =~ s/\$\{KDE4_KPARTS_LIBRARY}/KF5::Parts/;
      $modified = 1;
   }
 
   if (/KDE4_PHONON_LIBS/) {
-     $_ =~ s/\${KDE4_PHONON_LIBS}/Phonon::phonon4qt5/;
+     $_ =~ s/\$\{KDE4_PHONON_LIBS}/Phonon::phonon4qt5/;
      $modified = 1;
   }
   if (/KDE4_PHONON_LIBRARY/) {
-     $_ =~ s/\${KDE4_PHONON_LIBRARY}/Phonon::phonon4qt5/;
+     $_ =~ s/\$\{KDE4_PHONON_LIBRARY}/Phonon::phonon4qt5/;
      $modified = 1;
   }
 
   if (/QT_QTTEST_LIBRARY/) {
-     $_ =~ s/\${QT_QTTEST_LIBRARY}/Qt5::Test/;
+     $_ =~ s/\$\{QT_QTTEST_LIBRARY\}/Qt5::Test/;
      $modified = 1;
   }
 
@@ -322,104 +322,104 @@
      $modified = 1;
   }
   if (/KDEPIMLIBS_MICROBLOG_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_MICROBLOG_LIBS}/KF5::MicroBlog/;
+     $_ =~ s/\$\{KDEPIMLIBS_MICROBLOG_LIBS}/KF5::MicroBlog/;
      $modified = 1;
   }
   if (/KDE4_SOLID_LIBS/) {
-     $_ =~ s/\${KDE4_SOLID_LIBS}//;
+     $_ =~ s/\$\{KDE4_SOLID_LIBS}//;
      $modified = 1;     
   }
   if (/QT_QTWEBKIT_LIBRARY/) {
-     $_ =~ s/\${QT_QTWEBKIT_LIBRARY}/Qt5::WebKitWidgets/;
+     $_ =~ s/\$\{QT_QTWEBKIT_LIBRARY\}/Qt5::WebKitWidgets/;
      $modified = 1;
   }
   if (/QT_QTSQL_LIBRARY/) {
-     $_ =~ s/\${QT_QTSQL_LIBRARY}/Qt5::Sql/;
+     $_ =~ s/\$\{QT_QTSQL_LIBRARY\}/Qt5::Sql/;
      $modified = 1;
   }
   if (/KDE4_KFILE_LIBS/) {
-     $_ =~ s/\${KDE4_KFILE_LIBS}//;
+     $_ =~ s/\$\{KDE4_KFILE_LIBS}//;
      $modified = 1;
   }
   if (/KDEPIMLIBS_AKONADI_NOTES_LIBS/) {
-     $_ =~ s/\${KDEPIMLIBS_AKONADI_NOTES_LIBS}/KF5::AkonadiNotes/;
+     $_ =~ s/\$\{KDEPIMLIBS_AKONADI_NOTES_LIBS}/KF5::AkonadiNotes/;
      $modified = 1;
   }
   if (/KDE4_KIO_LIBRARY/) {
-     $_ =~ s/\${KDE4_KIO_LIBRARY}/KF5::KIOCore/;
+     $_ =~ s/\$\{KDE4_KIO_LIBRARY}/KF5::KIOCore/;
      $modified = 1;
   }
  
   if (/KDEVPLATFORM_INTERFACES_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_INTERFACES_LIBRARIES}/KDev::Interfaces/;
+     $_ =~ s/\$\{KDEVPLATFORM_INTERFACES_LIBRARIES}/KDev::Interfaces/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_SHELL_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_SHELL_LIBRARIES}/KDev::Shell/;
+     $_ =~ s/\$\{KDEVPLATFORM_SHELL_LIBRARIES}/KDev::Shell/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_LANGUAGE_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_LANGUAGE_LIBRARIES}/KDev::Language/;
+     $_ =~ s/\$\{KDEVPLATFORM_LANGUAGE_LIBRARIES}/KDev::Language/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_UTIL_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_UTIL_LIBRARIES}/KDev::Util/;
+     $_ =~ s/\$\{KDEVPLATFORM_UTIL_LIBRARIES}/KDev::Util/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_PROJECT_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_PROJECT_LIBRARIES}/KDev::Project/;
+     $_ =~ s/\$\{KDEVPLATFORM_PROJECT_LIBRARIES}/KDev::Project/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_OUTPUTVIEW_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_OUTPUTVIEW_LIBRARIES}/KDev::OutputView/;
+     $_ =~ s/\$\{KDEVPLATFORM_OUTPUTVIEW_LIBRARIES}/KDev::OutputView/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_VCS_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_VCS_LIBRARIES}/KDev::Vcs/;
+     $_ =~ s/\$\{KDEVPLATFORM_VCS_LIBRARIES}/KDev::Vcs/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_TESTS_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_TESTS_LIBRARIES}/KDev::Tests/;
+     $_ =~ s/\$\{KDEVPLATFORM_TESTS_LIBRARIES}/KDev::Tests/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_JSONTESTS_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_JSONTESTS_LIBRARIES}/KDev::JsonTests/;
+     $_ =~ s/\$\{KDEVPLATFORM_JSONTESTS_LIBRARIES}/KDev::JsonTests/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_DOCUMENTATION_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_DOCUMENTATION_LIBRARIES}/KDev::Documentation/;
+     $_ =~ s/\$\{KDEVPLATFORM_DOCUMENTATION_LIBRARIES}/KDev::Documentation/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_DEBUGGER_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_DEBUGGER_LIBRARIES}/KDev::Debugger/;
+     $_ =~ s/\$\{KDEVPLATFORM_DEBUGGER_LIBRARIES}/KDev::Debugger/;
      $modified = 1;
   }
   if (/KDEVPLATFORM_SUBLIME_LIBRARIES/) {
-     $_ =~ s/\${KDEVPLATFORM_SUBLIME_LIBRARIES}/KDev::Sublime/;
+     $_ =~ s/\$\{KDEVPLATFORM_SUBLIME_LIBRARIES}/KDev::Sublime/;
      $modified = 1;
   }
   if (/KDE4_THREADWEAVER_LIBRARIES/) {
-     $_ =~ s/\${KDE4_THREADWEAVER_LIBRARIES}/KF5::ThreadWeaver/;
+     $_ =~ s/\$\{KDE4_THREADWEAVER_LIBRARIES}/KF5::ThreadWeaver/;
      $modified = 1;
   }
   if (/QT_AND_KDECORE_LIBS/) {
-     $_ =~ s/\${QT_AND_KDECORE_LIBS}//;
+     $_ =~ s/\$\{QT_AND_KDECORE_LIBS}//;
      $modified = 1;
   }
   if (/KIPI_LIBRARIES/) {
-     $_ =~ s/\${KIPI_LIBRARIES}/KF5::Kipi/;
+     $_ =~ s/\$\{KIPI_LIBRARIES}/KF5::Kipi/;
      $modified = 1;
   }
   if (/KEXIV2_LIBRARIES/) {
-     $_ =~ s/\${KEXIV2_LIBRARIES}/KF5::KExiv2/;
+     $_ =~ s/\$\{KEXIV2_LIBRARIES}/KF5::KExiv2/;
      $modified = 1;     
   }
   if (/KDCRAW_LIBRARIES/) {
-     $_ =~ s/\${KDCRAW_LIBRARIES}/KF5::KDcraw/;
+     $_ =~ s/\$\{KDCRAW_LIBRARIES}/KF5::KDcraw/;
      $modified = 1;
   }
   if (/KSANE_LIBRARY/) {
-     $_ =~ s/\${KSANE_LIBRARY}/KF5::Sane/;
+     $_ =~ s/\$\{KSANE_LIBRARY}/KF5::Sane/;
      $modified = 1;
   }
   if (/kdegamesprivate/) {
@@ -427,7 +427,7 @@
      $modified = 1;
   }
   if (/KDECLARATIVE_LIBRARIES/) {
-     $_ =~ s/\${KDECLARATIVE_LIBRARIES}/KF5::Declarative/;
+     $_ =~ s/\$\{KDECLARATIVE_LIBRARIES}/KF5::Declarative/;
      $modified = 1;
   }
   if (/kdegames/) {
@@ -435,11 +435,11 @@
      $modified = 1;
   }
   if (/LIBKONQ_LIBRARY/) {
-     $_ =~ s/\${LIBKONQ_LIBRARY}/KF5::Konq/;
+     $_ =~ s/\$\{LIBKONQ_LIBRARY}/KF5::Konq/;
      $modified = 1;
   }
   if (/QT_QTOPENGL_LIBRARY/) {
-     $_ =~ s/\${QT_QTOPENGL_LIBRARY}/Qt5::OpenGL/;
+     $_ =~ s/\$\{QT_QTOPENGL_LIBRARY\}/Qt5::OpenGL/;
      $modified = 1;
   }
   #if (/macro_optional_add_subdirectory/) {
@@ -476,11 +476,11 @@
      $modified = 1;
   }
   if (/KDE4_INCLUDES/) {
-     $_ =~ s/\${KDE4_INCLUDES}//;
+     $_ =~ s/\$\{KDE4_INCLUDES}//;
      $modified = 1;
   }
   if (/KDE4_KDNSSD_LIBS/) {
-     $_ =~ s/\${KDE4_KDNSSD_LIBS}/KF5::DNSSD/;
+     $_ =~ s/\$\{KDE4_KDNSSD_LIBS}/KF5::DNSSD/;
      $modified = 1;
   }
 
@@ -489,7 +489,7 @@
      $modified = 1;
   }
   if (/QT_QTSVG_LIBRARY/) {
-     $_ =~ s/\${QT_QTSVG_LIBRARY}/Qt5::Svg/;
+     $_ =~ s/\$\{QT_QTSVG_LIBRARY\}/Qt5::Svg/;
      $modified = 1;
   }
   if (/KF5::KDE4Support/) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/kf5/convert-kdebug-with-argument.sh new/kde-dev-scripts-17.08.0/kf5/convert-kdebug-with-argument.sh
--- old/kde-dev-scripts-17.04.3/kf5/convert-kdebug-with-argument.sh	2017-05-25 19:42:05.000000000 +0200
+++ new/kde-dev-scripts-17.08.0/kf5/convert-kdebug-with-argument.sh	2017-08-10 17:44:14.000000000 +0200
@@ -14,62 +14,6 @@
 
 upname=`echo $debugnamefile | tr 'a-z' 'A-Z'`
 
-# create debug.h file
-cat > $debugnamefile.h <<EOF
-/*  This file is part of the KDE project
-    Copyright (C) 2015 Laurent Montel <montel@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ${upname}_H
-#define ${upname}_H
-
-#include <QLoggingCategory>
-Q_DECLARE_LOGGING_CATEGORY($newcategoryname)
-
-#endif
-EOF
-
-
-#create debug.cpp file
-cat > $debugnamefile.cpp <<EOF
-/*  This file is part of the KDE project
-    Copyright (C) 2015 Laurent Montel <montel@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#include "$debugnamefile.h"
-Q_LOGGING_CATEGORY($newcategoryname, "$newlogname")
-EOF
-
 #convert debug to new qCDebug/qCWarning/qCCritical
 
 find -iname "*.cpp" -o -iname "*.h" | xargs sed -ri \
@@ -77,12 +21,10 @@
 		-e "s,k(Debug|Warning)\s*\(\s*$oldcategorynumber\s*\),qC\1\($newcategoryname\)," \
 		-e "s,k(Fatal|Error)\s*\(\s*$oldcategorynumber\s*\),qCCritical\($newcategoryname\),"
 
-git add $debugnamefile.cpp $debugnamefile.h
-
 
 # end
-echo "1) Add $debugnamefile.cpp to CMakeLists.txt"
-echo "2) Add #include <QDebug> + #include \"${debugnamefile}.h\" to each file which was changed and where it is missing"
+echo "1) add ecm_qt_declare_logging_category(<file>_SRCS HEADER $debugnamefile.h IDENTIFIER $newcategoryname CATEGORY_NAME $newlogname) to CMakeLists.txt";
+echo "2) #include \"${debugnamefile}.h\" to each file which was changed and where it is missing"
 echo "3) Verify that it compiles :)"
 echo "4) If you find bugs fix them please"
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/kf5/convert-qkdebug-to-qcdebug.sh new/kde-dev-scripts-17.08.0/kf5/convert-qkdebug-to-qcdebug.sh
--- old/kde-dev-scripts-17.04.3/kf5/convert-qkdebug-to-qcdebug.sh	2017-05-25 19:42:05.000000000 +0200
+++ new/kde-dev-scripts-17.08.0/kf5/convert-qkdebug-to-qcdebug.sh	2017-08-10 17:44:14.000000000 +0200
@@ -2,8 +2,8 @@
 
 if test $# != 3; then
   echo "Usage : $0 <new log name> <new category name> <debug name file>"
-  echo "example : convert-qdebug-to-qcdebug.sh log_smtp SMTP_LOG smtp_debug"
-  exit 1
+  echo "example : convert-qdebug-to-qcdebug.sh org.kde.smtp SMTP_LOG smtp_debug"
+  exit 0
 fi
 
 
@@ -13,65 +13,6 @@
 
 upname=`echo $debugnamefile | tr 'a-z' 'A-Z'`
 
-# create debug.h file
-cat > $debugnamefile.h <<EOF
-/*  This file is part of the KDE project
-    Copyright (C) 2015 Laurent Montel <montel@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ${upname}_H
-#define ${upname}_H
-
-#include <QLoggingCategory>
-Q_DECLARE_LOGGING_CATEGORY($newcategoryname)
-
-#endif
-
-EOF
-
-
-#create debug.cpp file
-cat > $debugnamefile.cpp <<EOF
-/*  This file is part of the KDE project
-    Copyright (C) 2015 Laurent Montel <montel@kde.org>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#include "$debugnamefile.h"
-Q_LOGGING_CATEGORY($newcategoryname, "$newlogname")
-
-
-EOF
-
 #convert debug to new qCDebug/qCWarning/qCCritical
 
 find -iname "*.cpp" -o -iname "*.h" | xargs perl -pi -e "s,qDebug\s*\(\s*\),qCDebug\($newcategoryname\),"
@@ -92,13 +33,12 @@
 
 find -iname "*.cpp" -o -iname "*.h" | xargs perl -pi -e "s/k_funcinfo/Q_FUNC_INFO/;"
 
-git add $debugnamefile.cpp $debugnamefile.h
+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 "2) Add #include <QDebug> + #include \"$debugnamefile.h\" to each file which was changed"
-echo "3) Adjust name / email in $debugnamefile.cpp and $debugnamefile.h"
-echo "4) Verify that it compiles :)"
-echo "5) If you find bugs fix them please"
+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"

    

root＠hilbert.suse.de

tags

participants (1)