diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2017-07-01 17:55:52 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-07-01 17:56:33 +0200 |
commit | 9f26ae965ae9d376913d8318c9733093ffb2a585 (patch) | |
tree | 8a01e6e7211a0f42c1c87d39d94b6df329bbc21f /net-vpn/kvpnc/files | |
parent | sci-visualization/gwyddion: Drop USE=kde (diff) | |
download | gentoo-9f26ae965ae9d376913d8318c9733093ffb2a585.tar.gz gentoo-9f26ae965ae9d376913d8318c9733093ffb2a585.tar.bz2 gentoo-9f26ae965ae9d376913d8318c9733093ffb2a585.zip |
net-vpn/kvpnc: Fix build with GCC-6
Patches kindly borrowed from Debian.
Gentoo-bug: 623050
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Diffstat (limited to 'net-vpn/kvpnc/files')
-rw-r--r-- | net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch | 53 | ||||
-rw-r--r-- | net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch | 59 |
2 files changed, 112 insertions, 0 deletions
diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch new file mode 100644 index 000000000000..ba086a6337cc --- /dev/null +++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch @@ -0,0 +1,53 @@ +Author: Pino Toscano <pino@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 = */ +Author: Pino Toscano <pino@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; diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch new file mode 100644 index 000000000000..d898dafbaba2 --- /dev/null +++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch @@ -0,0 +1,59 @@ +Author: Christoph Feck <cfeck@kde.org> +Description: Use KIcon to set window icons +Bug: https://bugs.kde.org/show_bug.cgi?id=246016 +Bug-Debian: https://bugs.debian.org/599094 +Applied-Upstream: commit:1180094 + +--- a/src/kvpnc.cpp ++++ b/src/kvpnc.cpp +@@ -320,10 +320,7 @@ KVpnc::~KVpnc() + + void KVpnc::initAction() + { +- disconnectedIcon = KIconLoader::global()->loadIcon("disconnected", KIconLoader::NoGroup); +- connectedIcon = KIconLoader::global()->loadIcon("connected", KIconLoader::NoGroup); +- connectingIcon = KIconLoader::global()->loadIcon("connecting" , KIconLoader::NoGroup); +- setWindowIcon(disconnectedIcon); ++ setWindowIcon(KIcon("disconnected")); + + (void*) KStandardAction::quit(this, SLOT(quitCalled()), actionCollection()); + +@@ -17449,7 +17446,7 @@ void KVpnc::setGuiStatus(int status) + QString ConnectionStatus = i18n("unknown"); + QString Username = ""; + if (status == KVpncEnum::connected) { +- setWindowIcon(connectedIcon); ++ setWindowIcon(KIcon("connected")); + + durationString = (i18n("%1:%2:%3" , QString().sprintf("%02u", hour) , QString().sprintf("%02u", min) , QString().sprintf("%02u", sec))); + QString ConnectMsg = ""; +@@ -17502,7 +17499,7 @@ void KVpnc::setGuiStatus(int status) + + } + else if (status == KVpncEnum::connecting) { +- setWindowIcon(connectingIcon); ++ setWindowIcon(KIcon("connecting")); + mw->buttonConnect->setEnabled(false); + mw->buttonDisconnect->setEnabled(true); + mw->SessionCombo->setEnabled(false); +@@ -17531,7 +17528,7 @@ void KVpnc::setGuiStatus(int status) + connectClicked(); + + } else if (status == KVpncEnum::disconnected) { +- setWindowIcon(disconnectedIcon); ++ setWindowIcon(KIcon("disconnected")); + mw->buttonConnect->setEnabled(true); + mw->buttonDisconnect->setEnabled(false); + DisconnectAction->setEnabled(false); +--- a/src/kvpnc.h ++++ b/src/kvpnc.h +@@ -286,9 +286,6 @@ private: + + int TimeOutProcess; //< for timeout + int ConnectingProcess; //< for killing process +- QPixmap connectedIcon; +- QPixmap disconnectedIcon; +- QPixmap connectingIcon; + QPixmap connectingStatusPixmap; + QPixmap disconnectedStatusPixmap; + QPixmap connectedStatusPixmap; |