From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d4uu1-0005d8-OV for guix-patches@gnu.org; Sun, 30 Apr 2017 15:53:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d4uty-0005e3-0E for guix-patches@gnu.org; Sun, 30 Apr 2017 15:53:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49887) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d4utx-0005dy-Tj for guix-patches@gnu.org; Sun, 30 Apr 2017 15:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1d4utx-0001PO-Ns for guix-patches@gnu.org; Sun, 30 Apr 2017 15:53:01 -0400 Subject: bug#26719: [PATCH] gnu: Move qutebrowser to web-browsers.scm. Resent-Message-ID: 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 From: Kei Kebreau Date: Sun, 30 Apr 2017 15:51:41 -0400 Message-Id: <20170430195141.30265-1-kei@openmailbox.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26719@debbugs.gnu.org Cc: Kei Kebreau * 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