Control: tags 1127912 + patch
Control: tags 1127912 + pending

Dear maintainer,

I've prepared an NMU for copyq (versioned as 13.0.0-1.1) and uploaded
it to DELAYED/2. Please feel free to tell me if I should cancel it.

cu
Adrian
diffstat for copyq-13.0.0 copyq-13.0.0

 changelog                                            |    9 ++++++
 control                                              |    2 -
 patches/0001-Fix-typo.-QT_VERSION-is-undefined.patch |   26 +++++++++++++++++++
 patches/series                                       |    1 
 4 files changed, 37 insertions(+), 1 deletion(-)

diff -Nru copyq-13.0.0/debian/changelog copyq-13.0.0/debian/changelog
--- copyq-13.0.0/debian/changelog	2025-11-10 18:17:53.000000000 +0200
+++ copyq-13.0.0/debian/changelog	2026-03-24 13:23:34.000000000 +0200
@@ -1,3 +1,12 @@
+copyq (13.0.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Backport upstream fix for FTBFS with Qt 6.10. (Closes: #1127912)
+  * Update the build dependency from qt6-wayland-dev-tools
+    to qt6-base-dev-tools.
+
+ -- Adrian Bunk <[email protected]>  Tue, 24 Mar 2026 13:23:34 +0200
+
 copyq (13.0.0-1) unstable; urgency=medium
 
   * New upstream version 13.0.0
diff -Nru copyq-13.0.0/debian/control copyq-13.0.0/debian/control
--- copyq-13.0.0/debian/control	2025-11-10 18:12:44.000000000 +0200
+++ copyq-13.0.0/debian/control	2026-03-24 13:23:34.000000000 +0200
@@ -13,6 +13,7 @@
  libwayland-dev,
  libxfixes-dev,
  libxtst-dev,
+ qt6-base-dev-tools (>= 6.10.2+dfsg-1),
  qt6-base-private-dev,
  qt6-declarative-dev,
  qt6-svg-dev,
@@ -20,7 +21,6 @@
  qt6-tools-dev-tools,
  qt6-wayland,
  qt6-wayland-dev,
- qt6-wayland-dev-tools,
 Build-Depends-Indep:
  dh-sequence-sphinxdoc,
  python3-sphinx,
diff -Nru copyq-13.0.0/debian/patches/0001-Fix-typo.-QT_VERSION-is-undefined.patch copyq-13.0.0/debian/patches/0001-Fix-typo.-QT_VERSION-is-undefined.patch
--- copyq-13.0.0/debian/patches/0001-Fix-typo.-QT_VERSION-is-undefined.patch	1970-01-01 02:00:00.000000000 +0200
+++ copyq-13.0.0/debian/patches/0001-Fix-typo.-QT_VERSION-is-undefined.patch	2026-03-24 11:34:03.000000000 +0200
@@ -0,0 +1,26 @@
+From 5bd157c3bf6127f33c4c8a16c28140b6cd171ed1 Mon Sep 17 00:00:00 2001
+From: "Jason E. Hale" <[email protected]>
+Date: Mon, 1 Dec 2025 04:43:23 -0500
+Subject: Fix typo. QT_VERSION is undefined.
+
+We must test for Qt6_VERSION here.
+---
+ src/platform/x11/x11platform.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/platform/x11/x11platform.cmake b/src/platform/x11/x11platform.cmake
+index c23f172d..4c824d07 100644
+--- a/src/platform/x11/x11platform.cmake
++++ b/src/platform/x11/x11platform.cmake
+@@ -39,7 +39,7 @@ if (WITH_X11)
+     set(copyq_LIBRARIES ${copyq_LIBRARIES} ${X11_LIBRARIES} ${X11_Xfixes_LIB})
+ 
+     if(WITH_QT6)
+-        if (QT_VERSION VERSION_GREATER_EQUAL "6.10.0")
++        if (Qt6_VERSION VERSION_GREATER_EQUAL "6.10.0")
+             find_package(${copyq_qt} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS GuiPrivate)
+         endif()
+         list(APPEND copyq_LIBRARIES Qt::GuiPrivate)
+-- 
+2.47.3
+
diff -Nru copyq-13.0.0/debian/patches/series copyq-13.0.0/debian/patches/series
--- copyq-13.0.0/debian/patches/series	1970-01-01 02:00:00.000000000 +0200
+++ copyq-13.0.0/debian/patches/series	2026-03-24 13:23:34.000000000 +0200
@@ -0,0 +1 @@
+0001-Fix-typo.-QT_VERSION-is-undefined.patch

Reply via email to