From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdeconnect/files/
Date: Sun, 13 Aug 2023 14:43:54 +0000 (UTC) [thread overview]
Message-ID: <1691937812.d6713be0a6c8c49a4a3bd9ef55bbdb85f4148870.asturm@gentoo> (raw)
commit: d6713be0a6c8c49a4a3bd9ef55bbdb85f4148870
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Aug 13 13:37:59 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 14:43:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6713be0
kde-misc/kdeconnect: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/32288
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...-explicit-constructor-for-QSslCertificate.patch | 35 ----------------
.../kdeconnect-23.04.2-fix-desktop-file.patch | 49 ----------------------
2 files changed, 84 deletions(-)
diff --git a/kde-misc/kdeconnect/files/kdeconnect-23.04.1-explicit-constructor-for-QSslCertificate.patch b/kde-misc/kdeconnect/files/kdeconnect-23.04.1-explicit-constructor-for-QSslCertificate.patch
deleted file mode 100644
index eabdc4b5d7f2..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-23.04.1-explicit-constructor-for-QSslCertificate.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bbac0aa0852b14bc5cc9a1b8c3be0f55adda2428 Mon Sep 17 00:00:00 2001
-From: Ali Abdel-Qader <abdelqaderali@protonmail.com>
-Date: Sat, 6 May 2023 15:51:53 -0400
-Subject: [PATCH] Use explicit constructor for QSslCertificate with value
- initialized argument
-
-Previously the BluetoothDeviceLink::certificate() method was returning a
-value initialized object which I believe default initializes the object.
-However, Clang throws a build error at this because QSslCertificate has
-explicit constructors. This change uses one of those constructors and
-uses value intialization to default construct/initialize the argument
-for it. It fixes the build and hopefully doesn't break anything since
-this is a TODO anyways!
-
-BUG: 469428
-
-Signed-off-by: Ali Abdel-Qader <abdelqaderali@protonmail.com>
----
- core/backends/bluetooth/bluetoothdevicelink.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/backends/bluetooth/bluetoothdevicelink.cpp b/core/backends/bluetooth/bluetoothdevicelink.cpp
-index 1ab401fc9..facf5deed 100644
---- a/core/backends/bluetooth/bluetoothdevicelink.cpp
-+++ b/core/backends/bluetooth/bluetoothdevicelink.cpp
-@@ -99,5 +99,5 @@ void BluetoothDeviceLink::dataReceived()
-
- QSslCertificate BluetoothDeviceLink::certificate() const
- {
-- return {}; // TODO Not sure what to do here. For LanDeviceLink we use the SSL connection's certificate, but we don't have that here
-+ return QSslCertificate({}); // TODO Not sure what to do here. For LanDeviceLink we use the SSL connection's certificate, but we don't have that here
- }
---
-GitLab
-
diff --git a/kde-misc/kdeconnect/files/kdeconnect-23.04.2-fix-desktop-file.patch b/kde-misc/kdeconnect/files/kdeconnect-23.04.2-fix-desktop-file.patch
deleted file mode 100644
index 6e03415d60de..000000000000
--- a/kde-misc/kdeconnect/files/kdeconnect-23.04.2-fix-desktop-file.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 276c2f1334345071eaeef9aea87c96cdd199f8f0 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sun, 11 Jun 2023 19:56:59 +0200
-Subject: [PATCH] Fix kdeconnect_open desktop file type
-
-It's an application, not a service
-
-Also don't make it executable, it's not needed
-
-BUG: 424782
-(cherry picked from commit 7569a6ceffc6fc169186e401d33ce1f2049ec5e4)
----
- data/CMakeLists.txt | 2 +-
- data/org.kde.kdeconnect_open.desktop | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index 5d673f0ab..6d3621f29 100644
---- a/data/CMakeLists.txt
-+++ b/data/CMakeLists.txt
-@@ -1,6 +1,6 @@
- install (FILES "kdeconnect.contract" DESTINATION ${KDE_INSTALL_DATADIR}/contractor/)
- install (FILES "kdeconnect-thunar.desktop" DESTINATION ${KDE_INSTALL_DATADIR}/Thunar/sendto/)
--install(PROGRAMS org.kde.kdeconnect_open.desktop DESTINATION ${KDE_INSTALL_APPDIR})
-+install(FILES org.kde.kdeconnect_open.desktop DESTINATION ${KDE_INSTALL_APPDIR})
- install (FILES "kdeconnect-dde.desktop" DESTINATION ${KDE_INSTALL_DATADIR}/deepin/dde-file-manager/oem-menuextensions/)
-
- if(NOT SAILFISHOS)
-diff --git a/data/org.kde.kdeconnect_open.desktop b/data/org.kde.kdeconnect_open.desktop
-index 03de93ef6..110dc2f67 100644
---- a/data/org.kde.kdeconnect_open.desktop
-+++ b/data/org.kde.kdeconnect_open.desktop
-@@ -1,4 +1,5 @@
- [Desktop Entry]
-+Type=Application
- GenericName=Open on connected device via KDE Connect
- GenericName[ar]=افتح في الجهاز المتصل عبر «كِيدِي المتّصل»
- GenericName[az]=Connectd cihazında KDE Connect ilə açın
-@@ -128,7 +129,6 @@ Comment[zh_TW]=使用 KDE 連線於連線裝置中開啟
- MimeType=application/octet-stream;
- Exec=kdeconnect-handler --open %U
- Icon=kdeconnect
--Type=Service
- Terminal=false
- Categories=Qt;KDE;Network;
- X-KDE-FormFactor=desktop;tablet;handset;
---
-GitLab
-
next reply other threads:[~2023-08-13 14:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-13 14:43 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-17 21:50 [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdeconnect/files/ Andreas Sturmlechner
2024-09-10 19:27 Andreas Sturmlechner
2023-12-28 1:03 Conrad Kostecki
2020-11-28 14:12 Andreas Sturmlechner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1691937812.d6713be0a6c8c49a4a3bd9ef55bbdb85f4148870.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox