commit: 9f26ae965ae9d376913d8318c9733093ffb2a585 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jul 1 15:55:52 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jul 1 15:56:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f26ae96
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 net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch | 53 +++++++++++++++++++++++++ net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch | 59 ++++++++++++++++++++++++++++ net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild | 57 +++++++++++++++++++++++++++ 3 files changed, 169 insertions(+) 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 00000000000..ba086a6337c --- /dev/null +++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch @@ -0,0 +1,53 @@ +Author: Pino Toscano <[email protected]> +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 <[email protected]> +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 00000000000..d898dafbaba --- /dev/null +++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch @@ -0,0 +1,59 @@ +Author: Christoph Feck <[email protected]> +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; diff --git a/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild b/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild new file mode 100644 index 00000000000..15e16bc297e --- /dev/null +++ b/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# QT3SUPPORT_REQUIRED +KDE_LINGUAS="ar br cs da de el en_GB eo es et eu fr ga gl hi hne it ja ka lt +ms nb nds nl nn pa pl pt pt_BR ro ru sv tr uk zh_CN zh_TW" +inherit kde4-base + +DESCRIPTION="KDELibs4-based frontend for various VPN clients" +HOMEPAGE="https://userbase.kde.org/KVpnc"; +SRC_URI="http://download.gna.org/kvpnc/${P}-kde4.tar.bz2 + http://download.gna.org/kvpnc/${P/a}-kde4-locale.tar.bz2"; + +LICENSE="GPL-2" +SLOT="4" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=" + dev-libs/libgcrypt:0 +" +DEPEND="${RDEPEND} + sys-devel/gettext +" + +S=${WORKDIR}/${P}-kde4 + +PATCHES=( + "${FILESDIR}/${P}-scriptsec.patch" + "${FILESDIR}/${P}-gcc47.patch" + "${FILESDIR}/${P}-ifconfig.patch" + "${FILESDIR}/${P}-gcc6.patch" + "${FILESDIR}/${P}-kicon.patch" +) + +src_prepare() { + mv -vf "${WORKDIR}"/${P/a}-kde4-locale/po . || die + + echo "find_package ( Msgfmt REQUIRED )" >> CMakeLists.txt || die + echo "find_package ( Gettext REQUIRED )" >> CMakeLists.txt || die + echo "add_subdirectory ( po )" >> CMakeLists.txt || die + + sed -i \ + -e "s:0.9.2-svn:${PV}:" \ + CMakeLists.txt || die + + kde4-base_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DWITH_libgcrypt=ON + ) + kde4-base_src_configure +}
