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

KDE Applications 17.08.80 beta

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kgpg?expand=0&rev=56
This commit is contained in:
Luca Beltrame 2017-03-26 07:19:06 +00:00 committed by Git OBS Bridge
parent db4f3b3212
commit 3c6553901a
7 changed files with 44 additions and 395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

330
0002-Revert-Use-new-slot-syntax-for-KStandardAction-conne.patch
View File

@ -1,330 +0,0 @@
From 943853d0b7b8fd95d73e74266c9baa4168cdcd6f Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <kde@opensource.sf-tec.de>
Date: Fri, 6 Jan 2017 01:04:06 +0100
Subject: [PATCH 2/3] Revert "Use new slot syntax for KStandardAction
connections."
This reverts commit be2ea5a6415eeb87a715fe530770e03ffd1dae12.
---
editor/kgpgeditor.cpp | 20 +++++-----
keysmanager.cpp | 100 +++++++++++++++++++++++++-------------------------
2 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/editor/kgpgeditor.cpp b/editor/kgpgeditor.cpp
index a584ef5..14f5577 100644
--- a/editor/kgpgeditor.cpp
+++ b/editor/kgpgeditor.cpp
@@ -181,42 +181,42 @@ void KgpgEditor::initActions()
m_recentfiles->loadEntries( KConfigGroup(KSharedConfig::openConfig(), "Recent Files" ) );
m_recentfiles->setMaxItems(KGpgSettings::recentFiles());
- QAction *action = actionCollection()->addAction(QLatin1String("file_encrypt"), this, &KgpgEditor::slotFilePreEnc);
+ QAction *action = actionCollection()->addAction(QLatin1String("file_encrypt"), this, SLOT(slotFilePreEnc()));
action->setIcon(QIcon::fromTheme( QLatin1String( "document-encrypt" )));
action->setText(i18n("&Encrypt File..."));
- action = actionCollection()->addAction(QLatin1String("file_decrypt"), this, &KgpgEditor::slotFilePreDec);
+ action = actionCollection()->addAction(QLatin1String("file_decrypt"), this, SLOT(slotFilePreDec()));
action->setIcon(QIcon::fromTheme( QLatin1String( "document-decrypt" )));
action->setText(i18n("&Decrypt File..."));
- action = actionCollection()->addAction(QLatin1String("key_manage"), this, &KgpgEditor::slotKeyManager);
+ action = actionCollection()->addAction(QLatin1String("key_manage"), this, SLOT(slotKeyManager()));
action->setIcon(QIcon::fromTheme( QLatin1String( "kgpg" )));
action->setText(i18n("&Open Key Manager"));
- action = actionCollection()->addAction(QLatin1String("sign_generate"), this, &KgpgEditor::slotPreSignFile);
+ action = actionCollection()->addAction(QLatin1String("sign_generate"), this, SLOT(slotPreSignFile()));
action->setText(i18n("&Generate Signature..."));
action->setIcon(QIcon::fromTheme( QLatin1String( "document-sign-key" )));
- action = actionCollection()->addAction(QLatin1String("sign_verify"), this, &KgpgEditor::slotPreVerifyFile);
+ action = actionCollection()->addAction(QLatin1String("sign_verify"), this, SLOT(slotPreVerifyFile()));
action->setText(i18n("&Verify Signature..."));
- action = actionCollection()->addAction(QLatin1String("sign_check"), this, &KgpgEditor::slotCheckMd5);
+ action = actionCollection()->addAction(QLatin1String("sign_check"), this, SLOT(slotCheckMd5()));
action->setText(i18n("&Check MD5 Sum..."));
- m_encodingaction = actionCollection()->add<KToggleAction>(QLatin1String("charsets"), this, &KgpgEditor::slotSetCharset);
+ m_encodingaction = actionCollection()->add<KToggleAction>(QLatin1String("charsets"), this, SLOT(slotSetCharset()));
m_encodingaction->setText(i18n("&Unicode (utf-8) Encoding"));
actionCollection()->addAction(m_recentfiles->objectName(), m_recentfiles);
- action = actionCollection()->addAction(QLatin1String("text_encrypt"), m_editor, &KgpgTextEdit::slotEncode);
+ action = actionCollection()->addAction(QLatin1String("text_encrypt"), m_editor, SLOT(slotEncode()));
action->setIcon(QIcon::fromTheme( QLatin1String( "document-encrypt" )));
action->setText(i18n("En&crypt"));
- action = actionCollection()->addAction(QLatin1String("text_decrypt"), m_editor, &KgpgTextEdit::slotDecode);
+ action = actionCollection()->addAction(QLatin1String("text_decrypt"), m_editor, SLOT(slotDecode()));
action->setIcon(QIcon::fromTheme( QLatin1String( "document-decrypt" )));
action->setText(i18n("&Decrypt"));
- action = actionCollection()->addAction(QLatin1String("text_sign_verify"), m_editor, &KgpgTextEdit::slotSignVerify);
+ action = actionCollection()->addAction(QLatin1String("text_sign_verify"), m_editor, SLOT(slotSignVerify()));
action->setIcon(QIcon::fromTheme( QLatin1String( "document-sign-key" )));
action->setText(i18n("S&ign/Verify"));
}
diff --git a/keysmanager.cpp b/keysmanager.cpp
index aa7d0ed..e2b3781 100644
--- a/keysmanager.cpp
+++ b/keysmanager.cpp
@@ -127,18 +127,18 @@ KeysManager::KeysManager(QWidget *parent)
setAttribute(Qt::WA_DeleteOnClose, false);
setWindowTitle(i18n("Key Management"));
- KStandardAction::quit(this, &KeysManager::quitApp, actionCollection());
+ KStandardAction::quit(this, SLOT(quitApp()), actionCollection());
actionCollection()->addAction(KStandardAction::Preferences, QLatin1String( "options_configure" ), this, SLOT(showOptions()));
- openEditor = actionCollection()->addAction(QLatin1String("kgpg_editor"), this, &KeysManager::slotOpenEditor);
+ openEditor = actionCollection()->addAction(QLatin1String("kgpg_editor"), this, SLOT(slotOpenEditor()));
openEditor->setIcon(QIcon::fromTheme( QLatin1String( "accessories-text-editor" )));
openEditor->setText(i18n("&Open Editor"));
- kserver = actionCollection()->addAction( QLatin1String("key_server"), this, &KeysManager::showKeyServer);
+ kserver = actionCollection()->addAction( QLatin1String("key_server"), this, SLOT(showKeyServer()));
kserver->setText( i18n("&Key Server Dialog") );
kserver->setIcon( QIcon::fromTheme( QLatin1String( "network-server" )) );
- goToDefaultKey = actionCollection()->addAction(QLatin1String("go_default_key"), this, &KeysManager::slotGotoDefaultKey);
+ goToDefaultKey = actionCollection()->addAction(QLatin1String("go_default_key"), this, SLOT(slotGotoDefaultKey()));
goToDefaultKey->setIcon(QIcon::fromTheme( QLatin1String( "go-home" )));
goToDefaultKey->setText(i18n("&Go to Default Key"));
actionCollection()->setDefaultShortcut(goToDefaultKey, QKeySequence(Qt::CTRL + Qt::Key_Home));
@@ -155,146 +155,146 @@ KeysManager::KeysManager(QWidget *parent)
QAction *action;
- action = actionCollection()->addAction(QLatin1String("help_tipofday"), this, &KeysManager::slotTip);
+ action = actionCollection()->addAction(QLatin1String("help_tipofday"), this, SLOT(slotTip()));
action->setIcon( QIcon::fromTheme( QLatin1String( "help-hint" )) );
action->setText( i18n("Tip of the &Day") );
- action = actionCollection()->addAction(QLatin1String("gpg_man"), this, &KeysManager::slotManpage);
+ action = actionCollection()->addAction(QLatin1String("gpg_man"), this, SLOT(slotManpage()));
action->setText( i18n("View GnuPG Manual") );
action->setIcon( QIcon::fromTheme( QLatin1String( "help-contents" )) );
- action = actionCollection()->addAction(QLatin1String("key_refresh"), this, &KeysManager::refreshkey);
+ action = actionCollection()->addAction(QLatin1String("key_refresh"), this, SLOT(refreshkey()));
action->setIcon(QIcon::fromTheme( QLatin1String( "view-refresh" )));
action->setText(i18n("&Refresh List"));
actionCollection()->setDefaultShortcuts(action, KStandardShortcut::reload());
- longId = actionCollection()->add<KToggleAction>(QLatin1String("show_long_keyid"), this, &KeysManager::slotShowLongId);
+ longId = actionCollection()->add<KToggleAction>(QLatin1String("show_long_keyid"), this, SLOT(slotShowLongId(bool)));
longId->setText(i18n("Show &Long Key Id"));
longId->setChecked(KGpgSettings::showLongKeyId());
- QAction *infoKey = actionCollection()->addAction(QLatin1String("key_info"), this, &KeysManager::keyproperties);
+ QAction *infoKey = actionCollection()->addAction(QLatin1String("key_info"), this, SLOT(keyproperties()));
infoKey->setIcon(QIcon::fromTheme( QLatin1String( "document-properties-key" )));
infoKey->setText(i18n("K&ey Properties"));
- QAction *openKeyUrl = actionCollection()->addAction(QLatin1String("key_url"), this, &KeysManager::slotOpenKeyUrl);
+ QAction *openKeyUrl = actionCollection()->addAction(QLatin1String("key_url"), this, SLOT(slotOpenKeyUrl()));
openKeyUrl->setIcon(QIcon::fromTheme(QLatin1String("applications-internet")));
openKeyUrl->setText(i18n("&Open Key URL"));
- editKey = actionCollection()->addAction(QLatin1String("key_edit"), this, &KeysManager::slotedit);
+ editKey = actionCollection()->addAction(QLatin1String("key_edit"), this, SLOT(slotedit()));
editKey->setIcon(QIcon::fromTheme( QLatin1String( "utilities-terminal" )));
editKey->setText(i18n("Edit Key in &Terminal"));
actionCollection()->setDefaultShortcut(editKey, QKeySequence(Qt::ALT + Qt::Key_Return));
- QAction *generateKey = actionCollection()->addAction(QLatin1String("key_gener"), this, &KeysManager::slotGenerateKey);
+ QAction *generateKey = actionCollection()->addAction(QLatin1String("key_gener"), this, SLOT(slotGenerateKey()));
generateKey->setIcon(QIcon::fromTheme( QLatin1String( "key-generate-pair" )));
generateKey->setText(i18n("&Generate Key Pair..."));
actionCollection()->setDefaultShortcuts(generateKey, KStandardShortcut::shortcut(KStandardShortcut::New));
- exportPublicKey = actionCollection()->addAction(QLatin1String("key_export"), this, &KeysManager::slotexport);
+ exportPublicKey = actionCollection()->addAction(QLatin1String("key_export"), this, SLOT(slotexport()));
exportPublicKey->setIcon(QIcon::fromTheme( QLatin1String( "document-export-key" )));
actionCollection()->setDefaultShortcuts(exportPublicKey, KStandardShortcut::shortcut(KStandardShortcut::Copy));
- QAction *importKey = actionCollection()->addAction(QLatin1String("key_import"), this, &KeysManager::slotPreImportKey);
+ QAction *importKey = actionCollection()->addAction(QLatin1String("key_import"), this, SLOT(slotPreImportKey()));
importKey->setIcon(QIcon::fromTheme( QLatin1String( "document-import-key" )));
importKey->setText(i18n("&Import Key..."));
actionCollection()->setDefaultShortcuts(importKey, KStandardShortcut::shortcut(KStandardShortcut::Paste));
- m_sendEmail = actionCollection()->addAction(QLatin1String("send_mail"), this, &KeysManager::slotSendEmail);
+ m_sendEmail = actionCollection()->addAction(QLatin1String("send_mail"), this, SLOT(slotSendEmail()));
m_sendEmail->setIcon(QIcon::fromTheme(QLatin1String("mail-send")));
m_sendEmail->setText(i18n("Send Ema&il"));
- QAction *newContact = actionCollection()->addAction(QLatin1String("add_kab"), this, &KeysManager::addToKAB);
+ QAction *newContact = actionCollection()->addAction(QLatin1String("add_kab"), this, SLOT(addToKAB()));
newContact->setIcon(QIcon::fromTheme( QLatin1String( "contact-new" )));
newContact->setText(i18n("&Create New Contact in Address Book"));
- createGroup = actionCollection()->addAction(QLatin1String("create_group"), this, &KeysManager::createNewGroup);
+ createGroup = actionCollection()->addAction(QLatin1String("create_group"), this, SLOT(createNewGroup()));
createGroup->setIcon(Images::group());
- editCurrentGroup = actionCollection()->addAction(QLatin1String("edit_group"), this, &KeysManager::editGroup);
+ editCurrentGroup = actionCollection()->addAction(QLatin1String("edit_group"), this, SLOT(editGroup()));
editCurrentGroup->setText(i18n("&Edit Group..."));
- delGroup = actionCollection()->addAction(QLatin1String("delete_group"), this, &KeysManager::deleteGroup);
+ delGroup = actionCollection()->addAction(QLatin1String("delete_group"), this, SLOT(deleteGroup()));
delGroup->setText(i18n("&Delete Group"));
delGroup->setIcon(QIcon::fromTheme( QLatin1String( "edit-delete" )));
- m_groupRename = actionCollection()->addAction(QLatin1String("rename_group"), this, &KeysManager::renameGroup);
+ m_groupRename = actionCollection()->addAction(QLatin1String("rename_group"), this, SLOT(renameGroup()));
m_groupRename->setText(i18n("&Rename Group"));
m_groupRename->setIcon(QIcon::fromTheme( QLatin1String( "edit-rename" )));
actionCollection()->setDefaultShortcut(m_groupRename, QKeySequence(Qt::Key_F2));
- deleteKey = actionCollection()->addAction(QLatin1String("key_delete"), this, &KeysManager::confirmdeletekey);
+ deleteKey = actionCollection()->addAction(QLatin1String("key_delete"), this, SLOT(confirmdeletekey()));
deleteKey->setIcon(QIcon::fromTheme( QLatin1String( "edit-delete" )));
actionCollection()->setDefaultShortcut(deleteKey, QKeySequence(Qt::Key_Delete));
- setDefaultKey = actionCollection()->addAction(QLatin1String("key_default"), this, &KeysManager::slotSetDefKey);
+ setDefaultKey = actionCollection()->addAction(QLatin1String("key_default"), this, SLOT(slotSetDefKey()));
setDefaultKey->setText(i18n("Set as De&fault Key"));
- QAction *addPhoto = actionCollection()->addAction(QLatin1String("add_photo"), this, &KeysManager::slotAddPhoto);
+ QAction *addPhoto = actionCollection()->addAction(QLatin1String("add_photo"), this, SLOT(slotAddPhoto()));
addPhoto->setText(i18n("&Add Photo..."));
- QAction *addUid = actionCollection()->addAction(QLatin1String("add_uid"), this, &KeysManager::slotAddUid);
+ QAction *addUid = actionCollection()->addAction(QLatin1String("add_uid"), this, SLOT(slotAddUid()));
addUid->setText(i18n("&Add User Id..."));
- QAction *exportSecretKey = actionCollection()->addAction(QLatin1String("key_sexport"), this, &KeysManager::slotexportsec);
+ QAction *exportSecretKey = actionCollection()->addAction(QLatin1String("key_sexport"), this, SLOT(slotexportsec()));
exportSecretKey->setText(i18n("Export Secret Key..."));
- QAction *deleteKeyPair = actionCollection()->addAction(QLatin1String("key_pdelete"), this, &KeysManager::deleteseckey);
+ QAction *deleteKeyPair = actionCollection()->addAction(QLatin1String("key_pdelete"), this, SLOT(deleteseckey()));
deleteKeyPair->setText(i18n("Delete Key Pair"));
deleteKeyPair->setIcon(QIcon::fromTheme( QLatin1String( "edit-delete" )));
- m_revokeKey = actionCollection()->addAction(QLatin1String("key_revoke"), this, &KeysManager::revokeWidget);
+ m_revokeKey = actionCollection()->addAction(QLatin1String("key_revoke"), this, SLOT(revokeWidget()));
m_revokeKey->setText(i18n("Revoke Key..."));
- QAction *regeneratePublic = actionCollection()->addAction(QLatin1String("key_regener"), this, &KeysManager::slotregenerate);
+ QAction *regeneratePublic = actionCollection()->addAction(QLatin1String("key_regener"), this, SLOT(slotregenerate()));
regeneratePublic->setText(i18n("&Regenerate Public Key"));
- delUid = actionCollection()->addAction(QLatin1String("del_uid"), this, &KeysManager::slotDelUid);
+ delUid = actionCollection()->addAction(QLatin1String("del_uid"), this, SLOT(slotDelUid()));
delUid->setIcon(QIcon::fromTheme( QLatin1String( "edit-delete" )));
- setPrimUid = actionCollection()->addAction(QLatin1String("prim_uid"), this, &KeysManager::slotPrimUid);
+ setPrimUid = actionCollection()->addAction(QLatin1String("prim_uid"), this, SLOT(slotPrimUid()));
setPrimUid->setText(i18n("Set User Id as &Primary"));
- QAction *openPhoto = actionCollection()->addAction(QLatin1String("key_photo"), this, &KeysManager::slotShowPhoto);
+ QAction *openPhoto = actionCollection()->addAction(QLatin1String("key_photo"), this, SLOT(slotShowPhoto()));
openPhoto->setIcon(QIcon::fromTheme( QLatin1String( "image-x-generic" )));
openPhoto->setText(i18n("&Open Photo"));
- QAction *deletePhoto = actionCollection()->addAction(QLatin1String("delete_photo"), this, &KeysManager::slotDeletePhoto);
+ QAction *deletePhoto = actionCollection()->addAction(QLatin1String("delete_photo"), this, SLOT(slotDeletePhoto()));
deletePhoto->setIcon(QIcon::fromTheme( QLatin1String( "edit-delete" )));
deletePhoto->setText(i18n("&Delete Photo"));
- delSignKey = actionCollection()->addAction(QLatin1String("key_delsign"), this, &KeysManager::delsignkey);
+ delSignKey = actionCollection()->addAction(QLatin1String("key_delsign"), this, SLOT(delsignkey()));
delSignKey->setIcon(QIcon::fromTheme( QLatin1String( "edit-delete" )));
delSignKey->setEnabled(false);
- importAllSignKeys = actionCollection()->addAction(QLatin1String("key_importallsign"), this, &KeysManager::importallsignkey);
+ importAllSignKeys = actionCollection()->addAction(QLatin1String("key_importallsign"), this, SLOT(importallsignkey()));
importAllSignKeys->setIcon(QIcon::fromTheme( QLatin1String( "document-import" )));
importAllSignKeys->setText(i18n("Import &Missing Signatures From Keyserver"));
- refreshKey = actionCollection()->addAction(QLatin1String("key_server_refresh"), this, &KeysManager::refreshKeyFromServer);
+ refreshKey = actionCollection()->addAction(QLatin1String("key_server_refresh"), this, SLOT(refreshKeyFromServer()));
refreshKey->setIcon(QIcon::fromTheme( QLatin1String( "view-refresh" )));
- signKey = actionCollection()->addAction(QLatin1String("key_sign"), this, &KeysManager::signkey);
+ signKey = actionCollection()->addAction(QLatin1String("key_sign"), this, SLOT(signkey()));
signKey->setIcon(QIcon::fromTheme( QLatin1String( "document-sign-key" )));
- signUid = actionCollection()->addAction(QLatin1String("key_sign_uid"), this, &KeysManager::signuid);
+ signUid = actionCollection()->addAction(QLatin1String("key_sign_uid"), this, SLOT(signuid()));
signUid->setIcon(QIcon::fromTheme( QLatin1String( "document-sign-key" )));
- signMailUid = actionCollection()->addAction(QLatin1String("key_sign_mail_uid"), this, &KeysManager::caff);
+ signMailUid = actionCollection()->addAction(QLatin1String("key_sign_mail_uid"), this, SLOT(caff()));
signMailUid->setIcon(QIcon::fromTheme( QLatin1String( "document-sign-key" )));
- importSignatureKey = actionCollection()->addAction(QLatin1String("key_importsign"), this, &KeysManager::preimportsignkey);
+ importSignatureKey = actionCollection()->addAction(QLatin1String("key_importsign"), this, SLOT(preimportsignkey()));
importSignatureKey->setIcon(QIcon::fromTheme( QLatin1String( "document-import-key" )));
- sTrust = actionCollection()->add<KToggleAction>(QLatin1String("show_trust"), this, &KeysManager::slotShowTrust);
+ sTrust = actionCollection()->add<KToggleAction>(QLatin1String("show_trust"), this, SLOT(slotShowTrust()));
sTrust->setText(i18n("Trust"));
- sSize = actionCollection()->add<KToggleAction>(QLatin1String("show_size"), this, &KeysManager::slotShowSize);
+ sSize = actionCollection()->add<KToggleAction>(QLatin1String("show_size"), this, SLOT(slotShowSize()));
sSize->setText(i18n("Size"));
- sCreat = actionCollection()->add<KToggleAction>(QLatin1String("show_creat"), this, &KeysManager::slotShowCreation);
+ sCreat = actionCollection()->add<KToggleAction>(QLatin1String("show_creat"), this, SLOT(slotShowCreation()));
sCreat->setText(i18n("Creation"));
- sExpi = actionCollection()->add<KToggleAction>(QLatin1String("show_expi"), this, &KeysManager::slotShowExpiration);
+ sExpi = actionCollection()->add<KToggleAction>(QLatin1String("show_expi"), this, SLOT(slotShowExpiration()));
sExpi->setText(i18n("Expiration"));
photoProps = actionCollection()->add<KSelectAction>(QLatin1String( "photo_settings" ));
@@ -339,7 +339,7 @@ KeysManager::KeysManager(QWidget *parent)
connect(iview, &KeyTreeView::returnPressed, this, &KeysManager::slotDefaultAction);
- hPublic = actionCollection()->add<KToggleAction>(QLatin1String("show_secret"), iproxy, &KeyListProxyModel::setOnlySecret);
+ hPublic = actionCollection()->add<KToggleAction>(QLatin1String("show_secret"), iproxy, SLOT(setOnlySecret(bool)));
hPublic->setIcon(QIcon::fromTheme( QLatin1String( "view-key-secret" )));
hPublic->setText(i18n("&Show Only Secret Keys"));
hPublic->setChecked(KGpgSettings::showSecret());
@@ -440,7 +440,7 @@ KeysManager::KeysManager(QWidget *parent)
actionCollection()->addAction(QLatin1String( "search_line" ), searchLineAction);
searchLineAction->setDefaultWidget(searchWidget);
- action = actionCollection()->addAction(QLatin1String("search_focus"), m_listviewsearch, static_cast<void (QWidget::*)()>(&QWidget::setFocus));
+ action = actionCollection()->addAction(QLatin1String("search_focus"), m_listviewsearch, SLOT(setFocus()));
action->setText(i18nc("Name of the action that gives the focus to the search line", "Focus Search Line"));
actionCollection()->setDefaultShortcut(action, QKeySequence(Qt::Key_F6));
connect(m_listviewsearch, &QLineEdit::textChanged, iproxy, &KeyListProxyModel::setFilterFixedString);
@@ -2691,21 +2691,21 @@ KeysManager::setupTrayIcon()
QMenu *conf_menu = m_trayicon->contextMenu();
- QAction *KgpgOpenManager = actionCollection()->addAction(QLatin1String("kgpg_manager"), this, &KeysManager::show);
+ QAction *KgpgOpenManager = actionCollection()->addAction(QLatin1String("kgpg_manager"), this, SLOT(show()));
KgpgOpenManager->setIcon(QIcon::fromTheme( QLatin1String( "kgpg" )));
KgpgOpenManager->setText(i18n("Ke&y Manager"));
- QAction *KgpgEncryptClipboard = actionCollection()->addAction(QLatin1String("clip_encrypt"), this, &KeysManager::clipEncrypt);
+ QAction *KgpgEncryptClipboard = actionCollection()->addAction(QLatin1String("clip_encrypt"), this, SLOT(clipEncrypt()));
KgpgEncryptClipboard->setText(i18n("&Encrypt Clipboard"));
- QAction *KgpgDecryptClipboard = actionCollection()->addAction(QLatin1String("clip_decrypt"), this, &KeysManager::clipDecrypt);
+ QAction *KgpgDecryptClipboard = actionCollection()->addAction(QLatin1String("clip_decrypt"), this, SLOT(clipDecrypt()));
KgpgDecryptClipboard->setText(i18n("&Decrypt Clipboard"));
- QAction *KgpgSignClipboard = actionCollection()->addAction(QLatin1String("clip_sign"), this, &KeysManager::clipSign);
+ QAction *KgpgSignClipboard = actionCollection()->addAction(QLatin1String("clip_sign"), this, SLOT(clipSign()));
KgpgSignClipboard->setText(i18n("&Sign/Verify Clipboard"));
KgpgSignClipboard->setIcon(QIcon::fromTheme( QLatin1String( "document-sign-key" )));
- QAction *KgpgPreferences = KStandardAction::preferences(this, &KeysManager::showOptions, actionCollection());
+ QAction *KgpgPreferences = KStandardAction::preferences(this, SLOT(showOptions()), actionCollection());
conf_menu->addAction( KgpgEncryptClipboard );
conf_menu->addAction( KgpgDecryptClipboard );
--
2.10.2

