From aa1cb2b414a00d2908e12cb2598d1a2075ec19a8 Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Fri, 6 Sep 2024 18:22:43 +0100 Subject: [PATCH] Start patching build issues --- debian/patches/fix-bookworm-build.patch | 11 +++++++++++ debian/patches/series | 1 + debian/patches/tstringlist.patch | 16 ++++++++++++++++ debian/rules | 3 +-- 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 debian/patches/fix-bookworm-build.patch create mode 100644 debian/patches/tstringlist.patch diff --git a/debian/patches/fix-bookworm-build.patch b/debian/patches/fix-bookworm-build.patch new file mode 100644 index 0000000..3d0d51e --- /dev/null +++ b/debian/patches/fix-bookworm-build.patch @@ -0,0 +1,11 @@ +--- a/tcpCode.cpp ++++ b/tcpCode.cpp +@@ -467,7 +467,7 @@ + + QByteArray datas = FLRigsock->readAll(); + +- qDebug(datas.data()); ++ qDebug() << "SetPTT Failed"; + } + + diff --git a/debian/patches/series b/debian/patches/series index eded4b2..1923af4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ +fix-bookworm-build.patch libpulse.patch build-fix.patch diff --git a/debian/patches/tstringlist.patch b/debian/patches/tstringlist.patch new file mode 100644 index 0000000..f535a89 --- /dev/null +++ b/debian/patches/tstringlist.patch @@ -0,0 +1,16 @@ +--- a/ax25_demod.c ++++ b/ax25_demod.c +@@ -4376,11 +4376,11 @@ + word k, len, i; + + Byte zeros, ones; +- TStringList need_frames; ++ TStringList: need_frames; + + s = data; + +- CreateStringList(&need_frames); ++ need_frames = TStringList.Create; + len = data->Length; + + memcpy(crc, &data->Data[data->Length - 18], 18); diff --git a/debian/rules b/debian/rules index 34f94ab..384f60f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,7 @@ #!/usr/bin/make -f export QT_SELECT=5 -export DEB_BUILD_MAINT_OPTIONS=hardening=+all -export DEB_CFLAGS_MAINT_STRIP=-Werror=implicit-function-declaration +export DEB_BUILD_MAINT_OPTIONS=hardening=+all,qa=-bug-implicit-func %: dh $@