rpm/kgpg
SHA256
1
0
Fork 0
forked from pool/kgpg
Code Pull Requests Activity

Accepting request 443343 from home:luca_b:test_KA

Browse Source 
KDE Applications - please review

OBS-URL: https://build.opensuse.org/request/show/443343
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=38
This commit is contained in:
Raymond Wooninck 2016-12-03 15:21:54 +00:00 committed by Git OBS Bridge
parent d4f7003847
commit b39e431fcf
6 changed files with 117 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
fix-build-gcc48.patch Normal file
View File

@ -0,0 +1,61 @@
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);
}

3
kgpg-16.08.3.tar.xz
View File

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

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

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

4
kgpg-autostart.diff
View File

@ -1,5 +1,5 @@
--- kgpg.desktop 2008/07/21 09:57:19 1.1
+++ kgpg.desktop 2008/07/21 09:57:26
--- org.kde.kgpg.desktop 2008/07/21 09:57:19 1.1
+++ org.kde.kgpg.desktop 2008/07/21 09:57:26
@@ -118,3 +118,4 @@
X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false

10
kgpg.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Tue Nov 29 12:29:46 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.11.80
* KDE Applications 16.12.0 Beta
* https://www.kde.org/announcements/announce-applications-16.12-beta.php
- Added patches:
+ fix-build-gcc48.patch
-------------------------------------------------------------------
Wed Nov 9 06:17:59 UTC 2016 - lbeltrame@kde.org

75
kgpg.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package kgpg
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 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
@ -17,23 +17,42 @@
Name: kgpg
Version: 16.08.3
Version: 16.11.80
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA)
%{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Summary: Encryption Tool
License: GPL-2.0+
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
BuildRequires: boost-devel
BuildRequires: extra-cmake-modules
BuildRequires: karchive-devel
BuildRequires: kcalcore-devel
BuildRequires: kcodecs-devel
BuildRequires: kdelibs4support-devel
BuildRequires: kdoctools-devel
BuildRequires: kf5-filesystem
BuildRequires: ki18n-devel
BuildRequires: kiconthemes-devel
BuildRequires: kio-devel
BuildRequires: kservice-devel
BuildRequires: ktexteditor-devel
BuildRequires: kwidgetsaddons-devel
BuildRequires: libgpgme-devel
BuildRequires: libkdepimlibs4-devel
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: xz
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
Requires: gpg2
Recommends: kdepim4-runtime
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{kde4_runtime_requires}
%{kde4_pimlibs_requires}
%description
Kgpg is a simple GUI for gpg
@ -41,45 +60,33 @@ Kgpg is a simple GUI for gpg
%prep
%setup -q -n kgpg-%{version}
%patch1
#patch2 -p1
%build
%cmake_kde4 -d build
%cmake_kf5 -d build
%make_jobs
%install
%kde4_makeinstall -C build
%suse_update_desktop_file kgpg Utility Security
# for 13.15+ symlink the servicemenus for plasma5/kf5 too
%if 0%{?suse_version} > 1310
mkdir -p %{buildroot}%{_kf5_servicesdir}/ServiceMenus
pushd %{buildroot}%{_kde4_servicesdir}/ServiceMenus/ > /dev/null
for i in *.desktop; do
ln -s %{_kde4_servicesdir}/ServiceMenus/$i %{buildroot}/%{_kf5_servicesdir}/ServiceMenus/
done
popd > /dev/null
%endif
%kde_post_install
%kf5_makeinstall -C build
#suse_update_desktop_file org.kde.kgpg.deskt Utility Security
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc AUTHORS COPYING
%doc %lang(en) %{_kde4_htmldir}/en/kgpg/
%{_datadir}/appdata/
%{_kde4_applicationsdir}/*.desktop
%{_kde4_appsdir}/kgpg/
%{_kde4_bindir}/kgpg
%{_kde4_configkcfgdir}/*.kcfg
%{_kde4_datadir}/autostart/*.desktop
%{_kde4_datadir}/dbus-1/interfaces/*.xml
%{_kde4_iconsdir}/hicolor/*/*/*.png
%{_kde4_servicesdir}/ServiceMenus/*.desktop
%if 0%{?suse_version} > 1310
%dir %{_kf5_servicesdir}/ServiceMenus/
%{_kf5_servicesdir}/ServiceMenus/*.desktop
%endif
%{_bindir}/kgpg
%dir %{_kf5_appstreamdir}
%{_kf5_appstreamdir}/org.kde.kgpg.appdata.xml
%{_kf5_applicationsdir}/org.kde.kgpg.desktop
%{_kf5_configkcfgdir}/kgpg.kcfg
%{_datadir}/dbus-1/interfaces/org.kde.kgpg.Key.xml
%{_kf5_htmldir}/en/kgpg/
%{_kf5_iconsdir}/hicolor/*/*/*
%{_datadir}/kgpg/
%{_kf5_servicesdir}/ServiceMenus/
%{_kf5_configdir}/autostart/org.kde.kgpg.desktop
%{_kf5_kxmlguidir}/kgpg/
%changelog