26
0003-Revert-Increase-KF5-requirement.patch
View File

@ -1,26 +0,0 @@
From 280e6a748f632d448a94744ee13f3aeda24e15be Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <kde@opensource.sf-tec.de>
Date: Fri, 6 Jan 2017 01:04:19 +0100
Subject: [PATCH 3/3] Revert "Increase KF5 requirement"
This reverts commit fee6927a7396bbf1a6a8d1ad04f3fe6a81881d08.
---
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8e2a213..86fddda 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
)
# Load the frameworks we need
-find_package(KF5 5.28 REQUIRED
+find_package(KF5 5.23 REQUIRED
Archive
DocTools
Codecs
--
2.10.2

3
kgpg-16.12.3.tar.xz
View File

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

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

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

2
kgpg-autostart.diff
View File

@ -1,6 +1,6 @@
--- org.kde.kgpg.desktop 2008/07/21 09:57:19 1.1 --- org.kde.kgpg.desktop 2008/07/21 09:57:19 1.1
+++ org.kde.kgpg.desktop 2008/07/21 09:57:26 +++ org.kde.kgpg.desktop 2008/07/21 09:57:26
@@ -219,3 +219,4 @@ @@ -118,3 +118,4 @@
X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false X-KDE-autostart-condition=kgpgrc:User Interface:AutoStart:false
Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM; Categories=Qt;KDE;Utility;X-KDE-Utilities-PIM;

64
kgpg.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Sat Mar 25 23:10:27 CET 2017 - lbeltrame@kde.org
- Update to 17.03.80
* New feature release
* For more details please see:
* https://www.kde.org/announcements/announce-applications-17.03.80.php
- Changes since 16.12.3:
* Compile with gcc <= 4.8
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 9 12:37:48 CET 2017 - lbeltrame@kde.org Thu Mar 9 12:37:48 CET 2017 - lbeltrame@kde.org
@ -25,7 +35,7 @@ Mon Feb 6 15:29:15 UTC 2017 - adam.majer@suse.de
Sat Jan 14 08:56:14 UTC 2017 - lbeltrame@kde.org Sat Jan 14 08:56:14 UTC 2017 - lbeltrame@kde.org
- - Update to KDE Applications 16.12.1 - - Update to KDE Applications 16.12.1
* KDE Applications 16.12.1 * KDE Applications 16.12.1
* https://www.kde.org/announcements/announce-applications-16.12.1.php * https://www.kde.org/announcements/announce-applications-16.12.1.php
- Drop 0001-fix-crash-when-GnuPG-does-not-output-curve-fields-fo.patch, - Drop 0001-fix-crash-when-GnuPG-does-not-output-curve-fields-fo.patch,
@ -45,7 +55,7 @@ Fri Jan 6 01:17:01 UTC 2017 - wbauer@tmo.at
Tue Dec 13 19:43:38 UTC 2016 - tittiatcoke@gmail.com Tue Dec 13 19:43:38 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 16.12.0 - Update to KDE Applications 16.12.0
* KDE Applications 16.12.0 * KDE Applications 16.12.0
* https://www.kde.org/announcements/announce-applications-16.12.0.php * https://www.kde.org/announcements/announce-applications-16.12.0.php
@ -153,7 +163,7 @@ Tue Apr 5 11:18:43 UTC 2016 - wbauer@tmo.at
Sun Mar 13 15:44:03 UTC 2016 - tittiatcoke@gmail.com Sun Mar 13 15:44:03 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 15.12.3 - Update to KDE Applications 15.12.3
* KDE Applications 15.12.3 * KDE Applications 15.12.3
* https://www.kde.org/announcements/announce-applications-15.12.3.php * https://www.kde.org/announcements/announce-applications-15.12.3.php
* boo#970855 * boo#970855
@ -162,7 +172,7 @@ Sun Mar 13 15:44:03 UTC 2016 - tittiatcoke@gmail.com
Sat Feb 13 08:11:08 UTC 2016 - tittiatcoke@gmail.com Sat Feb 13 08:11:08 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 15.12.2 - Update to KDE Applications 15.12.2
* KDE Applications 15.12.2 * KDE Applications 15.12.2
* https://www.kde.org/announcements/announce-applications-15.12.2.php * https://www.kde.org/announcements/announce-applications-15.12.2.php
* boo#966605 * boo#966605
@ -177,7 +187,7 @@ Wed Jan 20 20:49:50 UTC 2016 - wbauer@tmo.at
Sat Jan 9 18:19:52 UTC 2016 - tittiatcoke@gmail.com Sat Jan 9 18:19:52 UTC 2016 - tittiatcoke@gmail.com
- Update to KDE Applications 15.12.1 - Update to KDE Applications 15.12.1
* KDE Applications 15.12.1 * KDE Applications 15.12.1
* https://www.kde.org/announcements/announce-applications-15.12.1.php * https://www.kde.org/announcements/announce-applications-15.12.1.php
* boo#961265 * boo#961265
@ -191,7 +201,7 @@ Thu Dec 17 10:13:41 UTC 2015 - tchvatal@suse.com
Sun Dec 13 13:19:12 UTC 2015 - tittiatcoke@gmail.com Sun Dec 13 13:19:12 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 15.12.0 - Update to KDE Applications 15.12.0
* KDE Applications 15.12.0 * KDE Applications 15.12.0
* https://www.kde.org/announcements/announce-applications-15.12.0.php * https://www.kde.org/announcements/announce-applications-15.12.0.php
* boo#958887 * boo#958887
@ -200,7 +210,7 @@ Sun Dec 13 13:19:12 UTC 2015 - tittiatcoke@gmail.com
Tue Nov 10 20:08:22 UTC 2015 - tittiatcoke@gmail.com Tue Nov 10 20:08:22 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 15.08.3 - Update to KDE Applications 15.08.3
* KDE Applications 15.08.3 * KDE Applications 15.08.3
* https://www.kde.org/announcements/announce-applications-15.08.3.php * https://www.kde.org/announcements/announce-applications-15.08.3.php
* boo#954531 * boo#954531
@ -209,7 +219,7 @@ Tue Nov 10 20:08:22 UTC 2015 - tittiatcoke@gmail.com
Sun Oct 11 13:31:16 UTC 2015 - tittiatcoke@gmail.com Sun Oct 11 13:31:16 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 15.08.2 - Update to KDE Applications 15.08.2
* KDE Applications 15.08.2 * KDE Applications 15.08.2
* https://www.kde.org/announcements/announce-applications-15.08.2.php * https://www.kde.org/announcements/announce-applications-15.08.2.php
@ -217,7 +227,7 @@ Sun Oct 11 13:31:16 UTC 2015 - tittiatcoke@gmail.com
Sun Sep 13 19:14:50 UTC 2015 - tittiatcoke@gmail.com Sun Sep 13 19:14:50 UTC 2015 - tittiatcoke@gmail.com
- Update to KDE Applications 15.08.1 - Update to KDE Applications 15.08.1
* KDE Applications 15.08.1 * KDE Applications 15.08.1
* https://www.kde.org/announcements/announce-applications-15.08.1.php * https://www.kde.org/announcements/announce-applications-15.08.1.php
@ -537,38 +547,38 @@ Mon Apr 1 19:22:46 UTC 2013 - tittiatcoke@gmail.com
Sat Mar 2 15:47:19 UTC 2013 - tittiatcoke@gmail.com Sat Mar 2 15:47:19 UTC 2013 - tittiatcoke@gmail.com
- Update to 4.10.1 - Update to 4.10.1
* Contains bug fixes. See http://www.kde.org/announcements/ * Contains bug fixes. See http://www.kde.org/announcements/
for more information for more information
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 31 17:56:54 UTC 2013 - tittiatcoke@gmail.com Thu Jan 31 17:56:54 UTC 2013 - tittiatcoke@gmail.com
- Update to 4.10.0 - Update to 4.10.0
* This is the final release for 4.10. Contains bugfixes * This is the final release for 4.10. Contains bugfixes
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 17 08:13:49 UTC 2013 - tittiatcoke@gmail.com Thu Jan 17 08:13:49 UTC 2013 - tittiatcoke@gmail.com
- Update to 4.9.98 - Update to 4.9.98
* This is the third RC release for 4.10. Contains bugfixes * This is the third RC release for 4.10. Contains bugfixes
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 3 21:20:36 UTC 2013 - tittiatcoke@gmail.com Thu Jan 3 21:20:36 UTC 2013 - tittiatcoke@gmail.com
- Update to 4.9.97 - Update to 4.9.97
* This is the second RC release for 4.10. Contains bugfixes * This is the second RC release for 4.10. Contains bugfixes
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 19 18:46:44 UTC 2012 - tittiatcoke@gmail.com Wed Dec 19 18:46:44 UTC 2012 - tittiatcoke@gmail.com
- Update to 4.9.95 - Update to 4.9.95
* This is the first RC release for 4.10. Contains bugfixes * This is the first RC release for 4.10. Contains bugfixes
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Dec 1 20:13:33 UTC 2012 - tittiatcoke@gmail.com Sat Dec 1 20:13:33 UTC 2012 - tittiatcoke@gmail.com
- Update to 4.9.90 - Update to 4.9.90
* This is the second Beta release for 4.10. Contains bugfixes * This is the second Beta release for 4.10. Contains bugfixes
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Nov 24 13:00:19 UTC 2012 - tittiatcoke@gmail.com Sat Nov 24 13:00:19 UTC 2012 - tittiatcoke@gmail.com
@ -595,7 +605,7 @@ Wed Sep 5 12:04:25 UTC 2012 - dmueller@suse.com
- update to 4.9.1 - update to 4.9.1
* see http://kde.org/announcements/4.9.1/ for details * see http://kde.org/announcements/4.9.1/ for details
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 30 16:55:46 UTC 2012 - dmueller@suse.com Mon Jul 30 16:55:46 UTC 2012 - dmueller@suse.com
@ -645,7 +655,7 @@ Thu Jan 19 15:26:22 CET 2012 - dmueller@suse.de
- update to 4.8.0 - update to 4.8.0
* first stable release of KDE 4.8 (only critical fixes over 4.7.98) * first stable release of KDE 4.8 (only critical fixes over 4.7.98)
* see http://kde.org/announcements/4.8/ for details * see http://kde.org/announcements/4.8/ for details
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jan 3 22:06:01 CET 2012 - dmueller@suse.de Tue Jan 3 22:06:01 CET 2012 - dmueller@suse.de
@ -1113,7 +1123,7 @@ Fri Nov 19 17:20:07 CET 2010 - dmueller@suse.de
- update to 4.5.80 - update to 4.5.80
* KDE 4.6 Beta1 * KDE 4.6 Beta1
* no upstream changelog available. * no upstream changelog available.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 28 22:14:21 CEST 2010 - dmueller@suse.de Thu Oct 28 22:14:21 CEST 2010 - dmueller@suse.de
@ -1138,7 +1148,7 @@ Thu Jul 29 16:56:21 CEST 2010 - dmueller@suse.de
- update to 4.5.0 - update to 4.5.0
* KDE 4.5.0 final (version bump over RC3) * KDE 4.5.0 final (version bump over RC3)
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 24 00:05:20 CEST 2010 - dmueller@suse.de Sat Jul 24 00:05:20 CEST 2010 - dmueller@suse.de
@ -1146,7 +1156,7 @@ Sat Jul 24 00:05:20 CEST 2010 - dmueller@suse.de
- update to 4.4.95 - update to 4.4.95
* KDE 4.5 RC3 (not announced) * KDE 4.5 RC3 (not announced)
* critical fixes for 4.5.0 release * critical fixes for 4.5.0 release
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 16 18:21:44 CEST 2010 - dmueller@suse.de Fri Jul 16 18:21:44 CEST 2010 - dmueller@suse.de
@ -1474,7 +1484,7 @@ Thu May 1 18:44:43 CEST 2008 - dmueller@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Apr 25 17:33:14 CEST 2008 - dmueller@suse.de Fri Apr 25 17:33:14 CEST 2008 - dmueller@suse.de
- fix filelist - fix filelist
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 7 23:28:29 CEST 2008 - dmueller@suse.de Mon Apr 7 23:28:29 CEST 2008 - dmueller@suse.de
@ -1565,22 +1575,22 @@ Thu Nov 1 12:21:58 CET 2007 - dmueller@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 1 00:41:02 CET 2007 - dmueller@suse.de Thu Nov 1 00:41:02 CET 2007 - dmueller@suse.de
- fix free() call - fix free() call
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 26 13:37:04 CEST 2007 - dmueller@suse.de Fri Oct 26 13:37:04 CEST 2007 - dmueller@suse.de
- update to KDE 4.0 beta4 - update to KDE 4.0 beta4
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 18 11:02:40 CEST 2007 - dmueller@suse.de Thu Oct 18 11:02:40 CEST 2007 - dmueller@suse.de
- update to 3.94.1 - update to 3.94.1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 11 11:47:33 CEST 2007 - dmueller@suse.de Thu Oct 11 11:47:33 CEST 2007 - dmueller@suse.de
- update to KDE 4.0 Beta3 - update to KDE 4.0 Beta3
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 2 16:12:06 CEST 2007 - stbinner@suse.de Tue Oct 2 16:12:06 CEST 2007 - stbinner@suse.de
@ -1625,7 +1635,7 @@ Sun Jul 29 04:36:46 CEST 2007 - stbinner@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 18 13:40:23 CEST 2007 - dmueller@suse.de Wed Jul 18 13:40:23 CEST 2007 - dmueller@suse.de
- remove xmms-devel - remove xmms-devel
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 12 15:54:14 CEST 2007 - stbinner@suse.de Thu Jul 12 15:54:14 CEST 2007 - stbinner@suse.de

11
kgpg.spec
View File

@ -17,10 +17,10 @@
Name: kgpg Name: kgpg
Version: 16.12.3 Version: 17.03.80
Release: 0 Release: 0
%define kf5_version 5.26.0 %define kf5_version 5.26.0
# Latest stable Applications (e.g. 16.08 in KA, but 16.12.3 in KUA) # 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}')} %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
# It can only build on the same platforms as Qt Webengine # It can only build on the same platforms as Qt Webengine
ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64 ExclusiveArch: %ix86 x86_64 %arm aarch64 mips mips64
@ -31,9 +31,6 @@ Url: http://www.kde.org
Source0: kgpg-%{version}.tar.xz Source0: kgpg-%{version}.tar.xz
Patch1: kgpg-autostart.diff Patch1: kgpg-autostart.diff
Patch2: fix-build-gcc48.patch Patch2: fix-build-gcc48.patch
# The following patches are from upstream and added on the upstream maintainers request, see https://build.opensuse.org/request/show/448937
Patch3: 0002-Revert-Use-new-slot-syntax-for-KStandardAction-conne.patch
Patch4: 0003-Revert-Increase-KF5-requirement.patch
BuildRequires: akonadi-contact-devel BuildRequires: akonadi-contact-devel
%if 0%{?suse_version} > 1325 %if 0%{?suse_version} > 1325
BuildRequires: libboost_headers-devel BuildRequires: libboost_headers-devel
@ -69,9 +66,7 @@ Kgpg is a simple GUI for gpg
%prep %prep
%setup -q -n kgpg-%{version} %setup -q -n kgpg-%{version}
%patch1 %patch1
%patch2 -p1 #patch2 -p1
%patch3 -p1
%patch4 -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build