From: Boyuan Yang <byang@debian.org>
Date: Wed, 4 Dec 2024 12:16:53 +0000 (-0500)
Subject: update patches
X-Git-Tag: archive/raspbian/5.7.12-2+rpi1^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=24f23a76a8ee0607e7e7d1248e622e81adbc95d8;p=dtkcore.git

update patches
---

diff --git a/debian/patches/0001-Fix-FTBFS-by-removing-explicit-cxx11-in-tests.patch b/debian/patches/0001-Fix-FTBFS-by-removing-explicit-cxx11-in-tests.patch
new file mode 100644
index 0000000..31c1739
--- /dev/null
+++ b/debian/patches/0001-Fix-FTBFS-by-removing-explicit-cxx11-in-tests.patch
@@ -0,0 +1,49 @@
+From: Arun Kumar Pariyar <arun@debian.org>
+Date: Wed, 4 Dec 2024 07:17:59 -0500
+Subject: Fix FTBFS by removing explicit cxx11 in tests
+
+Last-Update: 2024-12-04
+Bug-Debian: https://bugs.debian.org/1038703
+---
+ tools/dci/dci.pro                   | 2 +-
+ tools/qdbusxml2cpp/qdbusxml2cpp.pro | 1 -
+ tools/settings/settings.pro         | 2 --
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/tools/dci/dci.pro b/tools/dci/dci.pro
+index 934d632..c0016c9 100644
+--- a/tools/dci/dci.pro
++++ b/tools/dci/dci.pro
+@@ -1,6 +1,6 @@
+ QT -= gui
+ 
+-CONFIG += c++11 console
++CONFIG += console
+ CONFIG -= app_bundle
+ 
+ # You can make your code fail to compile if it uses deprecated APIs.
+diff --git a/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+index e1e2b71..0e0adbb 100644
+--- a/tools/qdbusxml2cpp/qdbusxml2cpp.pro
++++ b/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+@@ -2,7 +2,6 @@ TARGET = qdbusxml2cpp-fix
+ 
+ TEMPLATE = app
+ QT += core dbus-private dbus
+-CONFIG += c++11
+ 
+ SOURCES += qdbusxml2cpp.cpp
+ 
+diff --git a/tools/settings/settings.pro b/tools/settings/settings.pro
+index 21784c1..a3429c3 100644
+--- a/tools/settings/settings.pro
++++ b/tools/settings/settings.pro
+@@ -1,8 +1,6 @@
+ QT += core xml
+ QT -= gui
+ 
+-CONFIG += c++11
+-
+ TARGET = dtk-settings
+ CONFIG += console link_pkgconfig
+ CONFIG -= app_bundle
diff --git a/debian/patches/001-fix-ftbfs-remove-explicit-cxx11.patch b/debian/patches/001-fix-ftbfs-remove-explicit-cxx11.patch
deleted file mode 100644
index 88b97f5..0000000
--- a/debian/patches/001-fix-ftbfs-remove-explicit-cxx11.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Description: Fix FTBFS by removing explicit cxx11 in tests.
-Author: Arun Kumar Pariyar <arun@debian.org>
-Bug-Debian: https://bugs.debian.org/1038703
-Last-Update: 2023-06-20
----
-
---- dtkcore-5.5.33.orig/examples/dasync-example/dasync-example.pro
-+++ dtkcore-5.5.33/examples/dasync-example/dasync-example.pro
-@@ -7,7 +7,6 @@ TARGET = thread_util
- INCLUDEPATH += .
- QT+= core widgets testlib
-
--CONFIG += c++11
- # The following define makes your compiler warn you if you use any
- # feature of Qt which has been marked as deprecated (the exact warnings
- # depend on your compiler). Please consult the documentation of the
---- dtkcore-5.5.33.orig/tests/ddesktopentry/ddesktopentry.pro
-+++ dtkcore-5.5.33/tests/ddesktopentry/ddesktopentry.pro
-@@ -3,7 +3,6 @@ QT -= gui
-
- TARGET = tst_ddesktopentrytest
- TEMPLATE = app
--CONFIG += c++11
- CONFIG -= app_bundle
-
- !isEmpty(DTK_STATIC_LIB){
---- dtkcore-5.5.33.orig/tests/dthreadutils/dthreadutils.pro
-+++ dtkcore-5.5.33/tests/dthreadutils/dthreadutils.pro
-@@ -2,7 +2,6 @@ QT += testlib concurrent
- QT -= gui
-
- TEMPLATE = app
--CONFIG += c++11
-
- !isEmpty(DTK_STATIC_LIB){
-     DEFINES += DTK_STATIC_LIB
---- dtkcore-5.5.33.orig/tests/dutils/dutils.pro
-+++ dtkcore-5.5.33/tests/dutils/dutils.pro
-@@ -2,7 +2,6 @@ QT += testlib dbus
- QT -= gui
-
- TEMPLATE = app
--CONFIG += c++11
-
- !isEmpty(DTK_STATIC_LIB){
-     DEFINES += DTK_STATIC_LIB
---- dtkcore-5.5.33.orig/tests/dvtablehook/dvtablehook.pro
-+++ dtkcore-5.5.33/tests/dvtablehook/dvtablehook.pro
-@@ -2,7 +2,6 @@ QT += testlib
- QT -= gui
-
- TEMPLATE = app
--CONFIG += c++11
-
- # TODO: vtabhook release test failed
- QMAKE_CXXFLAGS_RELEASE -= -O2
---- dtkcore-5.5.33.orig/tests/tests.pro
-+++ dtkcore-5.5.33/tests/tests.pro
-@@ -1,6 +1,6 @@
- TEMPLATE = app
- QT += core dbus xml testlib concurrent
--CONFIG += thread c++11 link_pkgconfig
-+CONFIG += thread link_pkgconfig
- CONFIG -= app_bundle
-
- QMAKE_LFLAGS += -Wl,--export-dynamic
---- dtkcore-5.5.33.orig/tools/qdbusxml2cpp/qdbusxml2cpp.pro
-+++ dtkcore-5.5.33/tools/qdbusxml2cpp/qdbusxml2cpp.pro
-@@ -2,7 +2,6 @@ TARGET = qdbusxml2cpp-fix
-
- TEMPLATE = app
- QT += core dbus-private dbus
--CONFIG += c++11
-
- SOURCES += qdbusxml2cpp.cpp
-
---- dtkcore-5.5.33.orig/tools/settings/settings.pro
-+++ dtkcore-5.5.33/tools/settings/settings.pro
-@@ -1,7 +1,6 @@
- QT += core xml
- QT -= gui
-
--CONFIG += c++11
-
- TARGET = dtk-settings
- CONFIG += console link_pkgconfig
diff --git a/debian/patches/series b/debian/patches/series
index a11ea9c..0b21ce5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-001-fix-ftbfs-remove-explicit-cxx11.patch
+0001-Fix-FTBFS-by-removing-explicit-cxx11-in-tests.patch