[packages/copyq] up to 13.0.0

atler atler at pld-linux.org
Wed Oct 22 20:23:12 CEST 2025


commit ba0a609772af6fa450a6b08524835bd482efd131
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Oct 22 20:16:53 2025 +0200

    up to 13.0.0
    
    upstream fix for build failure with qt6 6.10 from:
    https://github.com/hluk/CopyQ/pull/3268

 copyq.spec     | 14 +++++++-------
 qt6-6.10.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 7 deletions(-)
---
diff --git a/copyq.spec b/copyq.spec
index 009b8bf..1b76bae 100644
--- a/copyq.spec
+++ b/copyq.spec
@@ -7,13 +7,14 @@
 
 Summary:	Advanced clipboard manager with editing and scripting features
 Name:		copyq
-Version:	12.0.1
+Version:	13.0.0
 Release:	1
 License:	GPL v3+
 Group:		X11/Applications
 Source0:	https://github.com/hluk/CopyQ/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	4ed846cc7f96af5f94f2f2b051691c47
+# Source0-md5:	51fc587e3452ac0fd08dabb1e58c29b3
 Patch0:		%{name}-plugindir.patch
+Patch1:		qt6-6.10.patch
 URL:		https://hluk.github.io/CopyQ/
 %if %{without qt6}
 BuildRequires:	Qt5Core-devel >= %{qt5ver}
@@ -39,7 +40,7 @@ BuildRequires:	Qt6Widgets-devel >= %{qt6ver}
 BuildRequires:	Qt6Xml-devel >= %{qt6ver}
 BuildRequires:	qt6-linguist
 %endif
-BuildRequires:	cmake >= 3.13
+BuildRequires:	cmake >= 3.16
 BuildRequires:	kf5-extra-cmake-modules
 BuildRequires:	libstdc++-devel >= 6:7
 BuildRequires:	libxcb-devel
@@ -94,15 +95,14 @@ Bash completion for CopyQ.
 %prep
 %setup -q -n CopyQ-%{version}
 %patch -P0 -p1
+%patch -P1 -p1
 
 %build
-install -d build
-cd build
-%cmake .. \
+%cmake -B build \
 	-DWITH_NATIVE_NOTIFICATIONS:BOOL=OFF \
 	%{cmake_on_off qt6 WITH_QT6} \
 	-DDATA_INSTALL_PREFIX:PATH=%{_datadir}
-%{__make}
+%{__make} -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/qt6-6.10.patch b/qt6-6.10.patch
new file mode 100644
index 0000000..833eb03
--- /dev/null
+++ b/qt6-6.10.patch
@@ -0,0 +1,31 @@
+From 775f1f8e8cc6930329c16a3dea625d914a50dcb0 Mon Sep 17 00:00:00 2001
+From: BlackEagle <ike.devolder at gmail.com>
+Date: Wed, 22 Oct 2025 12:21:09 +0200
+Subject: [PATCH] when Qt6 is used make sure cmake variables are there
+
+When using `WITH_QT6` use
+`find_package(QT REQUIRED COMPONENTS Core NAMES Qt6)`
+to make sure the QT related cmake variables are there. There is a use of
+the variable `QT_VERSION` further down the line while checking for
+Qt::GuiPrivate in the `src/platform/x11/x11platform.cmake` file.
+
+This change makes that check work properly so we can build with Qt6 >=
+6.10.
+
+Signed-off-by: BlackEagle <ike.devolder at gmail.com>
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0661ddf5ae..3f62bbd1fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -45,6 +45,7 @@ set(CMAKE_AUTOMOC ON)
+ 
+ OPTION(WITH_QT6 "Enable Qt 6" ON)
+ if (WITH_QT6)
++    find_package(QT REQUIRED COMPONENTS Core NAMES Qt6)
+     set(QT_DEFAULT_MAJOR_VERSION 6)
+     find_package(Qt6Widgets 6.1.0 REQUIRED)
+     set(copyq_qt Qt6)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/copyq.git/commitdiff/ba0a609772af6fa450a6b08524835bd482efd131



More information about the pld-cvs-commit mailing list