public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/kde-connect] epel10: Merge branch f44 into epel10
Date: Thu, 30 Jul 2026 15:42:20 GMT	[thread overview]
Message-ID: <178542614093.1.360321881559202181.rpms-kde-connect-6c6011cb0d8f@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/kde-connect
Branch : epel10
Commit : 6c6011cb0d8f5bfd658ff564eb22290e3e0adda6
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-07-30T08:41:58-07:00
Stats  : +96/-3 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/kde-connect/c/6c6011cb0d8f5bfd658ff564eb22290e3e0adda6?branch=epel10

Log:
Merge branch f44 into epel10

---
diff --git a/.gitignore b/.gitignore
index f7b51dd..7b8a656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,3 +90,8 @@
 /kdeconnect-kde-25.12.1.tar.xz
 /kdeconnect-kde-25.12.2.tar.xz
 /kdeconnect-kde-25.12.3.tar.xz
+/kdeconnect-kde-26.03.80.tar.xz
+/kdeconnect-kde-26.04.0.tar.xz
+/kdeconnect-kde-26.04.1.tar.xz
+/kdeconnect-kde-26.04.2.tar.xz
+/kdeconnect-kde-26.04.3.tar.xz

diff --git a/988.patch b/988.patch
new file mode 100644
index 0000000..69ef47e
--- /dev/null
+++ b/988.patch
@@ -0,0 +1,61 @@
+From ccef6f0bea8f09d4fca8f99a2b04223eecbe6f15 Mon Sep 17 00:00:00 2001
+From: Hadi Chokr <hadichokr@icloud.com>
+Date: Tue, 30 Jun 2026 13:32:01 +0200
+Subject: [PATCH] core: fix build against OpenSSL 4.0 (constified
+ X509_get_subject_name)
+
+---
+ core/sslhelper.cpp | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/core/sslhelper.cpp b/core/sslhelper.cpp
+index c3bb90452..34c6d3676 100644
+--- a/core/sslhelper.cpp
++++ b/core/sslhelper.cpp
+@@ -169,32 +169,37 @@ QSslCertificate generateSelfSignedCertificate(const QSslKey &qtPrivateKey, const
+     }
+ 
+     // Set the certificate subject and issuer (self-signed).
+-    auto name = X509_get_subject_name(x509.get());
++    auto name = std::unique_ptr<X509_NAME, decltype(&::X509_NAME_free)>(X509_NAME_new(), ::X509_NAME_free);
++    if (!name) {
++        qCWarning(KDECONNECT_CORE) << "Generate Self Signed Certificate failed to allocate name structure " << getSslError();
++        return QSslCertificate();
++    }
++
+     QByteArray commonNameBytes = commonName.toLatin1();
+     const unsigned char *commonNameCStr = reinterpret_cast<const unsigned char *>(commonNameBytes.data());
+-    if (!X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, commonNameCStr, -1, -1, 0)) { // Common Name
++    if (!X509_NAME_add_entry_by_txt(name.get(), "CN", MBSTRING_ASC, commonNameCStr, -1, -1, 0)) { // Common Name
+         qCWarning(KDECONNECT_CORE) << "Generate Self Signed Certificate failed to set common name to " << commonName << " " << getSslError();
+         return QSslCertificate();
+     }
+ 
+     const unsigned char *organizationCStr = reinterpret_cast<const unsigned char *>("KDE");
+-    if (!X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, organizationCStr, -1, -1, 0)) { // Organization
++    if (!X509_NAME_add_entry_by_txt(name.get(), "O", MBSTRING_ASC, organizationCStr, -1, -1, 0)) { // Organization
+         qCWarning(KDECONNECT_CORE) << "Generate Self Signed Certificate failed to set organization " << getSslError();
+         return QSslCertificate();
+     }
+ 
+     const unsigned char *organizationalUnitCStr = reinterpret_cast<const unsigned char *>("KDE Connect");
+-    if (!X509_NAME_add_entry_by_txt(name, "OU", MBSTRING_ASC, organizationalUnitCStr, -1, -1, 0)) { // Organizational Unit
++    if (!X509_NAME_add_entry_by_txt(name.get(), "OU", MBSTRING_ASC, organizationalUnitCStr, -1, -1, 0)) { // Organizational Unit
+         qCWarning(KDECONNECT_CORE) << "Generate Self Signed Certificate failed to set organizational unit " << getSslError();
+         return QSslCertificate();
+     }
+ 
+-    if (!X509_set_subject_name(x509.get(), name)) {
++    if (!X509_set_subject_name(x509.get(), name.get())) {
+         qCWarning(KDECONNECT_CORE) << "Generate Self Signed Certificate failed to set subject name" << getSslError();
+         return QSslCertificate();
+     }
+ 
+-    if (!X509_set_issuer_name(x509.get(), name)) {
++    if (!X509_set_issuer_name(x509.get(), name.get())) {
+         qCWarning(KDECONNECT_CORE) << "Generate Self Signed Certificate failed to set issuer name" << getSslError();
+         return QSslCertificate();
+     }
+-- 
+GitLab
+

diff --git a/kde-connect.spec b/kde-connect.spec
index 5059663..237d9e0 100644
--- a/kde-connect.spec
+++ b/kde-connect.spec
@@ -1,7 +1,7 @@
 %global base_name kdeconnect-kde
 
 Name:    kde-connect
-Version: 25.12.3
+Version: 26.04.3
 Release: 1%{?dist}
 License: GPL-2.0-or-later
 Summary: KDE Connect client for communication with smartphones
@@ -14,6 +14,9 @@ Source0: https://download.kde.org/%{stable_kf6}/release-service/%{version}/src/%
 ExcludeArch: %{ix86}
 
 ## upstream patches
+# Fix build against OpenSSL 4.0
+# https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/988
+Patch0:         988.patch
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
@@ -22,7 +25,7 @@ BuildRequires:  libappstream-glib
 BuildRequires:  firewalld-filesystem
 BuildRequires:  pkgconfig(xkbcommon)
 BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(openssl)
+BuildRequires:  openssl-devel
 
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf6-rpm-macros
@@ -67,6 +70,8 @@ BuildRequires:  cmake(KF6PulseAudioQt)
 
 BuildRequires:  libXtst-devel
 BuildRequires:  pkgconfig(libfakekey)
+BuildRequires:  pkgconfig(libei-1.0)
+BuildRequires:  pkgconfig(libevdev)
 
 Obsoletes: kde-connect-kde4-ioslave < %{version}-%{release}
 Obsoletes: kde-connect-kde4-libs < %{version}-%{release}
@@ -178,6 +183,7 @@ done
 %{_qt6_archdatadir}/qml/org/kde/kdeconnect/
 
 %files -n kdeconnectd
+%{_kf6_libdir}/udev/rules.d/40-kdeconnect-uinput.rules
 %{_sysconfdir}/xdg/autostart/org.kde.kdeconnect.daemon.desktop
 %{_datadir}/applications/org.kde.kdeconnect.daemon.desktop
 %{_kf6_bindir}/kdeconnectd
@@ -192,6 +198,27 @@ done
 
 
 %changelog
+* Tue Jun 30 2026 Steve Cossette <farchord@gmail.com> - 26.04.3-1
+- 26.04.3
+
+* Fri Jun 12 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 26.04.2-2
+- Rebuilt for openssl 4.0
+
+* Wed Jun 03 2026 Steve Cossette <farchord@gmail.com> - 26.04.2-1
+- 26.04.2
+
+* Wed May 06 2026 Steve Cossette <farchord@gmail.com> - 26.04.1-1
+- 26.04.1
+
+* Thu Apr 16 2026 Jan Grulich <jgrulich@redhat.com> - 26.04.0-2
+- Rebuild (qt6)
+
+* Sat Apr 11 2026 Steve Cossette <farchord@gmail.com> - 26.04.0-1
+- 26.04.0
+
+* Mon Mar 16 2026 Steve Cossette <farchord@gmail.com> - 26.03.80-1
+- 26.03.80
+
 * Sun Mar 08 2026 Steve Cossette <farchord@gmail.com> - 25.12.3-1
 - 25.12.3
 

diff --git a/sources b/sources
index d76e41b..e055edc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kdeconnect-kde-25.12.3.tar.xz) = 1cc9f0d31066ef7d2d27df02743ba631307d48b490ca057186b3eaefadc9806ce00b09b89336bb94451eb1eb96f4d8751ad7bb73dfa83c0f92d07c077ca2d8c3
+SHA512 (kdeconnect-kde-26.04.3.tar.xz) = f8d575310e48b2daf6bd354a4731618e27c602903e4e7f1b4e9c07c28e7e6c701b3ff4bdc61fc6c7061f790f5996592cf89fe6c527c699fb4c24a800513fc42c

                 reply	other threads:[~2026-07-30 15:42 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=178542614093.1.360321881559202181.rpms-kde-connect-6c6011cb0d8f@fedoraproject.org \
    --to=tdawson@redhat.com \
    --cc=git-commits@fedoraproject.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