[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1112898: fcitx-qimpanel: diff for NMU version 2.1.3-2.1



Control: tags 1112898 + patch
Control: tags 1112898 + pending

Dear maintainer,

I've prepared an NMU for fcitx-qimpanel (versioned as 2.1.3-2.1) and 
uploaded it to DELAYED/14. Please feel free to tell me if I should 
cancel it.

cu
Adrian
diffstat for fcitx-qimpanel-2.1.3 fcitx-qimpanel-2.1.3

 changelog             |    7 +++++++
 patches/cmake-4.patch |   30 ++++++++++++++++++++++++++++++
 patches/series        |    1 +
 3 files changed, 38 insertions(+)

diff -Nru fcitx-qimpanel-2.1.3/debian/changelog fcitx-qimpanel-2.1.3/debian/changelog
--- fcitx-qimpanel-2.1.3/debian/changelog	2018-10-23 04:16:37.000000000 +0300
+++ fcitx-qimpanel-2.1.3/debian/changelog	2025-10-24 16:35:16.000000000 +0300
@@ -1,3 +1,10 @@
+fcitx-qimpanel (2.1.3-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS with CMake 4. (Closes: #1112898)
+
+ -- Adrian Bunk <bunk@debian.org>  Fri, 24 Oct 2025 16:35:16 +0300
+
 fcitx-qimpanel (2.1.3-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru fcitx-qimpanel-2.1.3/debian/patches/cmake-4.patch fcitx-qimpanel-2.1.3/debian/patches/cmake-4.patch
--- fcitx-qimpanel-2.1.3/debian/patches/cmake-4.patch	1970-01-01 02:00:00.000000000 +0200
+++ fcitx-qimpanel-2.1.3/debian/patches/cmake-4.patch	2025-10-24 16:35:16.000000000 +0300
@@ -0,0 +1,30 @@
+Description: Fix FTBFS with CMake 4
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/1112898
+
+--- fcitx-qimpanel-2.1.3.orig/CMakeLists.txt
++++ fcitx-qimpanel-2.1.3/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ project(fcitx-qimpanel)
+-cmake_minimum_required(VERSION 2.8.6)
++cmake_minimum_required(VERSION 3.5)
+ option(QT_5 "This is a option for QT_5" OFF)
+ option(QT_4 "This is a option for QT_4" ON)
+ SET(CMAKE_C_FLAGS "-std=c++11 -g -O0 -DPREFIX='\"${CMAKE_INSTALL_PREFIX}\"' ${CMAKE_C_FLAGS} ${HARDENED_C_FLAGS}")
+--- fcitx-qimpanel-2.1.3.orig/config-tool/CMakeLists.txt
++++ fcitx-qimpanel-2.1.3/config-tool/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ project(fcitx-qimpanel-configtool)
+-cmake_minimum_required(VERSION 2.8.6)
++cmake_minimum_required(VERSION 3.5)
+ option(QT_5 "This is a option for QT_5" ON)
+ option(QT_4 "This is a option for QT_4" OFF)
+ SET(CMAKE_C_FLAGS "-DPREFIX='\"${CMAKE_INSTALL_PREFIX}\"' ${CMAKE_C_FLAGS}")
+--- fcitx-qimpanel-2.1.3.orig/po/CMakeLists.txt
++++ fcitx-qimpanel-2.1.3/po/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.9)
++cmake_minimum_required(VERSION 3.5)
+ find_package(Gettext REQUIRED)
+ 
+ SET(POT_FILE
diff -Nru fcitx-qimpanel-2.1.3/debian/patches/series fcitx-qimpanel-2.1.3/debian/patches/series
--- fcitx-qimpanel-2.1.3/debian/patches/series	1970-01-01 02:00:00.000000000 +0200
+++ fcitx-qimpanel-2.1.3/debian/patches/series	2025-10-24 16:35:16.000000000 +0300
@@ -0,0 +1 @@
+cmake-4.patch

Reply to: