bug#54061: thermald-2.4.7 build fail following upower update to 0.99.15

bug#54061: thermald-2.4.7 build fail following upower update to 0.99.15

[Paul Jewell]

When building thermald-2.4.7, I am getting a build failure:

------------8<---------------------
src/thd_engine_adaptive.cpp: In member function ‘int 
cthd_engine_adaptive::evaluate_lid_condition(condition)’:
src/thd_engine_adaptive.cpp:1002:61: error: ‘gboolean 
up_client_get_lid_is_closed(UpClient*)’ is deprecated 
[-Werror=deprecated-declarations
]

------------8<---------------------

According to jpoiret (via IRC), this is due to the upower update from 
0.99.13 to 0.99.15, and the marking of the "up_client_get_lid_is_closed" 
function as deprecated.

I am not sure where the compiler flag setting is made turning this 
warning into an error. I have no configuration in my system config which 
could be doing this (at least not explicitly).

bug#54061: thermald-2.4.7 build fail following upower update to 0.99.15

[Paul Jewell]

I have reported this upstream: 
https://github.com/intel/thermal_daemon/issues/340

It seems the problem was known (at least by the upower developers) for 9 
months, but there was no comment on the thermald github issue list.

bug#54061: thermald-2.4.7 build fail following upower update to 0.99.15

[Maxime Devos]

