From unknown Tue Sep 09 22:00:10 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26719: [PATCH] gnu: Move qutebrowser to web-browsers.scm. Resent-From: Kei Kebreau Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 30 Apr 2017 19:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26719 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26719@debbugs.gnu.org Cc: Kei Kebreau X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.14935819365360 (code B ref -1); Sun, 30 Apr 2017 19:53:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Apr 2017 19:52:16 +0000 Received: from localhost ([127.0.0.1]:48086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4ut9-0001OK-Dd for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:52:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4ut7-0001O5-UY for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:52:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4ut1-0005Un-88 for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:52:04 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35544) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d4ut1-0005Ui-4U for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:52:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4usz-0005Rg-Es for guix-patches@gnu.org; Sun, 30 Apr 2017 15:52:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4usv-0005U5-Pj for guix-patches@gnu.org; Sun, 30 Apr 2017 15:52:01 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:36063 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4usv-0005TW-D3 for guix-patches@gnu.org; Sun, 30 Apr 2017 15:51:57 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 040D8511B6D; Sun, 30 Apr 2017 21:51:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493581915; bh=48B4C9ckUScme2CdiXRbAO+7WDGGnnN8WCWHwKYK0rM=; h=From:To:Cc:Subject:Date:From; b=pD6Dq5bE5zRaBJfKs92V5hJjSKxOtJuKCBKUw9/cPH5Of4pNve88U1Z09nsXoJqR6 sWsssYD7KWH8vWZ41bgetxuBLZ9GMRaMbYy7cl2A4GKtO6yCnibgCbRvaWoFdvdY/P 52H04vh4eAoHKk3Hqdic80VQ6L9MfUN4HrzYJ9+I= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493581914; bh=48B4C9ckUScme2CdiXRbAO+7WDGGnnN8WCWHwKYK0rM=; h=From:To:Cc:Subject:Date:From; b=sWGvWN6qnl9v5R7YU1ADtYHP7zTUYWBk9xh9NHS5MGQjQUnXzq76+XVx6i6p+uc8Z gkQyyUDVoOnUSyaAPCkQkfqYsucGcXonQyXN8Z/jNksASBzODar+kMw/a6/00Hb98V Wdk0pFO76ww0lsfxGDDzK6AO/jCMhdy++hrLHw24= Date: Sun, 30 Apr 2017 15:51:41 -0400 Message-Id: <20170430195141.30265-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) 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: -4.0 (----) * gnu/packages/web.scm: Move qutebrowser... * gnu/packages/web-browsers.scm: ...here. --- gnu/packages/web-browsers.scm | 69 +++++++++++++++++++++++++++++++++++++= +++++- gnu/packages/web.scm | 62 -------------------------------------= - 2 files changed, 68 insertions(+), 63 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.sc= m index fe971de91..ad6461c57 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2016 Efraim Flashner ;;; Copyright =C2=A9 2016 Kei Kebreau +;;; Copyright =C2=A9 2017 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) #:use-module (gnu packages gtk) @@ -31,13 +33,17 @@ #:use-module (gnu packages libidn) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages image) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xorg) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python)) =20 (define-public dillo (package @@ -183,3 +189,64 @@ older or slower computers and embedded systems.") rendering engine entirely written from scratch. It is small and capable= of handling many of the web standards in use today.") (license license:gpl2+))) + +(define-public qutebrowser + (package + (name "qutebrowser") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/The-Compiler/" + "qutebrowser/releases/download/v" version "/" + "qutebrowser-" version ".tar.gz")) + (sha256 + (base32 + "05qryn56w2pbqhir4pl99idx7apx2xqw9f8wmbrhj59b1xgr3x2p")))) + (build-system python-build-system) + (native-inputs + `(("asciidoc" ,asciidoc))) + (inputs + `(("python-colorama" ,python-colorama) + ("python-cssutils" ,python-cssutils) + ("python-jinja2" ,python-jinja2) + ("python-markupsafe" ,python-markupsafe) + ("python-pygments" ,python-pygments) + ("python-pypeg2" ,python-pypeg2) + ("python-pyyaml" ,python-pyyaml) + ("python-pyqt" ,python-pyqt) + ("qtwebkit" ,qtwebkit))) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-more + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (app (string-append out "/share/applications")) + (hicolor (string-append out "/share/icons/hicolor"))= ) + (system* "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc= ") + (install-file "doc/qutebrowser.1" + (string-append out "/share/man/man1")) + + (for-each + (lambda (i) + (let ((src (format #f "icons/qutebrowser-~dx~d.png" i= i)) + (dest (format #f "~a/~dx~d/apps/qutebrowser.png" + hicolor i i))) + (mkdir-p (dirname dest)) + (copy-file src dest))) + '(16 24 32 48 64 128 256 512)) + (install-file "icons/qutebrowser.svg" + (string-append hicolor "/scalable/apps")) + + (substitute* "qutebrowser.desktop" + (("Exec=3Dqutebrowser") + (string-append "Exec=3D" out "/bin/qutebrowser"))) + (install-file "qutebrowser.desktop" app) + #t)))))) + (home-page "https://qutebrowser.org/") + (synopsis "Minimal, keyboard-focused, vim-like web browser") + (description "qutebrowser is a keyboard-focused browser with a minim= al +GUI. It is based on PyQt5 and QtWebKit.") + (license license:gpl3+))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6a4489508..c122077ba 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -78,7 +78,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages qt) #:use-module (gnu packages valgrind) #:use-module (gnu packages xml) #:use-module (gnu packages curl) @@ -4376,64 +4375,3 @@ functions of Tidy.") Features include the ability to stop SQL injections, XSS and CSRF attack= s and exploit attempts.") (license l:gpl2))) - -(define-public qutebrowser - (package - (name "qutebrowser") - (version "0.10.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/The-Compiler/" - "qutebrowser/releases/download/v" version "/" - "qutebrowser-" version ".tar.gz")) - (sha256 - (base32 - "05qryn56w2pbqhir4pl99idx7apx2xqw9f8wmbrhj59b1xgr3x2p")))) - (build-system python-build-system) - (native-inputs - `(("asciidoc" ,asciidoc))) - (inputs - `(("python-colorama" ,python-colorama) - ("python-cssutils" ,python-cssutils) - ("python-jinja2" ,python-jinja2) - ("python-markupsafe" ,python-markupsafe) - ("python-pygments" ,python-pygments) - ("python-pypeg2" ,python-pypeg2) - ("python-pyyaml" ,python-pyyaml) - ("python-pyqt" ,python-pyqt) - ("qtwebkit" ,qtwebkit))) - (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-more - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (app (string-append out "/share/applications")) - (hicolor (string-append out "/share/icons/hicolor"))= ) - (system* "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc= ") - (install-file "doc/qutebrowser.1" - (string-append out "/share/man/man1")) - - (for-each - (lambda (i) - (let ((src (format #f "icons/qutebrowser-~dx~d.png" i= i)) - (dest (format #f "~a/~dx~d/apps/qutebrowser.png" - hicolor i i))) - (mkdir-p (dirname dest)) - (copy-file src dest))) - '(16 24 32 48 64 128 256 512)) - (install-file "icons/qutebrowser.svg" - (string-append hicolor "/scalable/apps")) - - (substitute* "qutebrowser.desktop" - (("Exec=3Dqutebrowser") - (string-append "Exec=3D" out "/bin/qutebrowser"))) - (install-file "qutebrowser.desktop" app) - #t)))))) - (home-page "https://qutebrowser.org/") - (synopsis "Minimal, keyboard-focused, vim-like web browser") - (description "qutebrowser is a keyboard-focused browser with a minim= al -GUI. It is based on PyQt5 and QtWebKit.") - (license l:gpl3+))) --=20 2.12.2 From unknown Tue Sep 09 22:00:10 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26719: [PATCH] gnu: Move qutebrowser to web-browsers.scm. Resent-From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 May 2017 21:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26719 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Kei Kebreau Cc: 26719@debbugs.gnu.org Received: via spool by 26719-submit@debbugs.gnu.org id=B26719.149376096120227 (code B ref 26719); Tue, 02 May 2017 21:37:02 +0000 Received: (at 26719) by debbugs.gnu.org; 2 May 2017 21:36:01 +0000 Received: from localhost ([127.0.0.1]:51636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5fSj-0005G8-CG for submit@debbugs.gnu.org; Tue, 02 May 2017 17:36:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d5fSi-0005Fq-BX for 26719@debbugs.gnu.org; Tue, 02 May 2017 17:36:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d5fSZ-0003PL-Vf for 26719@debbugs.gnu.org; Tue, 02 May 2017 17:35:55 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:37233) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d5fSZ-0003PD-Sg; Tue, 02 May 2017 17:35:51 -0400 Received: from reverse-83.fdn.fr ([80.67.176.83]:53874 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1d5fSZ-0006zI-8D; Tue, 02 May 2017 17:35:51 -0400 From: ludo@gnu.org (Ludovic =?UTF-8?Q?Court=C3=A8s?=) References: <20170430195141.30265-1-kei@openmailbox.org> Date: Tue, 02 May 2017 23:35:49 +0200 In-Reply-To: <20170430195141.30265-1-kei@openmailbox.org> (Kei Kebreau's message of "Sun, 30 Apr 2017 15:51:41 -0400") Message-ID: <87r307yma2.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e X-Spam-Score: -5.0 (-----) 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: -5.0 (-----) Hi, Kei Kebreau skribis: > * gnu/packages/web.scm: Move qutebrowser... > * gnu/packages/web-browsers.scm: ...here. Sounds reasonable to me, go for it! Ludo=E2=80=99. From unknown Tue Sep 09 22:00:10 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Kei Kebreau Subject: bug#26719: closed (Re: bug#26719: [PATCH] gnu: Move qutebrowser to web-browsers.scm.) Message-ID: References: <87efw2gc5j.fsf@openmailbox.org> <20170430195141.30265-1-kei@openmailbox.org> X-Gnu-PR-Message: they-closed 26719 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26719@debbugs.gnu.org Date: Sat, 06 May 2017 16:54:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1494089642-23147-1" This is a multi-part message in MIME format... ------------=_1494089642-23147-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26719: [PATCH] gnu: Move qutebrowser to web-browsers.scm. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26719@debbugs.gnu.org. --=20 26719: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26719 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1494089642-23147-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26719-done) by debbugs.gnu.org; 6 May 2017 16:53:57 +0000 Received: from localhost ([127.0.0.1]:58449 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d72xw-000615-Pi for submit@debbugs.gnu.org; Sat, 06 May 2017 12:53:56 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:51556 helo=mail.openmailbox.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d72xv-00060w-CJ for 26719-done@debbugs.gnu.org; Sat, 06 May 2017 12:53:55 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id AE9C150FE72; Sat, 6 May 2017 18:53:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494089634; bh=RmT0VRmomm7XNMlow37ZWycbRVcDh0GN6c+xKiKuFPU=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=TTfwBbe5zlUhCBGjrafxbN8t3KGx5Y6DqXgwJvELajX5qcmyrbQOrmRA69uilXhN0 S/5LsV81RY0uY3ilfxUeWAE6xmMtm3qzkX3S3D1WX1MuMbczUUzTDRtt61lQUmd+YI uiTfsL1fJwQhTagQ3K4M3eQ7mS57RbCqjd+EEsgo= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1494089634; bh=RmT0VRmomm7XNMlow37ZWycbRVcDh0GN6c+xKiKuFPU=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=TTfwBbe5zlUhCBGjrafxbN8t3KGx5Y6DqXgwJvELajX5qcmyrbQOrmRA69uilXhN0 S/5LsV81RY0uY3ilfxUeWAE6xmMtm3qzkX3S3D1WX1MuMbczUUzTDRtt61lQUmd+YI uiTfsL1fJwQhTagQ3K4M3eQ7mS57RbCqjd+EEsgo= To: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Subject: Re: bug#26719: [PATCH] gnu: Move qutebrowser to web-browsers.scm. References: <20170430195141.30265-1-kei@openmailbox.org> <87r307yma2.fsf@gnu.org> Date: Sat, 06 May 2017 12:53:12 -0400 In-Reply-To: <87r307yma2.fsf@gnu.org> ("Ludovic \=\?utf-8\?Q\?Court\=C3\=A8s\=22'\?\= \=\?utf-8\?Q\?s\?\= message of "Tue, 02 May 2017 23:35:49 +0200") Message-ID: <87efw2gc5j.fsf@openmailbox.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 26719-done Cc: 26719-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: -0.7 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable ludo@gnu.org (Ludovic Court=C3=A8s) writes: > Hi, > > Kei Kebreau skribis: > >> * gnu/packages/web.scm: Move qutebrowser... >> * gnu/packages/web-browsers.scm: ...here. > > Sounds reasonable to me, go for it! > > Ludo=E2=80=99. Thanks! Pushed as 7610c3ca5540a7d0946e15a765b35f8bf068316e. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEg7ZwOtzKO2lLzi2m5qXuPBlGeg0FAlkN/3kACgkQ5qXuPBlG eg0L7g/+M2M2sDYIGA5WZtVm8OQ0ns+KYPTv/tv6YERmNjr8ApXVimbp7H9TEARa /5YSgzidcSBXiDjo+io5ujMptw68YLHfiq9TvejikowwNlGQaSBrzhK7MkTt9W78 FpcjG6C0p0albpUSoxVfcYY+vT+qrUdk+FNrqZu4srjkwUaPa4JmCCirjXzMtF/e bCWAl++AnVvAh5wYs98rkrLGtteeE8ER1l9iAsDAidm2sLGByz9lNoR/mdsdkqtF FudA7v2O0L3Pts4w84pth/g+LDPEgjzyPI0ydvkc20uA+MFVoP8mIFKpvIt6K/+j 5oRJofSwbJ7dVp0ZTELh/WDSK7fuWzCuACdZ2ZFxD9XghqI46836cBgkn0RQ46lR J4AntIdZqwiBuJNWULeZ63b25Kxj8kRxeC+rb3PWtKNZ7Lxj4euyAlUaJ4Mx0l37 qNJqVoFPDYC5uPUpnrstVjq1FcGgurrpoTLKnMF0nerz6bss5+pFuxZpL0SOQmDU ISnDRpS0rWAaQgh7Iws4+bmXsvn4dr0fdUWpniv1rJHuZenOForpenxaZfyxtqAX La2uE+vJL8SVmW1lXdCG0l3qK+DQFfzVO4+dBoLOXaH6KdvBxEB/vQbjJpgqyjwS pzmbW1cWzpwJeunps9+vIPUwWvITOYcAg08svTzmvmmTQ9aMNX8= =nPg7 -----END PGP SIGNATURE----- --=-=-=-- ------------=_1494089642-23147-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 30 Apr 2017 19:52:16 +0000 Received: from localhost ([127.0.0.1]:48086 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4ut9-0001OK-Dd for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:52:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1d4ut7-0001O5-UY for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:52:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4ut1-0005Un-88 for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:52:04 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:35544) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d4ut1-0005Ui-4U for submit@debbugs.gnu.org; Sun, 30 Apr 2017 15:52:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4usz-0005Rg-Es for guix-patches@gnu.org; Sun, 30 Apr 2017 15:52:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4usv-0005U5-Pj for guix-patches@gnu.org; Sun, 30 Apr 2017 15:52:01 -0400 Received: from lb1.openmailbox.org ([5.79.108.160]:36063 helo=mail.openmailbox.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4usv-0005TW-D3 for guix-patches@gnu.org; Sun, 30 Apr 2017 15:51:57 -0400 Received: by mail.openmailbox.org (Postfix, from userid 20002) id 040D8511B6D; Sun, 30 Apr 2017 21:51:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493581915; bh=48B4C9ckUScme2CdiXRbAO+7WDGGnnN8WCWHwKYK0rM=; h=From:To:Cc:Subject:Date:From; b=pD6Dq5bE5zRaBJfKs92V5hJjSKxOtJuKCBKUw9/cPH5Of4pNve88U1Z09nsXoJqR6 sWsssYD7KWH8vWZ41bgetxuBLZ9GMRaMbYy7cl2A4GKtO6yCnibgCbRvaWoFdvdY/P 52H04vh4eAoHKk3Hqdic80VQ6L9MfUN4HrzYJ9+I= From: Kei Kebreau DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=openmailbox.org; s=openmailbox; t=1493581914; bh=48B4C9ckUScme2CdiXRbAO+7WDGGnnN8WCWHwKYK0rM=; h=From:To:Cc:Subject:Date:From; b=sWGvWN6qnl9v5R7YU1ADtYHP7zTUYWBk9xh9NHS5MGQjQUnXzq76+XVx6i6p+uc8Z gkQyyUDVoOnUSyaAPCkQkfqYsucGcXonQyXN8Z/jNksASBzODar+kMw/a6/00Hb98V Wdk0pFO76ww0lsfxGDDzK6AO/jCMhdy++hrLHw24= To: guix-patches@gnu.org Subject: [PATCH] gnu: Move qutebrowser to web-browsers.scm. Date: Sun, 30 Apr 2017 15:51:41 -0400 Message-Id: <20170430195141.30265-1-kei@openmailbox.org> X-Mailer: git-send-email 2.12.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Kei Kebreau 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: -4.0 (----) * gnu/packages/web.scm: Move qutebrowser... * gnu/packages/web-browsers.scm: ...here. --- gnu/packages/web-browsers.scm | 69 +++++++++++++++++++++++++++++++++++++= +++++- gnu/packages/web.scm | 62 -------------------------------------= - 2 files changed, 68 insertions(+), 63 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.sc= m index fe971de91..ad6461c57 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright =C2=A9 2016 Efraim Flashner ;;; Copyright =C2=A9 2016 Kei Kebreau +;;; Copyright =C2=A9 2017 Eric Bavier ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,6 +25,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages curl) + #:use-module (gnu packages documentation) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) #:use-module (gnu packages gtk) @@ -31,13 +33,17 @@ #:use-module (gnu packages libidn) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages qt) #:use-module (gnu packages image) #:use-module (gnu packages textutils) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xorg) #:use-module (guix download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system python)) =20 (define-public dillo (package @@ -183,3 +189,64 @@ older or slower computers and embedded systems.") rendering engine entirely written from scratch. It is small and capable= of handling many of the web standards in use today.") (license license:gpl2+))) + +(define-public qutebrowser + (package + (name "qutebrowser") + (version "0.10.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/The-Compiler/" + "qutebrowser/releases/download/v" version "/" + "qutebrowser-" version ".tar.gz")) + (sha256 + (base32 + "05qryn56w2pbqhir4pl99idx7apx2xqw9f8wmbrhj59b1xgr3x2p")))) + (build-system python-build-system) + (native-inputs + `(("asciidoc" ,asciidoc))) + (inputs + `(("python-colorama" ,python-colorama) + ("python-cssutils" ,python-cssutils) + ("python-jinja2" ,python-jinja2) + ("python-markupsafe" ,python-markupsafe) + ("python-pygments" ,python-pygments) + ("python-pypeg2" ,python-pypeg2) + ("python-pyyaml" ,python-pyyaml) + ("python-pyqt" ,python-pyqt) + ("qtwebkit" ,qtwebkit))) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (add-after 'install 'install-more + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (app (string-append out "/share/applications")) + (hicolor (string-append out "/share/icons/hicolor"))= ) + (system* "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc= ") + (install-file "doc/qutebrowser.1" + (string-append out "/share/man/man1")) + + (for-each + (lambda (i) + (let ((src (format #f "icons/qutebrowser-~dx~d.png" i= i)) + (dest (format #f "~a/~dx~d/apps/qutebrowser.png" + hicolor i i))) + (mkdir-p (dirname dest)) + (copy-file src dest))) + '(16 24 32 48 64 128 256 512)) + (install-file "icons/qutebrowser.svg" + (string-append hicolor "/scalable/apps")) + + (substitute* "qutebrowser.desktop" + (("Exec=3Dqutebrowser") + (string-append "Exec=3D" out "/bin/qutebrowser"))) + (install-file "qutebrowser.desktop" app) + #t)))))) + (home-page "https://qutebrowser.org/") + (synopsis "Minimal, keyboard-focused, vim-like web browser") + (description "qutebrowser is a keyboard-focused browser with a minim= al +GUI. It is based on PyQt5 and QtWebKit.") + (license license:gpl3+))) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 6a4489508..c122077ba 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -78,7 +78,6 @@ #:use-module (gnu packages python) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) - #:use-module (gnu packages qt) #:use-module (gnu packages valgrind) #:use-module (gnu packages xml) #:use-module (gnu packages curl) @@ -4376,64 +4375,3 @@ functions of Tidy.") Features include the ability to stop SQL injections, XSS and CSRF attack= s and exploit attempts.") (license l:gpl2))) - -(define-public qutebrowser - (package - (name "qutebrowser") - (version "0.10.1") - (source - (origin - (method url-fetch) - (uri (string-append "https://github.com/The-Compiler/" - "qutebrowser/releases/download/v" version "/" - "qutebrowser-" version ".tar.gz")) - (sha256 - (base32 - "05qryn56w2pbqhir4pl99idx7apx2xqw9f8wmbrhj59b1xgr3x2p")))) - (build-system python-build-system) - (native-inputs - `(("asciidoc" ,asciidoc))) - (inputs - `(("python-colorama" ,python-colorama) - ("python-cssutils" ,python-cssutils) - ("python-jinja2" ,python-jinja2) - ("python-markupsafe" ,python-markupsafe) - ("python-pygments" ,python-pygments) - ("python-pypeg2" ,python-pypeg2) - ("python-pyyaml" ,python-pyyaml) - ("python-pyqt" ,python-pyqt) - ("qtwebkit" ,qtwebkit))) - (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases - (add-after 'install 'install-more - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (app (string-append out "/share/applications")) - (hicolor (string-append out "/share/icons/hicolor"))= ) - (system* "a2x" "-f" "manpage" "doc/qutebrowser.1.asciidoc= ") - (install-file "doc/qutebrowser.1" - (string-append out "/share/man/man1")) - - (for-each - (lambda (i) - (let ((src (format #f "icons/qutebrowser-~dx~d.png" i= i)) - (dest (format #f "~a/~dx~d/apps/qutebrowser.png" - hicolor i i))) - (mkdir-p (dirname dest)) - (copy-file src dest))) - '(16 24 32 48 64 128 256 512)) - (install-file "icons/qutebrowser.svg" - (string-append hicolor "/scalable/apps")) - - (substitute* "qutebrowser.desktop" - (("Exec=3Dqutebrowser") - (string-append "Exec=3D" out "/bin/qutebrowser"))) - (install-file "qutebrowser.desktop" app) - #t)))))) - (home-page "https://qutebrowser.org/") - (synopsis "Minimal, keyboard-focused, vim-like web browser") - (description "qutebrowser is a keyboard-focused browser with a minim= al -GUI. It is based on PyQt5 and QtWebKit.") - (license l:gpl3+))) --=20 2.12.2 ------------=_1494089642-23147-1--