[packages/ka6-kdeconnect-kde] - compilation fix (patch from Mageia) - more BRs - rel 2
witekfl
witekfl at pld-linux.org
Thu May 1 11:33:26 CEST 2025
commit 64fe3f35b751552de9d902590c5fbd73c5056077
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date: Thu May 1 10:30:46 2025 +0200
- compilation fix (patch from Mageia)
- more BRs
- rel 2
ka6-kdeconnect-kde.spec | 10 +++++++---
kdeconnect-kde-fix-i686-build.patch | 12 ++++++++++++
2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/ka6-kdeconnect-kde.spec b/ka6-kdeconnect-kde.spec
index 98e185e..43efc0d 100644
--- a/ka6-kdeconnect-kde.spec
+++ b/ka6-kdeconnect-kde.spec
@@ -8,12 +8,14 @@
Summary: KDE Connect - desktop app
Name: ka6-%{kaname}
Version: 25.04.0
-Release: 1
+Release: 2
License: BSD 3 Clause/GPL v2/GPL v3
Group: X11/Libraries
Source0: https://download.kde.org/stable/release-service/%{kdeappsver}/src/%{kaname}-%{version}.tar.xz
# Source0-md5: d9321b75100f9fb48fbc95a78ae60733
+Patch0: kdeconnect-kde-fix-i686-build.patch
URL: http://www.kde.org/
+BuildRequires: ModemManager-devel
BuildRequires: Qt6Bluetooth-devel
BuildRequires: Qt6Core-devel >= 5.15.2
BuildRequires: Qt6DBus-devel >= 5.15.2
@@ -25,10 +27,10 @@ BuildRequires: Qt6Quick-devel
BuildRequires: Qt6Test-devel
BuildRequires: Qt6WaylandClient-devel
BuildRequires: cmake >= 3.20
+BuildRequires: docbook-dtd45-xml
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel
-BuildRequires: gettext-devel
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
BuildRequires: kf6-extra-cmake-modules >= 5.93.0
BuildRequires: kf6-kauth-devel >= 5.93.0
BuildRequires: kf6-kcmutils-devel >= 5.101.0
@@ -51,6 +53,7 @@ BuildRequires: kf6-modemmanager-qt-devel >= 5.101.0
BuildRequires: kf6-pulseaudio-qt-devel >= 1.4.0
BuildRequires: kf6-qqc2-desktop-style-devel >= 5.101.0
BuildRequires: kf6-solid-devel >= 5.101.0
+BuildRequires: kirigami-addons-devel
BuildRequires: libfakekey-devel
BuildRequires: ninja
BuildRequires: plasma-wayland-protocols-devel
@@ -106,6 +109,7 @@ Dane dla %{kaname}.
%prep
%setup -q -n %{kaname}-%{version}
+%patch -P0 -p1
%build
%cmake \
diff --git a/kdeconnect-kde-fix-i686-build.patch b/kdeconnect-kde-fix-i686-build.patch
new file mode 100644
index 0000000..bafebfc
--- /dev/null
+++ b/kdeconnect-kde-fix-i686-build.patch
@@ -0,0 +1,12 @@
+diff -Nrup a/core/backends/bluetooth/multiplexchannel.cpp b/core/backends/bluetooth/multiplexchannel.cpp
+--- a/core/backends/bluetooth/multiplexchannel.cpp 2025-03-27 11:08:15.000000000 +0100
++++ b/core/backends/bluetooth/multiplexchannel.cpp 2025-03-31 21:53:25.760515715 +0200
+@@ -52,7 +52,7 @@ qint64 MultiplexChannel::bytesToWrite()
+ qint64 MultiplexChannel::readData(char *data, qint64 maxlen)
+ {
+ if (maxlen <= state->read_buffer.size() || state->read_buffer.size() > 0) {
+- const auto num_to_read = std::min(maxlen, state->read_buffer.size());
++ const auto num_to_read = std::min<qint64>(maxlen, state->read_buffer.size());
+ std::memcpy(data, state->read_buffer.data(), num_to_read);
+ state->read_buffer.remove(0, num_to_read);
+ Q_EMIT state->readAvailable();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ka6-kdeconnect-kde.git/commitdiff/64fe3f35b751552de9d902590c5fbd73c5056077
More information about the pld-cvs-commit
mailing list