From 8fd68fffbb6c4acd3c35c9cebae8f8dcf7ac5b7c Mon Sep 17 00:00:00 2001 From: Boyuan Yang Date: Mon, 10 Feb 2025 19:06:47 -0500 Subject: [PATCH] Refresh build flags --- debian/changelog | 4 +- ...-by-removing-explicit-cxx11-in-tests.patch | 49 ------------------- debian/patches/series | 1 - debian/rules | 4 +- 4 files changed, 5 insertions(+), 53 deletions(-) delete mode 100644 debian/patches/0001-Fix-FTBFS-by-removing-explicit-cxx11-in-tests.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 2a61ead..4f5f06f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ dtkcore (5.7.9-1~exp1) experimental; urgency=medium * debian/libdtkcore5.shlibs: Require library version (>= 5.7). * debian/control: Require dtkcommon (>= 5.7.9) for dtklog. * Upload to experimental. + * debian/patches: Dropped, not needed. + * debian/rules: Enable -DBUILD_WITY_SYSTEMD. - -- Boyuan Yang Mon, 10 Feb 2025 19:02:30 -0500 + -- Boyuan Yang Mon, 10 Feb 2025 19:06:24 -0500 dtkcore (5.6.2.2-1) unstable; urgency=medium 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 deleted file mode 100644 index 31c1739..0000000 --- a/debian/patches/0001-Fix-FTBFS-by-removing-explicit-cxx11-in-tests.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: Arun Kumar Pariyar -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/series b/debian/patches/series deleted file mode 100644 index 0b21ce5..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Fix-FTBFS-by-removing-explicit-cxx11-in-tests.patch diff --git a/debian/rules b/debian/rules index b5b1d74..925079e 100755 --- a/debian/rules +++ b/debian/rules @@ -33,8 +33,8 @@ override_dh_auto_configure: dh_auto_configure -- \ -DBUILD_EXAMPLES=OFF \ -DBUILD_DOCS=$(BUILD_DOC_OPTION) \ - -DBUILD_VERSION=0 \ - -DDVERSION=$(VERSION) \ + -DBUILD_WITH_SYSTEMD=ON \ + -DDTK_VERSION=$(VERSION) \ $(NULL) override_dh_installchangelogs: -- 2.30.2