From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UHTTIV9ePGCrHQAA0tVLHw (envelope-from ) for ; Mon, 01 Mar 2021 03:24:15 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id eBKZHV9ePGCAMQAAB5/wlQ (envelope-from ) for ; Mon, 01 Mar 2021 03:24:15 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 8530818B0F for ; Mon, 1 Mar 2021 04:24:14 +0100 (CET) Received: from localhost ([::1]:50586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGZAL-00074z-KH for larch@yhetil.org; Sun, 28 Feb 2021 22:24:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGZAA-00074i-Vl for guix-patches@gnu.org; Sun, 28 Feb 2021 22:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:36129) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGZAA-0003Et-OX for guix-patches@gnu.org; Sun, 28 Feb 2021 22:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lGZAA-00039U-J3 for guix-patches@gnu.org; Sun, 28 Feb 2021 22:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46788] v2 Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 01 Mar 2021 03:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 46788 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 46788@debbugs.gnu.org Cc: Danny Milosavljevic Received: via spool by 46788-submit@debbugs.gnu.org id=B46788.161456901212075 (code B ref 46788); Mon, 01 Mar 2021 03:24:02 +0000 Received: (at 46788) by debbugs.gnu.org; 1 Mar 2021 03:23:32 +0000 Received: from localhost ([127.0.0.1]:47675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGZ9g-00038h-2G for submit@debbugs.gnu.org; Sun, 28 Feb 2021 22:23:32 -0500 Received: from out1.migadu.com ([91.121.223.63]:46726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGZ9c-00038W-P4 for 46788@debbugs.gnu.org; Sun, 28 Feb 2021 22:23:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1614569006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=b/QhgAc2GOZ/uaLCFEBYdLV3AigD8HWnChDyIP99bvA=; b=cE5GOKFDhvV1jA/URQXfWISZiyQ5QfMwR61WqwJIvhn0uxY6uKTsGhQNT1l/tv/TWBx3XI VFiLgID/v/6fDf1W7FrA+Zh3q/hEQdVLsLrsHJYGUF4b4DoQdExySMU5YFMCq5+IazAJqW VYxzRMzNGGa6yU6E0MhCa3k6Nc9PquH6ekELc4IPk9NvbuEy2Vz8chV4GN1LP0Kp8+uxPp DGgGsFxDo78iWXjQLNdrJX1669Di0BGNbapAIIUL2qpBIbIBDF49xSrbPZC9WP5qIJa9zT Wp4clPmsq3volz+bD6VVNnJfiEc5xxiXHEF7AfUXJmWYOU8b4sCL9T8JO9D9EA== X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. References: <1914b75f-156e-7256-85d2-649f5017b0fc@raghavgururajan.name> Message-ID: Date: Sun, 28 Feb 2021 22:23:24 -0500 MIME-Version: 1.0 In-Reply-To: <1914b75f-156e-7256-85d2-649f5017b0fc@raghavgururajan.name> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Dl5PVWQQ7eRIoVPlEQfEvEnZWDvqeUrc3" X-Migadu-Auth-User: rg@raghavgururajan.name 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1614569055; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=b/QhgAc2GOZ/uaLCFEBYdLV3AigD8HWnChDyIP99bvA=; b=i+KqW53j4Wg+Ir3y2fKAiwSW9o1MCzOTkrZIp+p9F5/BeY3xc6d0HDhnNlMX+vlShqNdO8 ZSenzya695kJ6x5uqVcyk4PeMo1/enksoXxdtQ8+/2a2dlAoNLRIuGIfy1pAPSMGm9EAM5 rSc3tXbVLWR7NLDkQBX4JNL4ACM8vWlgWJOO7CneOFbyj615SBlagn0LeQAeMu198lbC1V Vjw1dGK2nV0Mu+6k7v8TBP7xKI7fJxRuHEyhmeEVHY+x0iovqRCFCaEJjTu15SW7Rix6eF tAn9M6H+SGpzuJmFKiJg0kJ4+G8Ae5mqvtQZnBGUFPBYbnzIA8w6pH7GlzyqSQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614569055; a=rsa-sha256; cv=none; b=gZu2+N8tH1FWlo1GdS9zak2ujWilHj6/FBknvr+P/cHkghyMPlpSFT2SFUKbBWYUT3qdNx qgRI69/zhOLqw7w/FSlpwH4fp15cHbbHEeLcsWaIlvVMjr4rjK8NbK11X0WTEHT6fX4guR zy76Gb6uT7Fn1ASBfDqIheYtrsMhGP63mR3lZFqWZtO1dBXKIKqLKlG5obUbiqheFTWkp9 hKzlfRotaxChBnxTPJ+CLEADqnEqKpHnE7O7qgKcnsRnzsN5ZFJJhyFBt5hWaJgbrZPfA2 exhgWq75aR+pw6jFUYWghuiLcUtzPA9nbNQNJTiyzCx3kaJ7QwApvDJG610Uow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=cE5GOKFD; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -4.97 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=raghavgururajan.name header.s=key1 header.b=cE5GOKFD; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 8530818B0F X-Spam-Score: -4.97 X-Migadu-Scanner: scn1.migadu.com X-TUID: XOUGTaMQl/3h This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Dl5PVWQQ7eRIoVPlEQfEvEnZWDvqeUrc3 Content-Type: multipart/mixed; boundary="fyKVIgLc45XgeZNFoTD5ZTnqpACLzFpMA"; protected-headers="v1" From: Raghav Gururajan To: 46788@debbugs.gnu.org Cc: Danny Milosavljevic Message-ID: Subject: Re: v2 References: <1914b75f-156e-7256-85d2-649f5017b0fc@raghavgururajan.name> In-Reply-To: <1914b75f-156e-7256-85d2-649f5017b0fc@raghavgururajan.name> --fyKVIgLc45XgeZNFoTD5ZTnqpACLzFpMA Content-Type: multipart/mixed; boundary="------------14F79F17FA9C2747807B0782" Content-Language: en-US This is a multi-part message in MIME format. --------------14F79F17FA9C2747807B0782 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable OOPS! Attached wrong file before. Here is the correct one. --------------14F79F17FA9C2747807B0782 Content-Type: text/x-patch; charset=UTF-8; name="0002-gnu-Add-qhttp.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0002-gnu-Add-qhttp.patch" =46rom 372becc078d1578ba8177319f9f3b671ec476b6d Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 25 Feb 2021 19:45:04 -0500 Subject: [PATCH 2/5] gnu: Add qhttp. * gnu/packages/web.scm (qhttp): New variable. --- gnu/packages/web.scm | 78 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index e4ba0d5bf9..3e9fdbb7f6 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -77,6 +77,7 @@ #:use-module (guix build-system ant) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -170,6 +171,83 @@ #:use-module (gnu packages xml) #:use-module ((srfi srfi-1) #:select (delete-duplicates))) =20 +(define-public qhttp + (package + (name "qhttp") + (version "3.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/azadkuh/qhttp.git") + (commit + (string-append "version-" version)))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "0cx23g4y4k4v9p5ph6h7gfhp8sfy1gcdv1g6bl44hppar1y0zfdq"))= )) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; No target + #:imported-modules + ((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules + (((guix build copy-build-system) + #:prefix copy:) + (guix build gnu-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "commondir.pri" + (("\\$\\$PRJDIR/xbin") + (string-append (assoc-ref outputs "out") "/lib")) + (("-L") + "-lhttp_parser -L") + (("\\$\\$PRJDIR/3rdparty") + "")) + (substitute* "src/src.pro" + (("SOURCES \\+=3D \\$\\$PRJDIR/3rdparty/http-parser/http= _parser.c") + "") + (("HEADERS \\+=3D \\$\\$PRJDIR/3rdparty/http-parser/http= _parser.h") + "")) + (substitute* '("src/private/qhttpbase.hpp" "src/qhttpabstra= cts.cpp") + (("http-parser/http_parser.h") + "http_parser.h")) + #t)) + (replace 'configure + (lambda _ + (invoke "qmake") + #t)) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("src" "include" + #:include-regexp ("\\.hpp$"))) + args))) + (add-after 'install 'remove-examples + (lambda* (#:key outputs #:allow-other-keys) + (with-directory-excursion + (string-append (assoc-ref outputs "out") "/lib") + (for-each delete-file + (list + "basic-server" + "helloworld" + "postcollector"))) + #t))))) + (inputs + `(("http-parser" ,http-parser) + ("qtbase" ,qtbase))) + (synopsis "Qt-based HTTP Library") + (description "Qhttp is a light-weight and asynchronous HTTP library +(both server & client) in Qt5 and c++14.") + (home-page "https://github.com/azadkuh/qhttp/") + (license license:expat))) + (define-public httpd (package (name "httpd") --=20 2.30.1 --------------14F79F17FA9C2747807B0782-- --fyKVIgLc45XgeZNFoTD5ZTnqpACLzFpMA-- --Dl5PVWQQ7eRIoVPlEQfEvEnZWDvqeUrc3 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCYDxeLAUDAAAAAAAKCRBfWBZkf4vlUUhT AQCPn7VXl7ixwlBl4bIiZsuzXoBNk8hgn0WxLCQcRa5PdQEA+8R298u1/e9xgzEmIPHubptnnr6m nsej5oE0pkRBcgs= =cUpV -----END PGP SIGNATURE----- --Dl5PVWQQ7eRIoVPlEQfEvEnZWDvqeUrc3--