[bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.

[bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.

[Michael Rohleder]

* 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

[bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.

[Mathieu Othacehe]

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

[bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.

[Michael Rohleder]

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

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

yes, looks good.
Thanks, good catch!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71 --]
[-- Type: text/x-patch, Size: 3943 bytes --]

From 99b9c7cdd9940487d3170655c800603a4f939fbd Mon Sep 17 00:00:00 2001
From: Michael Rohleder <mike@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


[-- Attachment #1.3: Type: text/plain, Size: 76 bytes --]


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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]

bug#42939: [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71.

[Mathieu Othacehe]

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

Pushed, thanks!

Mathieu