From ee91cb691dc2a23b121db2d05f9e22c683ee5ff1 Mon Sep 17 00:00:00 2001 From: Luis Guzman <ark@switnet.org> Date: Sat, 1 Oct 2022 15:47:50 -0500 Subject: [PATCH] psensor: port fix ftbfs psensor with gcc-11 on aramo. --- .../DATA/psensor/fix-ftbfs-debian-patch.patch | 32 +++++++++++++++++++ helpers/make-psensor | 3 ++ 2 files changed, 35 insertions(+) create mode 100644 helpers/DATA/psensor/fix-ftbfs-debian-patch.patch diff --git a/helpers/DATA/psensor/fix-ftbfs-debian-patch.patch b/helpers/DATA/psensor/fix-ftbfs-debian-patch.patch new file mode 100644 index 00000000..61e4bf44 --- /dev/null +++ b/helpers/DATA/psensor/fix-ftbfs-debian-patch.patch @@ -0,0 +1,32 @@ +diff -Nru psensor-1.1.5/debian/patches/fix-ftbfs.patch psensor-1.1.5/debian/patches/fix-ftbfs.patch +--- psensor-1.1.5/debian/patches/fix-ftbfs.patch 1970-01-01 01:00:00.000000000 +0100 ++++ psensor-1.1.5/debian/patches/fix-ftbfs.patch 2022-09-02 23:32:48.000000000 +0100 +@@ -0,0 +1,20 @@ ++Description: Fix FTBFS with gcc-11 ++ Fix the indentation while keeping the logic same as before. ++ ++Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com> ++--- ++ ++Bug-Debian: https://bugs.debian.org/984298 ++Forwarded: no ++ ++--- psensor-1.1.5.orig/src/lib/pudisks2.c +++++ psensor-1.1.5/src/lib/pudisks2.c ++@@ -83,7 +83,7 @@ static void smart_update(struct psensor ++ PROVIDER_NAME, ++ data->path); ++ ++- data->last_smart_update = t; +++ data->last_smart_update = t; ++ } ++ ++ void udisks2_psensor_list_update(struct psensor **sensors) +diff -Nru psensor-1.1.5/debian/patches/series psensor-1.1.5/debian/patches/series +--- psensor-1.1.5/debian/patches/series 2021-02-06 19:50:55.000000000 +0000 ++++ psensor-1.1.5/debian/patches/series 2022-09-02 23:33:02.000000000 +0100 +@@ -1,3 +1,4 @@ + 0001-Update-rsensor.c-drop-is_error-macro-definition.patch + 14.patch + ayatana-appindicator.patch ++fix-ftbfs.patch diff --git a/helpers/make-psensor b/helpers/make-psensor index 65d30eae..75e01180 100644 --- a/helpers/make-psensor +++ b/helpers/make-psensor @@ -23,6 +23,9 @@ VERSION=1 sed '/libxnvctrl-dev/d' -i debian/control +#Apply fix ftbfs patch +patch -p1 < $DATA/fix-ftbfs-debian-patch.patch + changelog "Removed libxnvctrl0 dependency not present in Trisquel" compile -- GitLab