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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 42939 in the body.
You can then email your comments to 42939 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

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 #8 received at 42939 <at> debbugs.gnu.org (full text, mbox):

From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Michael Rohleder <mike <at> rohleder.de>
Cc: 42939 <at> debbugs.gnu.org
Subject: Re: [bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd
 0.9.71.
Date: Mon, 24 Aug 2020 09:19:57 +0200

Hello Michael,

> +         ;; 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)))))

I believe that this is fixed upstream by:
https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.

Thanks,

Mathieu

Message #11 received at 42939 <at> debbugs.gnu.org (full text, mbox):

From: Michael Rohleder <mike <at> rohleder.de>
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: 42939 <at> debbugs.gnu.org
Subject: Re: [bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd
 0.9.71.
Date: Mon, 24 Aug 2020 23:09:10 +0200

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

Mathieu Othacehe <othacehe <at> gnu.org> writes:
> I believe that this is fixed upstream by:
> https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.

yes, looks good.
Thanks, good catch!

[0001-gnu-drawpile-Update-to-2.1.17-1.ed1a75deb.patch (text/x-patch, inline)]

From 99b9c7cdd9940487d3170655c800603a4f939fbd Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike <at> rohleder.de>
Date: Mon, 24 Aug 2020 23:01:07 +0200
Subject: [PATCH] gnu: drawpile: Update to 2.1.17-1.ed1a75deb.

* gnu/packages/graphics.scm (drawpile): Update to 2.1.17-1.ed1a75deb.
---
 gnu/packages/graphics.scm | 75 ++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 553d23f014..69ba9b9966 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1654,41 +1654,44 @@ Automated palette selection is supported.")
     (license license:expat)))
 
 (define-public drawpile
-  (package
-    (name "drawpile")
-    (version "2.1.17")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/drawpile/Drawpile")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "08w8vad8pw4a8kkshys1kd2kjvzpj62klxxxp904rx0qazw5hl80"))))
-    (build-system qt-build-system)
-    (arguments
-     '(#:configure-flags (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON")))
-    (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("giflib" ,giflib)
-       ("karchive" ,karchive)
-       ("kdnssd" ,kdnssd)
-       ("libmicrohttpd" ,libmicrohttpd)
-       ("libsodium" ,libsodium)
-       ("libvpx" ,libvpx)
-       ("libxi" ,libxi)
-       ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason
-       ("qtbase" ,qtbase)
-       ("qtkeychain" ,qtkeychain)
-       ("qtmultimedia" ,qtmultimedia)
-       ("qtsvg" ,qtsvg)
-       ("qtx11extras" ,qtx11extras)))
-    (home-page "https://drawpile.net")
-    (synopsis "Collaborative drawing program")
-    (description "Drawpile is a drawing program that allows share the canvas
+  ;; This commit fix building with libmicrohttpd>=0.71.
+  (let ((commit "ed1a75deb113da2d1df91a28f557509c4897130e")
+        (revision "1"))
+    (package
+      (name "drawpile")
+      (version (string-append "2.1.17-" revision "." (string-take commit 9)))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/drawpile/Drawpile")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1y21h1hk9ipkjvhjgas0c5hkjyan92vsxbxrn60c906hzqln2fr1"))))
+      (build-system qt-build-system)
+      (arguments
+       '(#:configure-flags (list "-DTESTS=ON" "-DTOOLS=ON" "-DKIS_TABLET=ON")))
+      (native-inputs
+       `(("extra-cmake-modules" ,extra-cmake-modules)
+         ("pkg-config" ,pkg-config)))
+      (inputs
+       `(("giflib" ,giflib)
+         ("karchive" ,karchive)
+         ("kdnssd" ,kdnssd)
+         ("libmicrohttpd" ,libmicrohttpd)
+         ("libsodium" ,libsodium)
+         ("libvpx" ,libvpx)
+         ("libxi" ,libxi)
+         ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason
+         ("qtbase" ,qtbase)
+         ("qtkeychain" ,qtkeychain)
+         ("qtmultimedia" ,qtmultimedia)
+         ("qtsvg" ,qtsvg)
+         ("qtx11extras" ,qtx11extras)))
+      (home-page "https://drawpile.net")
+      (synopsis "Collaborative drawing program")
+      (description "Drawpile is a drawing program that allows share the canvas
 with other users in real time.
 
 Some feature highlights:
@@ -1704,4 +1707,4 @@ Some feature highlights:
 @item Encrypted connections using SSL
 @item Automatic port forwarding with UPnP
 @end itemize\n")
-    (license license:gpl3+)))
+      (license license:gpl3+))))
-- 
2.28.0

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

-- 
The value of a program is proportional to the weight of its output.

[signature.asc (application/pgp-signature, inline)]

Message #16 received at 42939-done <at> debbugs.gnu.org (full text, mbox):

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.