diff --git a/.gitignore b/.gitignore index 47f1ae1..f752d0c 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /kgpg-23.08.1.tar.xz /kgpg-23.08.2.tar.xz /kgpg-24.01.80.tar.xz +/kgpg-24.01.85.tar.xz diff --git a/24.01.80-kgpg-qt6.patch b/24.01.80-kgpg-qt6.patch index 12a6a0b..1db5e8c 100644 --- a/24.01.80-kgpg-qt6.patch +++ b/24.01.80-kgpg-qt6.patch @@ -1,7 +1,7 @@ -From 8aad7bc25f209a325d52d94afdf8671136525757 Mon Sep 17 00:00:00 2001 +From 6d1e24e246a998882fa9e61455d41d6581ebb5ec Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 13 Nov 2023 14:26:04 +0100 -Subject: [PATCH 1/8] Port to Qt6 +Subject: [PATCH 1/9] Port to Qt6 --- CMakeLists.txt | 20 ++++++++++++++++++-- @@ -16,7 +16,7 @@ Subject: [PATCH 1/8] Port to Qt6 9 files changed, 34 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9d4897af..a5cdc2da 100644 +index f8cf2bd3..41df1dd7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,8 +64,13 @@ find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED @@ -222,10 +222,10 @@ index 12b05314..3674c42d 100644 GitLab -From cc87fd7749c9659b732e373e40c6c1957ad14782 Mon Sep 17 00:00:00 2001 +From 4f737a0d20f9c5d8b05d0b6fe9abb5bdb05eba1f Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Wed, 13 Dec 2023 16:02:05 +0100 -Subject: [PATCH 2/8] Port from qAsConst to std::as_const +Subject: [PATCH 2/9] Port from qAsConst to std::as_const --- caff.cpp | 4 ++-- @@ -443,10 +443,10 @@ index b9d0de55..06d903a7 100644 GitLab -From 036c1941c8ed30dbe6e1f4d7e5cd468e9ac6f42a Mon Sep 17 00:00:00 2001 +From 93c3c1732d8387812be5fdc346b116c30fadc379 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Wed, 13 Dec 2023 16:07:55 +0100 -Subject: [PATCH 3/8] Port away from QNetworkConfigurationManager +Subject: [PATCH 3/9] Port away from QNetworkConfigurationManager --- keysmanager.cpp | 19 ++++++++++--------- @@ -502,10 +502,10 @@ index 5decbb6a..63126604 100644 GitLab -From 1c2bd55a35ba96f143f250d899319a46601c600a Mon Sep 17 00:00:00 2001 +From a836a00f88a887a8540f9a146fe0014238195853 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Wed, 13 Dec 2023 16:44:28 +0100 -Subject: [PATCH 4/8] Port away from last questionYesNo and QTextCodec usage +Subject: [PATCH 4/9] Port away from last questionYesNo and QTextCodec usage --- CMakeLists.txt | 79 +++++++++++++++-------------------------- @@ -520,7 +520,7 @@ Subject: [PATCH 4/8] Port away from last questionYesNo and QTextCodec usage 9 files changed, 79 insertions(+), 104 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a5cdc2da..6020f051 100644 +index 41df1dd7..07b92c5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,25 +26,22 @@ include(CMakeFindDependencyMacro) @@ -1047,10 +1047,10 @@ index f98da36e..a5519eae 100644 GitLab -From 438242fc3c1d333c164c5c042d2234aeb8c999f0 Mon Sep 17 00:00:00 2001 +From b51c36d2a1df0aab52c34f6b47689f1b04402e94 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Wed, 13 Dec 2023 16:51:53 +0100 -Subject: [PATCH 5/8] Port away from tips of day +Subject: [PATCH 5/9] Port away from tips of day Not possible anymore with kf6 --- @@ -1064,7 +1064,7 @@ Not possible anymore with kf6 delete mode 100644 tips diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6020f051..f4cc515d 100644 +index 07b92c5e..f78c220d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -287,7 +287,6 @@ install(TARGETS kgpg ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ) @@ -1315,10 +1315,10 @@ index 6b977468..00000000 GitLab -From 253351da783055e7222d1bff344a53e6d4cb6a3d Mon Sep 17 00:00:00 2001 +From 5db1503b894242d21dd5f0e56cbe3e0b40d6b43a Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Wed, 13 Dec 2023 16:52:13 +0100 -Subject: [PATCH 6/8] Port away from deprecated QVariant api +Subject: [PATCH 6/9] Port away from deprecated QVariant api --- model/keylistproxymodel.cpp | 2 +- @@ -1341,28 +1341,26 @@ index d62d2cd9..48bfa6aa 100644 GitLab -From d1627b0c980221d2f1d6d5f136cab6d30cc176b4 Mon Sep 17 00:00:00 2001 +From e2e135f769f716be4cfc84b81d9362d4d7cb71ad Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Thu, 14 Dec 2023 01:03:44 +0100 -Subject: [PATCH 7/8] Adapt ci script +Subject: [PATCH 7/9] Adapt ci script --- - .gitlab-ci.yml | 6 ++++-- + .gitlab-ci.yml | 4 ++-- .kde-ci.yml | 43 ++++++++++++++++++++++--------------------- - 2 files changed, 26 insertions(+), 23 deletions(-) + 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index f9680a11..f6e2f69c 100644 +index 9451fad4..f6e2f69c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml -@@ -2,5 +2,7 @@ - # SPDX-License-Identifier: CC0-1.0 - +@@ -4,5 +4,5 @@ include: -- - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml -- - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml -+ - project: sysadmin/ci-utilities -+ file: + - project: sysadmin/ci-utilities + file: +- - /gitlab-templates/linux.yml +- - /gitlab-templates/freebsd.yml + - /gitlab-templates/linux-qt6.yml + - /gitlab-templates/freebsd-qt6.yml diff --git a/.kde-ci.yml b/.kde-ci.yml @@ -1423,10 +1421,10 @@ index b40e9bda..7bed6b8b 100644 GitLab -From 72085c108df2f8766daa6613332377e7b20ec974 Mon Sep 17 00:00:00 2001 +From 1406478fb86b84ae5241690b687edfe56aa3f6bb Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Thu, 14 Dec 2023 01:04:14 +0100 -Subject: [PATCH 8/8] Cleanup from qt6 port +Subject: [PATCH 8/9] Cleanup from qt6 port --- transactions/kgpgaddphoto.cpp | 1 - @@ -1447,3 +1445,32 @@ index b711f298..cb91cffa 100644 -- GitLab + +From 2c03aa7b0feb70c9a0061e1abec6fc4c6fb43983 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella +Date: Tue, 19 Dec 2023 21:21:00 +0100 +Subject: [PATCH 9/9] Create window handles before accessing + +--- + keysmanager.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/keysmanager.cpp b/keysmanager.cpp +index cabd662c..df5d63d2 100644 +--- a/keysmanager.cpp ++++ b/keysmanager.cpp +@@ -2622,9 +2622,11 @@ KeysManager::setupTrayIcon() + + switch (KGpgSettings::leftClick()) { + case KGpgSettings::EnumLeftClick::Editor: ++ s_kgpgEditor->winId(); // create windowHandle + m_trayicon->setAssociatedWindow(s_kgpgEditor->windowHandle()); + break; + case KGpgSettings::EnumLeftClick::KeyManager: ++ winId(); // create windowHandle + m_trayicon->setAssociatedWindow(windowHandle()); + break; + } +-- +GitLab + diff --git a/kgpg.spec b/kgpg.spec index ee455a4..7b75448 100644 --- a/kgpg.spec +++ b/kgpg.spec @@ -1,6 +1,6 @@ Name: kgpg Summary: Manage GPG encryption keys -Version: 24.01.80 +Version: 24.01.85 Release: 1%{?dist} License: CC0-1.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LicenseRef-KDE-Accepted-GPL @@ -124,6 +124,9 @@ desktop-file-validate %{buildroot}%{_kf6_datadir}/applications/org.kde.%{name}.d %changelog +* Sat Dec 23 2023 ales.astone@gmail.com - 24.01.85-1 +- 24.01.85 + * Fri Dec 15 2023 Steve Cossette - 24.01.80-1 - 24.01.80 diff --git a/sources b/sources index e5b44b1..955a5b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kgpg-24.01.80.tar.xz) = ad19fa5f33dd1995afb0f4eb9adc3fe6224ab48da95f36b791c98bf2e6873548b0a1ad56e2374f281ac09413dbab1d82c43f5c7963482fec9c74c7bbf7cdcec1 +SHA512 (kgpg-24.01.85.tar.xz) = 9772b8c60a5a4e0610fa04b21f205acc2f3d7606854ef92b70405aa97762aa76a7261cb17e4440be93f855883cc8c5a111df29bf171f1066075cf5f24ea31393