rev 20365 - in kde-extras/kvpnc/trunk/debian: . patches

[Pino Toscano]

Author: pino
Date: 2016-02-14 09:26:04 +0000 (Sun, 14 Feb 2016)
New Revision: 20365

Added:
   kde-extras/kvpnc/trunk/debian/patches/r1452682.diff
   kde-extras/kvpnc/trunk/debian/patches/r1452683.diff
Modified:
   kde-extras/kvpnc/trunk/debian/changelog
   kde-extras/kvpnc/trunk/debian/patches/series
Log:
fix build with GCC 6 (#811679)

backport upstream r1452682 and r1452683


Modified: kde-extras/kvpnc/trunk/debian/changelog
===================================================================
--- kde-extras/kvpnc/trunk/debian/changelog	2016-02-14 09:23:29 UTC (rev 20364)
+++ kde-extras/kvpnc/trunk/debian/changelog	2016-02-14 09:26:04 UTC (rev 20365)
@@ -2,6 +2,8 @@
 
   [ Pino Toscano ]
   * Bump Standards-Version to 3.9.7, no changes required.
+  * Backport upstream r1452682 and r1452683 to fix build with GCC 6; patches
+    r1452682.diff and r1452683.diff. (Closes: #811679)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 14 Feb 2016 10:22:07 +0100
 

Added: kde-extras/kvpnc/trunk/debian/patches/r1452682.diff
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/r1452682.diff	                        (rev 0)
+++ kde-extras/kvpnc/trunk/debian/patches/r1452682.diff	2016-02-14 09:26:04 UTC (rev 20365)
@@ -0,0 +1,35 @@
+Author: Pino Toscano <pino at kde.org>
+Description: do not return bool for QString
+ GCC 6 cannot convert them
+Bug-Debian: https://bugs.debian.org/811679
+Applied-Upstream: commit:1452682
+
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -914,7 +914,7 @@
+     NameAndPidOfProgramListenProcess->start(proc, args);
+     if (!NameAndPidOfProgramListenProcess->waitForStarted()) {
+         kError() << "netstat fails!" << endl;
+-        return false;
++        return "";
+     } else {
+         NameAndPidOfProgramListenProcess->waitForFinished();
+ 
+@@ -946,7 +946,7 @@
+     GetEmailAddressOfCertProcess->start(proc, args);
+     if (!GetEmailAddressOfCertProcess->waitForStarted()) {
+         kError() << "GetEmailAddressOfCertProcess" << endl;
+-        return false;
++        return "";
+     } else {
+         GetEmailAddressOfCertProcess->waitForFinished();
+         disconnect(GetEmailAddressOfCertProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readOutGetEmailAddressOfCert()));
+@@ -1159,7 +1159,7 @@
+     GetHostnameProcess->start(proc, args);
+     if (!GetHostnameProcess->waitForStarted()) {
+         kError() << "Unable to start getHostname process!" << endl;
+-        return false;
++        return "";
+     } else {
+         GetHostnameProcess->waitForFinished();
+         return Hostname;

Added: kde-extras/kvpnc/trunk/debian/patches/r1452683.diff
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/r1452683.diff	                        (rev 0)
+++ kde-extras/kvpnc/trunk/debian/patches/r1452683.diff	2016-02-14 09:26:04 UTC (rev 20365)
@@ -0,0 +1,18 @@
+Author: Pino Toscano <pino at kde.org>
+Description: remove extra bool parameter for KConfigGroup::deleteEntry()
+ unneeded, and it does not match any of the actual signatures of the
+ function
+Bug-Debian: https://bugs.debian.org/811679
+Applied-Upstream: commit:1452683
+
+--- a/src/kvpncconfig.cpp
++++ b/src/kvpncconfig.cpp
+@@ -4305,7 +4305,7 @@
+     appPointer->processEvents();
+ 
+     if (useKwallet && KWallet::Wallet::isEnabled())
+-        configgroup.deleteEntry("First use of Kwallet", false);
++        configgroup.deleteEntry("First use of Kwallet");
+ 
+ 
+     /* = user data = */

Modified: kde-extras/kvpnc/trunk/debian/patches/series
===================================================================
--- kde-extras/kvpnc/trunk/debian/patches/series	2016-02-14 09:23:29 UTC (rev 20364)
+++ kde-extras/kvpnc/trunk/debian/patches/series	2016-02-14 09:26:04 UTC (rev 20365)
@@ -1,3 +1,5 @@
 10_su-to-root_usage.diff
 fix-ftbfs-gcc-4.7-667233.patch
 r1180094.diff
+r1452682.diff
+r1452683.diff