diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-08-13 18:10:57 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-13 18:10:57 +0100 |
commit | 40c113c340752d507394d37cd6b60abb741daed0 (patch) | |
tree | 27156f8941e9311cbff3d2b4277ba98bf1eb9b7d /kde-misc/kdeconnect/files | |
parent | 9574298151cf44a3b410bdb7a7076e7bed72570d (diff) |
gentoo auto-resync : 13:08:2023 - 18:10:57
Diffstat (limited to 'kde-misc/kdeconnect/files')
-rw-r--r-- | kde-misc/kdeconnect/files/kdeconnect-23.04.1-explicit-constructor-for-QSslCertificate.patch | 35 | ||||
-rw-r--r-- | kde-misc/kdeconnect/files/kdeconnect-23.04.2-fix-desktop-file.patch | 49 |
2 files changed, 0 insertions, 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 - |