SHA256
1
0
forked from pool/kgpg

Accepting request 556191 from KDE:Applications

KDE Applications 17.12.0 final (release on 2017-12-14)

OBS-URL: https://build.opensuse.org/request/show/556191
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kgpg?expand=0&rev=80
This commit is contained in:
Dominique Leuenberger 2017-12-18 07:49:59 +00:00 committed by Git OBS Bridge
commit 5acde0cc29
5 changed files with 53 additions and 67 deletions

View File

@ -1,61 +0,0 @@
Index: kgpg-16.11.60git/keysmanager.cpp
===================================================================
--- kgpg-16.11.60git.orig/keysmanager.cpp
+++ kgpg-16.11.60git/keysmanager.cpp
@@ -1067,7 +1067,7 @@ void KeysManager::slotTip()
void KeysManager::showKeyServer()
{
QPointer<KeyServer> ks = new KeyServer(this, imodel);
- connect(ks, &KeyServer::importFinished, imodel, static_cast<void(KGpgItemModel::*)(const QStringList &)>(&KGpgItemModel::refreshKeys));
+ connect(ks, SIGNAL(importFinished(QStringList)), imodel, SLOT(refreshKeys(QStringList)));
ks->exec();
delete ks;
@@ -1185,11 +1185,11 @@ void KeysManager::showOptions()
return;
QPointer<kgpgOptions> optionsDialog = new kgpgOptions(this, imodel);
- connect(optionsDialog, &kgpgOptions::settingsUpdated, this, &KeysManager::readAllOptions);
- connect(optionsDialog, &kgpgOptions::homeChanged, imodel, &KGpgItemModel::refreshAllKeys);
+ connect(optionsDialog, SIGNAL(settingsUpdated()), this, SLOT(readAllOptions()));
+ connect(optionsDialog, SIGNAL(homeChanged()), imodel, SLOT(refreshAllKeys()));
connect(optionsDialog.data(), &kgpgOptions::homeChanged, imodel, &KGpgItemModel::refreshGroups);
connect(optionsDialog.data(), &kgpgOptions::refreshTrust, imodel, &KGpgItemModel::refreshTrust);
- connect(optionsDialog, &kgpgOptions::changeFont, this, &KeysManager::fontChanged);
+ connect(optionsDialog, SIGNAL(changeFont(QFont)), this, SLOT(fontChanged(QFont)));
optionsDialog->exec();
delete optionsDialog;
@@ -1648,8 +1648,8 @@ KeysManager::showProperties(KGpgNode *n)
case ITYPE_PAIR: {
KGpgKeyNode *k = n->toKeyNode();
QPointer<KgpgKeyInfo> opts = new KgpgKeyInfo(k, imodel, this);
- connect(opts, &KgpgKeyInfo::keyNeedsRefresh, imodel, static_cast<void(KGpgItemModel::*)(KGpgKeyNode *)>(&KGpgItemModel::refreshKey));
- connect(opts->keychange, &KGpgChangeKey::keyNeedsRefresh, imodel, static_cast<void(KGpgItemModel::*)(KGpgKeyNode *)>(&KGpgItemModel::refreshKey));
+ connect(opts, SIGNAL(keyNeedsRefresh(KGpgKeyNode*)), imodel, SLOT(refreshKey(KGpgKeyNode*)));
+ connect(opts->keychange, SIGNAL(keyNeedsRefresh(KGpgKeyNode*)), imodel, SLOT(refreshKey(KGpgKeyNode*)));
opts->exec();
delete opts;
}
@@ -1691,7 +1691,7 @@ void KeysManager::keyproperties()
}
QPointer<KgpgKeyInfo> opts = new KgpgKeyInfo(kn, imodel, this);
- connect(opts, &KgpgKeyInfo::keyNeedsRefresh, imodel, static_cast<void(KGpgItemModel::*)(KGpgKeyNode *)>(&KGpgItemModel::refreshKey));
+ connect(opts, SIGNAL(keyNeedsRefresh(KGpgKeyNode*)), imodel, SLOT(refreshKey(KGpgKeyNode*)));
opts->exec();
delete opts;
}
Index: kgpg-16.11.60git/kgpgexternalactions.cpp
===================================================================
--- kgpg-16.11.60git.orig/kgpgexternalactions.cpp
+++ kgpg-16.11.60git/kgpgexternalactions.cpp
@@ -455,7 +455,7 @@ void KGpgExternalActions::startAssistant
if (m_assistant.isNull()) {
m_assistant = new KGpgFirstAssistant(m_keysmanager);
- connect(m_assistant, &KGpgFirstAssistant::accepted, this, &KGpgExternalActions::slotSaveOptionsPath);
+ connect(m_assistant, SIGNAL(accepted()), this, SLOT(slotSaveOptionsPath()));
connect(m_assistant.data(), &KGpgFirstAssistant::rejected, m_assistant.data(), &KGpgFirstAssistant::deleteLater);
connect(m_assistant->button(QDialogButtonBox::Help), &QPushButton::clicked, this, &KGpgExternalActions::help);
}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0f0156c1232763934d4ea8a126c26b71d791e3e567df16ea56a639ca2b106bc
size 2817416

3
kgpg-17.12.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3781a3168a8bd629616ff54e6495a8bdd715f5e4c5d7132506c2295b35a4bd5
size 2817752

View File

@ -1,3 +1,52 @@
-------------------------------------------------------------------
Sat Dec 09 14:59:05 CET 2017 - lbeltrame@kde.org
- Update to 17.12.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.12.0.php
- Changes since 17.11.90:
* appdata: update doc URL, more https
-------------------------------------------------------------------
Sat Dec 2 23:45:14 UTC 2017 - wbauer@tmo.at
- Drop fix-build-gcc48.patch, no longer necessary and it actually
hasn't been applied anymore since 17.04
-------------------------------------------------------------------
Sat Dec 02 10:12:36 CET 2017 - lbeltrame@kde.org
- Update to 17.11.90
* New feature release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.12-rc.php
- Changes since 17.11.80:
* None
-------------------------------------------------------------------
Mon Nov 20 06:59:11 CET 2017 - lbeltrame@kde.org
- Update to 17.11.80
* New feature release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.12-beta.php
- Changes since 17.08.3:
* show creation date of user ids
* remove needless assignment
* do not add duplicate "--command-fd=0" to GnuPG commandline
* set project version in CMake
* de-uglify QString construction
* check file existence before opening it, not afterwards
* remove write-only local variable
* use range based for loops if the container is const
* mark end iterator const
* use nullptr directly
* the parent of a KGpgNode cannot change
* collect secret key information when loading public keys
* breezeify icon, this gives us larger sizes which is needed for appstream
* Port away from deprecated qSort.
-------------------------------------------------------------------
Thu Nov 09 23:11:43 CET 2017 - lbeltrame@kde.org

View File

@ -19,7 +19,7 @@
%bcond_without lang
Name: kgpg
Version: 17.08.3
Version: 17.12.0
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
@ -32,7 +32,6 @@ Group: Productivity/Security
Url: http://www.kde.org
Source0: kgpg-%{version}.tar.xz
Patch1: kgpg-autostart.diff
Patch2: fix-build-gcc48.patch
BuildRequires: akonadi-contact-devel
%if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel
@ -75,7 +74,6 @@ Kgpg is a simple GUI for gpg
%prep
%setup -q -n kgpg-%{version}
%patch1
#patch2 -p1
%build
%cmake_kf5 -d build