[-- Attachment #1.1: Type: text/plain, Size: 224 bytes --]

Paul Jewell schreef op vr 18-02-2022 om 17:07 [+0000]:
> When building thermald-2.4.7, I am getting a build failure:
> 
> [... deprecation error ...]


The attached two patches should fix this.

Greetings,
Maxime.

[-- Attachment #1.2: 0001-gnu-thermald-Use-G-expressions.patch --]
[-- Type: text/x-patch, Size: 1645 bytes --]

From eb49c118cb211528adc2bcbb0758d3848b2bcf6b Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 19 Feb 2022 14:46:33 +0000
Subject: [PATCH 1/2] gnu: thermald: Use G-expressions.

* gnu/packages/admin.scm
  (thermald)[arguments]<#:configure-flags,#:make-flags,#:phases>: Convert to
  G-exps.
---
 gnu/packages/admin.scm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 17dc0f1315..0e9f0acb68 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3879,17 +3879,16 @@ hard-coded.")
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
-       (let ((out (assoc-ref %outputs "out")))
-         (list (string-append "--with-dbus-sys-dir="
-                              out "/etc/dbus-1/system.d")
-               "--localstatedir=/var"))
+       ,#~(list (string-append "--with-dbus-sys-dir="
+                               #$output "/etc/dbus-1/system.d")
+                "--localstatedir=/var")
        #:make-flags
-       (list "V=1")                     ; log build commands
+       ,#~(list "V=1")                  ; log build commands
        #:phases
-       (modify-phases %standard-phases
-         (add-before 'bootstrap 'no-early-./configure
-           (lambda _
-             (setenv "NO_CONFIGURE" "yet"))))))
+       ,#~(modify-phases %standard-phases
+            (add-before 'bootstrap 'no-early-./configure
+              (lambda _
+                (setenv "NO_CONFIGURE" "yet"))))))
     (native-inputs
      (list autoconf
            autoconf-archive
-- 
2.30.2


[-- Attachment #1.3: 0002-gnu-thermald-Fix-build-failure.patch --]
[-- Type: text/x-patch, Size: 1170 bytes --]

From d066a7dcd11757fb19edc79028104f7dbcffeab1 Mon Sep 17 00:00:00 2001
From: Maxime Devos <maximedevos@telenet.be>
Date: Sat, 19 Feb 2022 14:52:17 +0000
Subject: [PATCH 2/2] gnu: thermald: Fix build failure.

* gnu/packages/admin.scm (thermald)[arguments]<#:configure-flags>: Add
'--disable-werror'.

Fixes: <https://issues.guix.gnu.org/54061>
Reported-by: Paul Jewell <paul@teulu.org>
---
 gnu/packages/admin.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 0e9f0acb68..5b2584cfba 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -3881,7 +3881,10 @@ hard-coded.")
      `(#:configure-flags
        ,#~(list (string-append "--with-dbus-sys-dir="
                                #$output "/etc/dbus-1/system.d")
-                "--localstatedir=/var")
+                "--localstatedir=/var"
+                ;; thermald uses deprecated APIs, see
+                ;; <https://github.com/intel/thermal_daemon/issues/340>.
+                "--disable-werror")
        #:make-flags
        ,#~(list "V=1")                  ; log build commands
        #:phases
-- 
2.30.2


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

bug#54061: thermald-2.4.7 build fail following upower update to 0.99.15

[Nicolas Goaziou]

Hello,

Maxime Devos <maximedevos@telenet.be> writes:

>       `(#:configure-flags
> -       (let ((out (assoc-ref %outputs "out")))
> -         (list (string-append "--with-dbus-sys-dir="
> -                              out "/etc/dbus-1/system.d")
> -               "--localstatedir=/var"))
> +       ,#~(list (string-append "--with-dbus-sys-dir="
> +                               #$output "/etc/dbus-1/system.d")
> +                "--localstatedir=/var")

The patches look good, but I'm not sure it is a good idea to publicize
the unquote+ungexp, alias ",#~", style. IIUC, in
<https://guix.gnu.org/fr/blog/2021/the-big-change/> there's some
reasoning against the abuse of unquoting. This kind of defeat the
simplicity introduced with G-expressions. So, I would favor writing:

 (list
  #:configure-flags
  #~(list ...))

WDYT?

Regards,
-- 
Nicolas Goaziou

bug#54061: thermald-2.4.7 build fail following upower update to 0.99.15

[Paul Jewell]

On 19/02/2022 14:55, Maxime Devos wrote:
> Paul Jewell schreef op vr 18-02-2022 om 17:07 [+0000]:
>> When building thermald-2.4.7, I am getting a build failure:
>>
>> [... deprecation error ...]
> 
> 
> The attached two patches should fix this.
> 
> Greetings,
> Maxime.

Hi Maxime,
Many thanks for this - with the patches everything builds OK.

I also noted a pull request is outstanding for thermald which will 
remove the need for the deprecated functions, so hopefully the changes 
can be reversed with the next version of thermald.

When do you think these patches can be merged (notwithstanding the 
comments from Nicolas of course)?

Best regards,
Paul

bug#54061: thermald-2.4.7 build fail following upower update to 0.99.15

[Ludovic Courtès]

Hi,

Maxime Devos <maximedevos@telenet.be> skribis:

> From d066a7dcd11757fb19edc79028104f7dbcffeab1 Mon Sep 17 00:00:00 2001
> From: Maxime Devos <maximedevos@telenet.be>
> Date: Sat, 19 Feb 2022 14:52:17 +0000
> Subject: [PATCH 2/2] gnu: thermald: Fix build failure.
>
> * gnu/packages/admin.scm (thermald)[arguments]<#:configure-flags>: Add
> '--disable-werror'.
>
> Fixes: <https://issues.guix.gnu.org/54061>
> Reported-by: Paul Jewell <paul@teulu.org>

Guillaume fixed it independently in commit
73db69bea15e390a31289fdfadb1d5b9a7d13557.

Closing!

Ludo’.

bug#54061: thermald-2.4.7 build fail following upower update to 0.99.15

[Paul Jewell]

[-- Attachment #1: Type: text/plain, Size: 848 bytes --]

Good afternoon,

Thanks Ludo, and also Maxime and Guillaume.

Upstream have also merged a fix to the original problem, so I guess the 
change made here can be removed again after the next release.

Best regards,
Paul

On 02/03/2022 17:03, Ludovic Courtès wrote:
> Hi,
>
> Maxime Devos<maximedevos@telenet.be>  skribis:
>
>>  From d066a7dcd11757fb19edc79028104f7dbcffeab1 Mon Sep 17 00:00:00 2001
>> From: Maxime Devos<maximedevos@telenet.be>
>> Date: Sat, 19 Feb 2022 14:52:17 +0000
>> Subject: [PATCH 2/2] gnu: thermald: Fix build failure.
>>
>> * gnu/packages/admin.scm (thermald)[arguments]<#:configure-flags>: Add
>> '--disable-werror'.
>>
>> Fixes:<https://issues.guix.gnu.org/54061>
>> Reported-by: Paul Jewell<paul@teulu.org>
> Guillaume fixed it independently in commit
> 73db69bea15e390a31289fdfadb1d5b9a7d13557.
>
> Closing!
>
> Ludo’.

[-- Attachment #2: Type: text/html, Size: 1762 bytes --]