From patchwork Wed Aug 19 21:49:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 23691 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D28B427BBE6; Wed, 19 Aug 2020 22:50:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 8419727BBE5 for ; Wed, 19 Aug 2020 22:50:10 +0100 (BST) Received: from localhost ([::1]:56546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8VyD-0005mf-WB for patchwork@mira.cbaines.net; Wed, 19 Aug 2020 17:50:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49258) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8Vy6-0005kt-Ua for guix-patches@gnu.org; Wed, 19 Aug 2020 17:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57819) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8Vy6-0002Kb-Ku for guix-patches@gnu.org; Wed, 19 Aug 2020 17:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8Vy6-0008Rf-Gf for guix-patches@gnu.org; Wed, 19 Aug 2020 17:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42939] [PATCH] gnu: drawpile: Build with libmicrohttpd 0.9.71. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Aug 2020 21:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42939 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42939@debbugs.gnu.org Cc: Michael Rohleder X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159787379632444 (code B ref -1); Wed, 19 Aug 2020 21:50:02 +0000 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 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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)))