From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 6A6sJZuerV4pSAAA0tVLHw (envelope-from ) for ; Sat, 02 May 2020 16:23:55 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id aKVDO6WerV7aQwAAbx9fmQ (envelope-from ) for ; Sat, 02 May 2020 16:24:05 +0000 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:470:142::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 A2AC2941C13 for ; Sat, 2 May 2020 16:24:03 +0000 (UTC) Received: from localhost ([::1]:41622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUuiS-0004Ma-Dr for larch@yhetil.org; Sat, 02 May 2020 12:10:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jUuiL-0004Is-0J for guix-patches@gnu.org; Sat, 02 May 2020 12:10:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUuiI-0005uU-JT for guix-patches@gnu.org; Sat, 02 May 2020 12:10:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jUuiH-0005u7-U1 for guix-patches@gnu.org; Sat, 02 May 2020 12:10:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jUuiH-00059h-NG for guix-patches@gnu.org; Sat, 02 May 2020 12:10:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40994] patch#40994 Programs With Movie Titles (PWMT) Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 May 2020 16:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40994 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Brice Waegeneire Cc: 40994@debbugs.gnu.org Received: via spool by 40994-submit@debbugs.gnu.org id=B40994.158843578119786 (code B ref 40994); Sat, 02 May 2020 16:10:01 +0000 Received: (at 40994) by debbugs.gnu.org; 2 May 2020 16:09:41 +0000 Received: from localhost ([127.0.0.1]:53744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUuho-00058t-Ru for submit@debbugs.gnu.org; Sat, 02 May 2020 12:09:41 -0400 Received: from knopi.disroot.org ([178.21.23.139]:37142) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUuhl-00058i-KC for 40994@debbugs.gnu.org; Sat, 02 May 2020 12:09:32 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id DF5822CD52; Sat, 2 May 2020 18:09:27 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f2asdhS4XhDP; Sat, 2 May 2020 18:09:25 +0200 (CEST) Date: Sat, 2 May 2020 12:09:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588435765; bh=lPazwnqVn35gw34Dyo4ambqlWw8OHeLeTfcUIp3c+dA=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=Qp0Mh9bTubylhtc9QBG6j0Aq97msqxukh07WYUc8vvrP66jGpvxJ7F+BU/PCHSxJ8 Kub37aLGdOU/6YCGZ3qp7PtE0FzeIlAFkmDRu4yfy2znRKxnHmFlnBi/EPHuqRQDm0 +5Mo9SCBGj/bKnBRokdtV9YEL7nz3/wMwNZEOkTlnODMFXYYMFaszXQNgX4GL0HAUe beaQDXz0yZYyyWX4rPjqzSG3SnPGq1cWE6h0+/MVtHbOvKVw2YoMh8F6lUFU9EDYkA UTEU6MgGzR6LfiYmODi8jpUGFFoc5RXCWWXUZRP/hjRTdUjg2OspMG+Zxjaq3+YraN YKKqn6I1nthQg== From: Raghav Gururajan Message-ID: <20200502120901.36d80711.raghavgururajan@disroot.org> In-Reply-To: <76c18088643dcab9d395a0f9760d3a74@waegenei.re> References: <76c18088643dcab9d395a0f9760d3a74@waegenei.re> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/ubvUeRE2r+Y1nJNEWSJx0Ub" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 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" X-Scanner: scn0 X-Spam-Score: 1.59 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=Qp0Mh9bT; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 2001:470:142::17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Scan-Result: default: False [1.59 / 13.00]; GENERIC_REPUTATION(0.00)[-0.49511383981536]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2001:470:142::/48:c]; MV_CASE(0.50)[]; HAS_ATTACHMENT(0.00)[]; IP_REPUTATION_HAM(0.00)[asn: 22989(0.15), country: US(-0.00), ip: 2001:470:142::17(-0.50)]; DWL_DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; R_DKIM_REJECT(1.00)[disroot.org:s=mail]; MX_GOOD(-0.50)[cached: eggs.gnu.org]; RCPT_COUNT_TWO(0.00)[2]; DKIM_TRACE(0.00)[disroot.org:-]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; RCVD_IN_DNSWL_FAIL(0.00)[2001:470:142::17:server fail]; MIME_TRACE(0.00)[0:+,1:+,2:+,3:+,4:+,5:+,6:+,7:+,8:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:22989, ipnet:2001:470:142::/48, country:US]; TAGGED_FROM(0.00)[larch=yhetil.org]; FROM_NEQ_ENVFROM(0.00)[raghavgururajan@disroot.org,guix-patches-bounces@gnu.org]; ARC_NA(0.00)[]; URIBL_BLOCKED(0.00)[gnu.org:url,n0.is:email,pwmt.org:url,fastmail.com:email,xpdfreader.com:url,tobias.gr:email,openmailbox.org:email,denknerd.org:email,disroot.org:email]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; HAS_LIST_UNSUB(-0.01)[]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_SEVEN(0.00)[10]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[disroot.org : SPF not aligned (relaxed),none] X-TUID: fa7lIvcYE7Cg --MP_/ubvUeRE2r+Y1nJNEWSJx0Ub Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi Brice! > I don't see a patch related to jumanji, is it voluntary? I tried packaging Jumanji, but it is ported to new versions of webkitgtk. We do not have older versions of webkitgtk in guix. > Could you take example on a commit like > aff0cce9175aaf836dd78941eb17549e3bfa7188 (there must be others like it) > which move packages to a separate module. In particular create a commit > that just move the packages in the new module and adjust the modules > that > depend on them (if any). Then add your modifications to the packages in > separate commits to the one moving them with the git messages correctly > formatted, ie. not in a free form style. Otherwise it's difficult to > understand what your package modifications are related to just moving > them > elsewhere,since it's just a big diff. Thanks for the feedback. Sure thing! Please find the attachments with this email, for moving stuffs. All the moved packages only refer to each other. So no need of altering any other package definitions. I will send another set of patches for modifying stuffs, Thank you! Regards, RG. --MP_/ubvUeRE2r+Y1nJNEWSJx0Ub Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-gnu-Move-girara-from-gtk.scm-to-pwmt.scm.patch =46rom a05c5d174a9ee40e433a64c50f19c7f106381903 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 11:16:04 -0400 Subject: [PATCH 1/7] gnu: Move girara from gtk.scm to pwmt.scm. * gnu/packages/gtk.scm (girara): Move to [...] * gnu/packages/pwmt.scm (girara): [...] here. --- gnu/packages/gtk.scm | 49 ----------------------- gnu/packages/pwmt.scm | 91 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 49 deletions(-) create mode 100644 gnu/packages/pwmt.scm diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bea4850d15..4d093a0e0a 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1445,55 +1445,6 @@ In addition to the low level layout rendering routin= es, Pango includes and routines to assist in editing internationalized text.") (license license:lgpl2.1+))) =20 -(define-public girara - (package - (name "girara") - (version "0.3.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.pwmt.org/pwmt/girara") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k")))) - (native-inputs `(("pkg-config" ,pkg-config) - ("check" ,check) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("xorg-server" ,xorg-server-for-tests))) - ;; Listed in 'Requires.private' of 'girara.pc'. - (propagated-inputs `(("gtk+" ,gtk+))) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xserver - ;; Tests require a running X server. - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (display ":1")) - (setenv "DISPLAY" display) - - ;; On busy machines, tests may take longer than - ;; the default of four seconds. - (setenv "CK_DEFAULT_TIMEOUT" "20") - - ;; Don't fail due to missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system (string-append xorg-server "/bin/Xv= fb " - display " &"))))))))) - (build-system meson-build-system) - (home-page "https://pwmt.org/projects/girara/") - (synopsis "Library for minimalistic gtk+3 user interfaces") - (description "Girara is a library that implements a user interface that -focuses on simplicity and minimalism. Currently based on GTK+, a -cross-platform widget toolkit, it provides an interface that focuses on th= ree -main components: a so-called view widget that represents the actual -application, an input bar that is used to execute commands of the -application and the status bar which provides the user with current -information.") - (license license:zlib))) - (define-public gtk-doc (package (name "gtk-doc") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm new file mode 100644 index 0000000000..8185cc40d9 --- /dev/null +++ b/gnu/packages/pwmt.scm @@ -0,0 +1,91 @@ +;;; GNU Guix --- Functional package management for GNU +;;; +;;; Copyright =C2=A9 2015 Paul van der Walt +;;; Copyright =C2=A9 2016 ng0 +;;; Copyright =C2=A9 2017 2018 Marius Bakke +;;; Copyright =C2=A9 2017 Kei Kebreau +;;; Copyright =C2=A9 2018 2019 2020 Tobias Geerinckx-Rice +;;; Copyright =C2=A9 2020 Raghav Gururajan +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages pwmt) + #:use-module (gnu packages) + #:use-module (gnu packages check) + #:use-module (gnu packages documentation) + #:use-module (gnu packages gettext) + #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) + #:use-module (gnu packages gtk) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages web) + #:use-module (gnu packages xorg) + #:use-module (gnu packages xdisorg) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix git-download) + #:use-module (guix build-system gnu) + #:use-module (guix build-system meson)) + +(define-public girara + (package + (name "girara") + (version "0.3.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.pwmt.org/pwmt/girara") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08rpw9hkaprm4r853xy1d35i2af1pji8c3mzzl01mmwmyr9p0x8k")))) + (native-inputs `(("pkg-config" ,pkg-config) + ("check" ,check) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("xorg-server" ,xorg-server-for-tests))) + ;; Listed in 'Requires.private' of 'girara.pc'. + (propagated-inputs `(("gtk+" ,gtk+))) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'start-xserver + ;; Tests require a running X server. + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (display ":1")) + (setenv "DISPLAY" display) + + ;; On busy machines, tests may take longer than + ;; the default of four seconds. + (setenv "CK_DEFAULT_TIMEOUT" "20") + + ;; Don't fail due to missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system (string-append xorg-server "/bin/Xv= fb " + display " &"))))))))) + (build-system meson-build-system) + (home-page "https://pwmt.org/projects/girara/") + (synopsis "Library for minimalistic gtk+3 user interfaces") + (description "Girara is a library that implements a user interface that +focuses on simplicity and minimalism. Currently based on GTK+, a +cross-platform widget toolkit, it provides an interface that focuses on th= ree +main components: a so-called view widget that represents the actual +application, an input bar that is used to execute commands of the +application and the status bar which provides the user with current +information.") + (license license:zlib))) \ No newline at end of file --=20 2.26.2 --MP_/ubvUeRE2r+Y1nJNEWSJx0Ub Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0002-gnu-Move-zathura-from-pdf.scm-to-pwmt.scm.patch >From 1b3a17d3d1fba5363f0f4357fb36a0366337c1e0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 11:22:50 -0400 Subject: [PATCH 2/7] gnu: Move zathura from pdf.scm to pwmt.scm. * gnu/packages/pdf.scm (zathura): Move to [...] * gnu/packages/pwmt.scm (zathura): [...] here. --- gnu/packages/pdf.scm | 58 ----------------------------------------- gnu/packages/pwmt.scm | 60 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 58 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 71b8177582..ff75e1ed55 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -577,64 +577,6 @@ by using the @code{mupdf} rendering library.") by using the poppler rendering engine.") (license license:zlib))) -(define-public zathura - (package - (name "zathura") - (version "0.4.5") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura/download/zathura-" - version ".tar.xz")) - (sha256 - (base32 - "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c")))) - (native-inputs `(("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - - ;; For building documentation. - ("python-sphinx" ,python-sphinx) - - ;; For building icons. - ("librsvg" ,librsvg) - - ;; For tests. - ("check" ,check) - ("xorg-server" ,xorg-server-for-tests))) - (inputs `(("sqlite" ,sqlite))) - ;; Listed in 'Requires.private' of 'zathura.pc'. - (propagated-inputs `(("cairo" ,cairo) - ("girara" ,girara))) - (native-search-paths - (list (search-path-specification - (variable "ZATHURA_PLUGINS_PATH") - (files '("lib/zathura"))))) - (build-system meson-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xserver - ;; Tests require a running X server. - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (display ":1")) - (setenv "DISPLAY" display) - - ;; On busy machines, tests may take longer than - ;; the default of four seconds. - (setenv "CK_DEFAULT_TIMEOUT" "20") - - ;; Don't fail due to missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system (string-append xorg-server "/bin/Xvfb " - display " &"))))))))) - (home-page "https://pwmt.org/projects/zathura/") - (synopsis "Lightweight keyboard-driven PDF viewer") - (description "Zathura is a customizable document viewer. It provides a -minimalistic interface and an interface that mainly focuses on keyboard -interaction.") - (license license:zlib))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 8185cc40d9..5702041f72 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -31,6 +31,8 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) #:use-module (gnu packages web) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) @@ -88,4 +90,62 @@ main components: a so-called view widget that represents the actual application, an input bar that is used to execute commands of the application and the status bar which provides the user with current information.") + (license license:zlib))) + +(define-public zathura + (package + (name "zathura") + (version "0.4.5") + (source (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura/download/zathura-" + version ".tar.xz")) + (sha256 + (base32 + "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c")))) + (native-inputs `(("pkg-config" ,pkg-config) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + + ;; For building documentation. + ("python-sphinx" ,python-sphinx) + + ;; For building icons. + ("librsvg" ,librsvg) + + ;; For tests. + ("check" ,check) + ("xorg-server" ,xorg-server-for-tests))) + (inputs `(("sqlite" ,sqlite))) + ;; Listed in 'Requires.private' of 'zathura.pc'. + (propagated-inputs `(("cairo" ,cairo) + ("girara" ,girara))) + (native-search-paths + (list (search-path-specification + (variable "ZATHURA_PLUGINS_PATH") + (files '("lib/zathura"))))) + (build-system meson-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'start-xserver + ;; Tests require a running X server. + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (display ":1")) + (setenv "DISPLAY" display) + + ;; On busy machines, tests may take longer than + ;; the default of four seconds. + (setenv "CK_DEFAULT_TIMEOUT" "20") + + ;; Don't fail due to missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system (string-append xorg-server "/bin/Xvfb " + display " &"))))))))) + (home-page "https://pwmt.org/projects/zathura/") + (synopsis "Lightweight keyboard-driven PDF viewer") + (description "Zathura is a customizable document viewer. It provides a +minimalistic interface and an interface that mainly focuses on keyboard +interaction.") (license license:zlib))) \ No newline at end of file -- 2.26.2 --MP_/ubvUeRE2r+Y1nJNEWSJx0Ub Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0003-gnu-Move-zathura-ps-from-pdf.scm-to-pwmt.scm.patch >From 0096754a6564ea8dfa7826aeb897fbce28bd7016 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 11:27:02 -0400 Subject: [PATCH 3/7] gnu: Move zathura-ps from pdf.scm to pwmt.scm. * gnu/packages/pdf.scm (zathura-ps): Move to [...] * gnu/packages/pwmt.scm (zathura-ps): [...] here. --- gnu/packages/pdf.scm | 35 ----------------------------------- gnu/packages/pwmt.scm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index ff75e1ed55..c5539c7df5 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -426,41 +426,6 @@ reading and editing of existing PDF files.") using libarchive.") (license license:zlib))) -(define-public zathura-ps - (package - (name "zathura-ps") - (version "0.2.6") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-ps/download/zathura-ps-" - version ".tar.xz")) - (sha256 - (base32 - "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("libspectre" ,libspectre) - ("zathura" ,zathura))) - (build-system meson-build-system) - (arguments - `(#:tests? #f ; package does not contain tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.2.6: the new Meson build system - ;; now hard-codes an incorrect plugin directory. Fix it. - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "meson.build" - (("(install_dir:).*" _ key) - (string-append key - "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) - #t))))) - (home-page "https://pwmt.org/projects/zathura-ps/") - (synopsis "PS support for zathura (libspectre backend)") - (description "The zathura-ps plugin adds PS support to zathura -using libspectre.") - (license license:zlib))) - (define-public zathura-djvu (package (name "zathura-djvu") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 5702041f72..5881cf5c80 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages check) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) + #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -148,4 +149,39 @@ information.") (description "Zathura is a customizable document viewer. It provides a minimalistic interface and an interface that mainly focuses on keyboard interaction.") + (license license:zlib))) + +(define-public zathura-ps + (package + (name "zathura-ps") + (version "0.2.6") + (source (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-ps/download/zathura-ps-" + version ".tar.xz")) + (sha256 + (base32 + "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y")))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libspectre" ,libspectre) + ("zathura" ,zathura))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; package does not contain tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-directory + ;; Something of a regression in 0.2.6: the new Meson build system + ;; now hard-codes an incorrect plugin directory. Fix it. + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "meson.build" + (("(install_dir:).*" _ key) + (string-append key + "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) + #t))))) + (home-page "https://pwmt.org/projects/zathura-ps/") + (synopsis "PS support for zathura (libspectre backend)") + (description "The zathura-ps plugin adds PS support to zathura +using libspectre.") (license license:zlib))) \ No newline at end of file -- 2.26.2 --MP_/ubvUeRE2r+Y1nJNEWSJx0Ub Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0004-gnu-Move-zathura-pdf-poppler-from-pdf.scm-to-pwmt.sc.patch >From 47fc6ed3548bba6d65cf1d7c789d56e42cb5c106 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 11:53:48 -0400 Subject: [PATCH 4/7] gnu: Move zathura-pdf-poppler from pdf.scm to pwmt.scm. * gnu/packages/pdf.scm (zathura-pdf-poppler): Move to [...] * gnu/packages/pwmt.scm (zathura-pdf-poppler): [...] here. --- gnu/packages/pdf.scm | 36 ------------------------------------ gnu/packages/pwmt.scm | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index c5539c7df5..0aca1e707a 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -506,42 +506,6 @@ using the DjVuLibre library.") by using the @code{mupdf} rendering library.") (license license:zlib))) -(define-public zathura-pdf-poppler - (package - (name "zathura-pdf-poppler") - (version "0.3.0") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-" - version ".tar.xz")) - (sha256 - (base32 - "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs - `(("poppler" ,poppler) - ("zathura" ,zathura))) - (build-system meson-build-system) - (arguments - `(#:tests? #f ; package does not include tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.2.9: the new Meson build system - ;; now hard-codes an incorrect plugin directory. Fix it. - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "meson.build" - (("(install_dir:).*" _ key) - (string-append key - "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) - #t))))) - (home-page "https://pwmt.org/projects/zathura-pdf-poppler/") - (synopsis "PDF support for zathura (poppler backend)") - (description "The zathura-pdf-poppler plugin adds PDF support to zathura -by using the poppler rendering engine.") - (license license:zlib))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 5881cf5c80..459281a0aa 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) @@ -184,4 +185,40 @@ interaction.") (synopsis "PS support for zathura (libspectre backend)") (description "The zathura-ps plugin adds PS support to zathura using libspectre.") + (license license:zlib))) + +(define-public zathura-pdf-poppler + (package + (name "zathura-pdf-poppler") + (version "0.3.0") + (source (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-" + version ".tar.xz")) + (sha256 + (base32 + "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m")))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("poppler" ,poppler) + ("zathura" ,zathura))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; package does not include tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-directory + ;; Something of a regression in 0.2.9: the new Meson build system + ;; now hard-codes an incorrect plugin directory. Fix it. + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "meson.build" + (("(install_dir:).*" _ key) + (string-append key + "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) + #t))))) + (home-page "https://pwmt.org/projects/zathura-pdf-poppler/") + (synopsis "PDF support for zathura (poppler backend)") + (description "The zathura-pdf-poppler plugin adds PDF support to zathura +by using the poppler rendering engine.") (license license:zlib))) \ No newline at end of file -- 2.26.2 --MP_/ubvUeRE2r+Y1nJNEWSJx0Ub Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0005-gnu-Move-zathura-pdf-mupdf-from-pdf.scm-to-pwmt.scm.patch >From dc3d3b63f1c4beaeca29205cbb2ae29c7dd4654a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 11:57:05 -0400 Subject: [PATCH 5/7] gnu: Move zathura-pdf-mupdf from pdf.scm to pwmt.scm. * gnu/packages/pdf.scm (zathura-pdf-mupdf): Move to [...] * gnu/packages/pwmt.scm (zathura-pdf-mupdf): [...] here. --- gnu/packages/pdf.scm | 44 ---------------------------------------- gnu/packages/pwmt.scm | 47 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 44 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0aca1e707a..30a8ec20e6 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -462,50 +462,6 @@ using libarchive.") using the DjVuLibre library.") (license license:zlib))) -(define-public zathura-pdf-mupdf - (package - (name "zathura-pdf-mupdf") - (version "0.3.5") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-pdf-mupdf" - "/download/zathura-pdf-mupdf-" version ".tar.xz")) - (sha256 - (base32 - "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs - `(("jbig2dec" ,jbig2dec) - ("libjpeg" ,libjpeg) - ("mujs" ,mujs) - ("mupdf" ,mupdf) - ("openjpeg" ,openjpeg) - ("openssl" ,openssl) - ("zathura" ,zathura))) - (build-system meson-build-system) - (arguments - `(#:tests? #f ; package does not contain tests - #:configure-flags (list (string-append "-Dplugindir=" - (assoc-ref %outputs "out") - "/lib/zathura") - "-Dlink-external=true") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'add-mujs-to-dependencies - (lambda _ - ;; Add mujs to the 'build_dependencies'. - (substitute* "meson.build" - (("^ libopenjp2 = dependency.*" x) - (string-append x " mujs = cc.find_library('mujs')\n")) - (("^ libopenjp2") - " libopenjp2, mujs"))))))) - (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/") - (synopsis "PDF support for zathura (mupdf backend)") - (description "The zathura-pdf-mupdf plugin adds PDF support to zathura -by using the @code{mupdf} rendering library.") - (license license:zlib))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 459281a0aa..1399c137a7 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -31,10 +31,13 @@ #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages javascript) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) + #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xorg) #:use-module (gnu packages xdisorg) @@ -221,4 +224,48 @@ using libspectre.") (synopsis "PDF support for zathura (poppler backend)") (description "The zathura-pdf-poppler plugin adds PDF support to zathura by using the poppler rendering engine.") + (license license:zlib))) + +(define-public zathura-pdf-mupdf + (package + (name "zathura-pdf-mupdf") + (version "0.3.5") + (source (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-pdf-mupdf" + "/download/zathura-pdf-mupdf-" version ".tar.xz")) + (sha256 + (base32 + "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq")))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("jbig2dec" ,jbig2dec) + ("libjpeg" ,libjpeg) + ("mujs" ,mujs) + ("mupdf" ,mupdf) + ("openjpeg" ,openjpeg) + ("openssl" ,openssl) + ("zathura" ,zathura))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; package does not contain tests + #:configure-flags (list (string-append "-Dplugindir=" + (assoc-ref %outputs "out") + "/lib/zathura") + "-Dlink-external=true") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'add-mujs-to-dependencies + (lambda _ + ;; Add mujs to the 'build_dependencies'. + (substitute* "meson.build" + (("^ libopenjp2 = dependency.*" x) + (string-append x " mujs = cc.find_library('mujs')\n")) + (("^ libopenjp2") + " libopenjp2, mujs"))))))) + (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/") + (synopsis "PDF support for zathura (mupdf backend)") + (description "The zathura-pdf-mupdf plugin adds PDF support to zathura +by using the @code{mupdf} rendering library.") (license license:zlib))) \ No newline at end of file -- 2.26.2 --MP_/ubvUeRE2r+Y1nJNEWSJx0Ub Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0006-gnu-Move-zathura-djvu-from-pdf.scm-to-pwmt.scm.patch >From 01abedd8f26bcc9df7b27d9905f0afa3a399a378 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 12:00:08 -0400 Subject: [PATCH 6/7] gnu: Move zathura-djvu from pdf.scm to pwmt.scm. * gnu/packages/pdf.scm (zathura-djvu): Move to [...] * gnu/packages/pwmt.scm (zathura-djvu): [...] here. --- gnu/packages/pdf.scm | 36 ------------------------------------ gnu/packages/pwmt.scm | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 30a8ec20e6..6949ca4750 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -426,42 +426,6 @@ reading and editing of existing PDF files.") using libarchive.") (license license:zlib))) -(define-public zathura-djvu - (package - (name "zathura-djvu") - (version "0.2.9") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-" - version ".tar.xz")) - (sha256 - (base32 - "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs - `(("djvulibre" ,djvulibre) - ("zathura" ,zathura))) - (build-system meson-build-system) - (arguments - `(#:tests? #f ; package does not contain tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.2.8: the new Meson build system - ;; now hard-codes an incorrect plugin directory. Fix it. - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "meson.build" - (("(install_dir:).*" _ key) - (string-append key - "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) - #t))))) - (home-page "https://pwmt.org/projects/zathura-djvu/") - (synopsis "DjVu support for zathura (DjVuLibre backend)") - (description "The zathura-djvu plugin adds DjVu support to zathura -using the DjVuLibre library.") - (license license:zlib))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 1399c137a7..1662ee6d45 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -25,6 +25,7 @@ (define-module (gnu packages pwmt) #:use-module (gnu packages) #:use-module (gnu packages check) + #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -268,4 +269,40 @@ by using the poppler rendering engine.") (synopsis "PDF support for zathura (mupdf backend)") (description "The zathura-pdf-mupdf plugin adds PDF support to zathura by using the @code{mupdf} rendering library.") + (license license:zlib))) + +(define-public zathura-djvu + (package + (name "zathura-djvu") + (version "0.2.9") + (source (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-djvu/download/zathura-djvu-" + version ".tar.xz")) + (sha256 + (base32 + "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln")))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("djvulibre" ,djvulibre) + ("zathura" ,zathura))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; package does not contain tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-directory + ;; Something of a regression in 0.2.8: the new Meson build system + ;; now hard-codes an incorrect plugin directory. Fix it. + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "meson.build" + (("(install_dir:).*" _ key) + (string-append key + "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) + #t))))) + (home-page "https://pwmt.org/projects/zathura-djvu/") + (synopsis "DjVu support for zathura (DjVuLibre backend)") + (description "The zathura-djvu plugin adds DjVu support to zathura +using the DjVuLibre library.") (license license:zlib))) \ No newline at end of file -- 2.26.2 --MP_/ubvUeRE2r+Y1nJNEWSJx0Ub Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0007-gnu-Move-zathura-cb-from-pdf.scm-to-pwmt.scm.patch >From a9f155ad914c4f83a8d4220249d3cbf4fab096ac Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 12:01:58 -0400 Subject: [PATCH 7/7] gnu: Move zathura-cb from pdf.scm to pwmt.scm. * gnu/packages/pdf.scm (zathura-cb): Move to [...] * gnu/packages/pwmt.scm (zathura-cb): [...] here. --- gnu/packages/pdf.scm | 35 ----------------------------------- gnu/packages/pwmt.scm | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 6949ca4750..caae864979 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -391,41 +391,6 @@ reading and editing of existing PDF files.") (license license:gpl3) ; or gpl2, but not gpl2+ (home-page "https://www.xpdfreader.com/"))) -(define-public zathura-cb - (package - (name "zathura-cb") - (version "0.1.8") - (source (origin - (method url-fetch) - (uri - (string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-" - version ".tar.xz")) - (sha256 - (base32 - "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) - (native-inputs `(("pkg-config" ,pkg-config))) - (inputs `(("libarchive" ,libarchive) - ("zathura" ,zathura))) - (build-system meson-build-system) - (arguments - `(#:tests? #f ; package does not contain tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-plugin-directory - ;; Something of a regression in 0.1.8: the new Meson build system - ;; now hard-codes an incorrect plugin directory. Fix it. - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "meson.build" - (("(install_dir:).*" _ key) - (string-append key - "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) - #t))))) - (home-page "https://pwmt.org/projects/zathura-cb/") - (synopsis "Comic book support for zathura (libarchive backend)") - (description "The zathura-cb plugin adds comic book support to zathura -using libarchive.") - (license license:zlib))) - (define-public podofo (package (name "podofo") diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 1662ee6d45..2516c62485 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -24,6 +24,7 @@ (define-module (gnu packages pwmt) #:use-module (gnu packages) + #:use-module (gnu packages backup) #:use-module (gnu packages check) #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) @@ -305,4 +306,39 @@ by using the @code{mupdf} rendering library.") (synopsis "DjVu support for zathura (DjVuLibre backend)") (description "The zathura-djvu plugin adds DjVu support to zathura using the DjVuLibre library.") + (license license:zlib))) + +(define-public zathura-cb + (package + (name "zathura-cb") + (version "0.1.8") + (source (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-cb/download/zathura-cb-" + version ".tar.xz")) + (sha256 + (base32 + "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) + (native-inputs `(("pkg-config" ,pkg-config))) + (inputs `(("libarchive" ,libarchive) + ("zathura" ,zathura))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; package does not contain tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-directory + ;; Something of a regression in 0.1.8: the new Meson build system + ;; now hard-codes an incorrect plugin directory. Fix it. + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "meson.build" + (("(install_dir:).*" _ key) + (string-append key + "'" (assoc-ref outputs "out") "/lib/zathura'\n"))) + #t))))) + (home-page "https://pwmt.org/projects/zathura-cb/") + (synopsis "Comic book support for zathura (libarchive backend)") + (description "The zathura-cb plugin adds comic book support to zathura +using libarchive.") (license license:zlib))) \ No newline at end of file -- 2.26.2 --MP_/ubvUeRE2r+Y1nJNEWSJx0Ub--