GNU bug report logs - #42939
[PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#42939: closed ([PATCH] gnu: drawpile: Build with
 libmicrohttpd 0.9.71.)
Date: Wed, 26 Aug 2020 07:29:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Wed, 26 Aug 2020 09:28:22 +0200
with message-id <87h7sp50ix.fsf <at> gnu.org>
and subject line Re: [bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.
has caused the debbugs.gnu.org bug report #42939,
regarding [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
42939: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=42939
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Michael Rohleder <mike <at> rohleder.de>
To: guix-patches <at> gnu.org
Cc: Michael Rohleder <mike <at> rohleder.de>
Subject: [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.
Date: Wed, 19 Aug 2020 23:49:31 +0200

* gnu/packages/graphics.scm (drawpile)[arguments]: Add patch phase.
---
 gnu/packages/graphics.scm | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c7fefbd57d..a5d6a8cad8 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1450,7 +1450,21 @@ Automated palette selection is supported.")
                 "08w8vad8pw4a8kkshys1kd2kjvzpj62klxxxp904rx0qazw5hl80"))))
     (build-system qt-build-system)
     (arguments
-     '(#:configure-flags (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON")))
+     '(#:configure-flags (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON")
+       #:phases
+       (modify-phases %standard-phases
+         ;; libmicrohttpd>=0.9.71 changed some results from int to MHD_Result.
+         (add-after 'unpack 'patch
+           (lambda _
+             (substitute* "src/thinsrv/webadmin/qmhttp.cpp"
+               (("^int assign_to_hash") "MHD_Result assign_to_hash")
+               (("^int access_policy") "MHD_Result access_policy")
+               (("^int iterate_post") "MHD_Result iterate_post")
+               (("^int request_handler") "MHD_Result request_handler")
+               (("int ret;") "MHD_Result ret;")
+               (("ret = MHD_queue_basic_auth_fail_response")
+                "ret = (MHD_Result) MHD_queue_basic_auth_fail_response"))
+             #t)))))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)))
-- 
2.28.0

[Message part 3 (message/rfc822, inline)]

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Michael Rohleder <mike <at> rohleder.de>
Cc: 42939-done <at> debbugs.gnu.org
Subject: Re: [bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd
 0.9.71.
Date: Wed, 26 Aug 2020 09:28:22 +0200

> * gnu/packages/graphics.scm (drawpile): Update to 2.1.17-1.ed1a75deb.

Pushed, thanks!

Mathieu

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.