From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 19 17:49:55 2020 Received: (at submit) by debbugs.gnu.org; 19 Aug 2020 21:49:56 +0000 Received: from localhost ([127.0.0.1]:41132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8Vxz-0008RE-Mz for submit@debbugs.gnu.org; Wed, 19 Aug 2020 17:49:55 -0400 Received: from lists.gnu.org ([209.51.188.17]:35632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8Vxt-0008R2-OW for submit@debbugs.gnu.org; Wed, 19 Aug 2020 17:49:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8Vxt-0005XS-Gm for guix-patches@gnu.org; Wed, 19 Aug 2020 17:49:49 -0400 Received: from wp224.webpack.hosteurope.de ([2a01:488:42:1000:50ed:84e7::]:39528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8Vxr-0002K7-De for guix-patches@gnu.org; Wed, 19 Aug 2020 17:49:49 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1k8Vxl-0004bh-VO; Wed, 19 Aug 2020 23:49:41 +0200 Received: from [192.168.1.3] (helo=micha.rohleder.de) by www.rohleder.de with esmtp (Exim 4.94) (envelope-from ) id 1k8Vxl-00008D-FR; Wed, 19 Aug 2020 23:49:41 +0200 From: Michael Rohleder To: guix-patches@gnu.org Subject: [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71. Date: Wed, 19 Aug 2020 23:49:31 +0200 Message-Id: <20200819214931.15292-1-mike@rohleder.de> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1597873787;a00e84af; X-HE-SMSGID: 1k8Vxl-0004bh-VO Received-SPF: permerror client-ip=2a01:488:42:1000:50ed:84e7::; envelope-from=mike@rohleder.de; helo=wp224.webpack.hosteurope.de X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/19 17:49:42 X-ACL-Warn: Detected OS = ??? X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: Michael Rohleder X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 24 03:20:06 2020 Received: (at 42939) by debbugs.gnu.org; 24 Aug 2020 07:20:06 +0000 Received: from localhost ([127.0.0.1]:55894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kA6ly-0008Kl-Bq for submit@debbugs.gnu.org; Mon, 24 Aug 2020 03:20:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60342) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kA6lw-0008K9-Dt for 42939@debbugs.gnu.org; Mon, 24 Aug 2020 03:20:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:39454) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kA6lq-0003cv-LJ; Mon, 24 Aug 2020 03:19:58 -0400 Received: from [2a01:e0a:19b:d9a0:51fc:698d:e660:b966] (port=53330 helo=cervin) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kA6lq-0003fW-78; Mon, 24 Aug 2020 03:19:58 -0400 From: Mathieu Othacehe To: Michael Rohleder Subject: Re: [bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71. References: <20200819214931.15292-1-mike@rohleder.de> Date: Mon, 24 Aug 2020 09:19:57 +0200 In-Reply-To: <20200819214931.15292-1-mike@rohleder.de> (Michael Rohleder's message of "Wed, 19 Aug 2020 23:49:31 +0200") Message-ID: <87d03g4ijm.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42939 Cc: 42939@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) 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 From debbugs-submit-bounces@debbugs.gnu.org Mon Aug 24 17:09:54 2020 Received: (at 42939) by debbugs.gnu.org; 24 Aug 2020 21:09:54 +0000 Received: from localhost ([127.0.0.1]:59418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kAJj0-0002Cv-Ac for submit@debbugs.gnu.org; Mon, 24 Aug 2020 17:09:54 -0400 Received: from wp224.webpack.hosteurope.de ([80.237.132.231]:39262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kAJiy-0002Cm-CF for 42939@debbugs.gnu.org; Mon, 24 Aug 2020 17:09:53 -0400 Received: from www.rohleder.de ([37.61.204.227]); authenticated by wp224.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1kAJiw-0006gh-I5; Mon, 24 Aug 2020 23:09:50 +0200 Received: from [192.168.1.3] (helo=micha) by www.rohleder.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1kAJiu-0008WA-RF; Mon, 24 Aug 2020 23:09:50 +0200 From: Michael Rohleder To: Mathieu Othacehe Subject: Re: [bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71. References: <20200819214931.15292-1-mike@rohleder.de> <87d03g4ijm.fsf@gnu.org> X-PGP-Fingerprint: 755E 2DE5 D0D5 85C5 2E78 2830 7C7A FFBE FEF2 CB25 X-PGP-Key: https://www.rohleder.de/~mike/pgpkey.asc Date: Mon, 24 Aug 2020 23:09:10 +0200 In-Reply-To: <87d03g4ijm.fsf@gnu.org> (Mathieu Othacehe's message of "Mon, 24 Aug 2020 09:19:57 +0200") Message-ID: <87ft8boio9.fsf@rohleder.de> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-bounce-key: webpack.hosteurope.de;mike@rohleder.de;1598303392;97caac59; X-HE-SMSGID: 1kAJiw-0006gh-I5 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 42939 Cc: 42939@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Mathieu Othacehe writes: > I believe that this is fixed upstream by: > https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e. yes, looks good. Thanks, good catch! --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-gnu-drawpile-Update-to-2.1.17-1.ed1a75deb.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71 From=2099b9c7cdd9940487d3170655c800603a4f939fbd Mon Sep 17 00:00:00 2001 From: Michael Rohleder 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. =2D-- 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 =2D-- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1654,41 +1654,44 @@ Automated palette selection is supported.") (license license:expat))) =20 (define-public drawpile =2D (package =2D (name "drawpile") =2D (version "2.1.17") =2D (source (origin =2D (method git-fetch) =2D (uri (git-reference =2D (url "https://github.com/drawpile/Drawpile") =2D (commit version))) =2D (file-name (git-file-name name version)) =2D (sha256 =2D (base32 =2D "08w8vad8pw4a8kkshys1kd2kjvzpj62klxxxp904rx0qazw5hl80"))= )) =2D (build-system qt-build-system) =2D (arguments =2D '(#:configure-flags (list "-DTESTS=3DON" "-DTOOLS=3DON" "-DKIS_TABL= ET=3DON"))) =2D (native-inputs =2D `(("extra-cmake-modules" ,extra-cmake-modules) =2D ("pkg-config" ,pkg-config))) =2D (inputs =2D `(("giflib" ,giflib) =2D ("karchive" ,karchive) =2D ("kdnssd" ,kdnssd) =2D ("libmicrohttpd" ,libmicrohttpd) =2D ("libsodium" ,libsodium) =2D ("libvpx" ,libvpx) =2D ("libxi" ,libxi) =2D ;; ("miniupnpc" ,miniupnpc) ;segfaults for some reason =2D ("qtbase" ,qtbase) =2D ("qtkeychain" ,qtkeychain) =2D ("qtmultimedia" ,qtmultimedia) =2D ("qtsvg" ,qtsvg) =2D ("qtx11extras" ,qtx11extras))) =2D (home-page "https://drawpile.net") =2D (synopsis "Collaborative drawing program") =2D (description "Drawpile is a drawing program that allows share the ca= nvas + ;; This commit fix building with libmicrohttpd>=3D0.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=3DON" "-DTOOLS=3DON" "-DKIS_TABL= ET=3DON"))) + (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 ca= nvas with other users in real time. =20 Some feature highlights: @@ -1704,4 +1707,4 @@ Some feature highlights: @item Encrypted connections using SSL @item Automatic port forwarding with UPnP @end itemize\n") =2D (license license:gpl3+))) + (license license:gpl3+)))) =2D-=20 2.28.0 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 The value of a program is proportional to the weight of its output. --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEdV4t5dDVhcUueCgwfHr/vv7yyyUFAl9ELHcACgkQfHr/vv7y yyV5LwgAmOQrxNjk74RFRlabIGL6hJlBakTetTwYUspllOScGrBmAUSkawlLybRz IoSYozua8lRAQBr1z8kTPo5V8MhJLu1ZH5Nbsa5AQO1+3qmGEmzuXRA4h49FZsI6 XcecmPom0P3tbCE6dvQpC1BTLBxAqKFPMlw8hEUmmQbBNeBljXx3psdosD/9Fet9 BSiCDaCBvi6VzwaxPfi3kDeLnRXrtuI0QZ5usWiW/iZwvJExVbErO9t6cd8uA+V8 if/c1jY+08+1eBonsaCsoGqmF9vFIETFF6Xo36WdgkR8S8Fng6FSxTztXKAPMR3e blqNmNWYVv+w+WZN/skwhhMQAhaFSQ== =3E+h -----END PGP SIGNATURE----- --==-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Aug 26 03:28:35 2020 Received: (at 42939-done) by debbugs.gnu.org; 26 Aug 2020 07:28:35 +0000 Received: from localhost ([127.0.0.1]:37223 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kAprH-0007qu-50 for submit@debbugs.gnu.org; Wed, 26 Aug 2020 03:28:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kAprF-0007qi-Mb for 42939-done@debbugs.gnu.org; Wed, 26 Aug 2020 03:28:33 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:55397) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kApr9-00086a-Dr; Wed, 26 Aug 2020 03:28:27 -0400 Received: from [2a01:e0a:19b:d9a0:51fc:698d:e660:b966] (port=54030 helo=cervin) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1kApr8-0002O7-0Y; Wed, 26 Aug 2020 03:28:26 -0400 From: Mathieu Othacehe To: Michael Rohleder Subject: Re: [bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71. References: <20200819214931.15292-1-mike@rohleder.de> <87d03g4ijm.fsf@gnu.org> <87ft8boio9.fsf@rohleder.de> Date: Wed, 26 Aug 2020 09:28:22 +0200 In-Reply-To: <87ft8boio9.fsf@rohleder.de> (Michael Rohleder's message of "Mon, 24 Aug 2020 23:09:10 +0200") Message-ID: <87h7sp50ix.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 42939-done Cc: 42939-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) > * gnu/packages/graphics.scm (drawpile): Update to 2.1.17-1.ed1a75deb. Pushed, thanks! Mathieu From unknown Sun Jun 22 11:34:47 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 23 Sep 2020 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator