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 CAE4LWxHrl6vTgAA0tVLHw (envelope-from ) for ; Sun, 03 May 2020 04:24:12 +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 yLAIEHZHrl48PQAAB5/wlQ (envelope-from ) for ; Sun, 03 May 2020 04:24:22 +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 40A6694389B for ; Sun, 3 May 2020 04:24:09 +0000 (UTC) Received: from localhost ([::1]:34790 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jV6Ai-0005XN-3r for larch@yhetil.org; Sun, 03 May 2020 00:24:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45898) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jV6Ac-0005XH-8p for guix-patches@gnu.org; Sun, 03 May 2020 00:24:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:42902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jV6Ab-0006nx-Vx for guix-patches@gnu.org; Sun, 03 May 2020 00:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jV6Ab-0007KI-Rx for guix-patches@gnu.org; Sun, 03 May 2020 00:24: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: Sun, 03 May 2020 04:24: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.158847979428110 (code B ref 40994); Sun, 03 May 2020 04:24:01 +0000 Received: (at 40994) by debbugs.gnu.org; 3 May 2020 04:23:14 +0000 Received: from localhost ([127.0.0.1]:54448 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV69o-0007JJ-U7 for submit@debbugs.gnu.org; Sun, 03 May 2020 00:23:13 -0400 Received: from knopi.disroot.org ([178.21.23.139]:54058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jV69l-0007J9-RE for 40994@debbugs.gnu.org; Sun, 03 May 2020 00:23:11 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 5B3442DA51; Sun, 3 May 2020 06:23:08 +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 3YVR73zTEXn9; Sun, 3 May 2020 06:23:05 +0200 (CEST) Date: Sun, 3 May 2020 00:22:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588479785; bh=liMKERUOsIRvuasNmIG+jS8hrieFyO7IY68EZmxsxxI=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=fpbszNfvs2mdSwre3DLrsZYjlIrOfYrvg5bA1IPpaPG7wrDu+Ezd8bCkUYV9HQ2VL aFsRE2jhQZQPP93rbxhdiP9EWueUCgzLNlX2GzPskjuW40XAL0h6AHsYD4L3qdsD5o dyii9HPP6//Z65OZX7xpo43AItuCgMAxTcVhS3WrmU1zkPm1di14kW6ug3rtYd2o9V nuduGVixOLTFTemz4mSKa19MxkDzPURRMqmJ08qIjPqLlP0apaa01WIaFz9t4+QS19 gTpDFeq0wL5/Nm10QoQQan/Ih9AyWKhcsgzVgxRdCkTju1IZ4lH3+fGQlQ3aV/umPP uTb+paVg9grpQ== From: Raghav Gururajan Message-ID: <20200503002240.3c2bf6a3.raghavgururajan@disroot.org> In-Reply-To: <20200502120901.36d80711.raghavgururajan@disroot.org> References: <76c18088643dcab9d395a0f9760d3a74@waegenei.re> <20200502120901.36d80711.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/o_CInvp7KVTU0DWWCmlfth3" X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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: 3.09 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=fpbszNfv; 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 [3.09 / 13.00]; GENERIC_REPUTATION(0.00)[-0.49410640636874]; MX_INVALID(1.00)[cached]; 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.49)]; DWL_DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; R_DKIM_REJECT(1.00)[disroot.org:s=mail]; DKIM_TRACE(0.00)[disroot.org:-]; RCPT_COUNT_TWO(0.00)[2]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; 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)[pwmt.org:url,disroot.org:email]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[multipart/mixed,text/plain,text/x-patch]; HAS_LIST_UNSUB(-0.01)[]; DNSWL_BLOCKED(0.00)[2001:470:142::17:from]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_SEVEN(0.00)[9]; FORGED_SENDER_MAILLIST(0.00)[]; DMARC_POLICY_SOFTFAIL(0.10)[disroot.org : SPF not aligned (relaxed),none] X-TUID: bzNSiuFjNJsk --MP_/o_CInvp7KVTU0DWWCmlfth3 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, > Here, I have attached another patch-set for modifying stuffs. :-) Regards, RG. --MP_/o_CInvp7KVTU0DWWCmlfth3 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0008-gnu-girara-Update-package-definition.patch >From 30042d73a58f90971cd6c37bf56269bd3abb2533 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 22:28:44 -0400 Subject: [PATCH 08/14] gnu: girara: Update package definition. * gnu/packages/pwmt.scm (girara): [source][method]: Changed from git-fetch to url-fetch; and remove file-name field. [arguments]<#:glib-or-gtk?>: New argument. [arguments]<#:configure-flags>[-Dnotify]: New flag. [native-inputs]: New input. [inputs]: New inputs. [propagated-inputs]: Removed. [synopsis]: Updated. [description]: Updated. --- gnu/packages/pwmt.scm | 73 +++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 2516c62485..69007bde9a 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -56,38 +56,49 @@ (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)) + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/girara/download/girara-" + version ".tar.xz")) (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/Xvfb " - display " &"))))))))) + (base32 "0cmjdismdsx9a5l7zx54zkd33mgg3mx4ckpvc7aap3x6a1ddmz2i")))) (build-system meson-build-system) + (arguments + `(#:glib-or-gtk? #t ; To compile schemas + #:configure-flags + (list + "-Dnotify=enabled") ; For notification support + #: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 " &"))))))))) + (native-inputs + `(("check" ,check) ; For tests + ("doxygen" ,doxygen) ; For docs + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config) + ("xorg-server" ,xorg-server-for-tests))) ; For tests + (inputs + `(("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; For configuration dumping support + ("libnotify" ,libnotify) ; For notification support + ("pango" ,pango))) (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 @@ -341,4 +352,4 @@ using the DjVuLibre library.") (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 + (license license:zlib))) -- 2.26.2 --MP_/o_CInvp7KVTU0DWWCmlfth3 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0009-gnu-zathura-Update-package-definition.patch >From 7e3558dda412d33fffb7bb0668886f1ede3d14c8 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 23:29:28 -0400 Subject: [PATCH 09/14] gnu: zathura: Update package definition. * gnu/packages/pwmt.scm (zathura): [arguments]<#:glib-or-gtk?>: New argument. [native-inputs]: New inputs. [inputs]: New inputs. [propagated-inputs]: Removed. [synopsis]: Updated. [description]: Updated. --- gnu/packages/pwmt.scm | 113 ++++++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 49 deletions(-) diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 69007bde9a..16173ffa60 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -28,6 +28,8 @@ #:use-module (gnu packages check) #:use-module (gnu packages djvu) #:use-module (gnu packages documentation) + #:use-module (gnu packages file) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) @@ -35,6 +37,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages image) #:use-module (gnu packages javascript) + #:use-module (gnu packages linux) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages sphinx) @@ -114,58 +117,70 @@ information.") (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"))))) + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura/download/zathura-" + version ".tar.xz")) + (sha256 + (base32 + "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c")))) (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 " &"))))))))) + `(#:glib-or-gtk? #t ; To compile schemas + #: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 " &"))))))))) + (native-inputs + `(("check" ,check) ; For tests + ("desktop-file-utils" ,desktop-file-utils) + ("doxygen" ,doxygen) ; For docs + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") + ("librsvg" ,librsvg) ; For icons + ("pkg-config" ,pkg-config) + ("python-breathe" ,python-breathe) ; For docs + ("python-sphinx-rtd-theme" ,python-sphinx-rtd-theme) ; For docs + ("python-sphinx" ,python-sphinx) ; For docs + ("xorg-server" ,xorg-server-for-tests))) ; For tests + (inputs + `(("appstream-glib" ,appstream-glib) + ("cairo" ,cairo) + ("file" ,file) ; For mime-type detection + ("girara" ,girara) + ("glib" ,glib) + ("json-c" ,json-c) ; For configuration dumping support + ("gtk+" ,gtk+) + ("libnotify" ,libnotify) ; For notification support + ("libseccomp" ,libseccomp) ; For sandbox support + ("sqlite" ,sqlite))) ; For database backend + (native-search-paths + (list + (search-path-specification + (variable "ZATHURA_PLUGINS_PATH") + (files '("lib/zathura"))))) + (synopsis "Document Viewer") + (description "Zathura is a highly customizable and functional document +viewer based on the girara user interface library and several document +libraries. It currently supports multiple back-ends (PostScript, PDF, EPUB, +DjVu and ComicBook) via plugins.") (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 zathura-ps -- 2.26.2 --MP_/o_CInvp7KVTU0DWWCmlfth3 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0010-gnu-zathura-ps-Update-package-definition.patch >From 345a2b2ffc04c99fdfc3785ac6d19f053afd1b90 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 23:42:49 -0400 Subject: [PATCH 10/14] gnu: zathura-ps: Update package definition. * gnu/packages/pwmt.scm (zathura-ps): [arguments]<#:glib-or-gtk?>: New argument. [inputs]: New inputs. [synopsis]: Updated. [description]: Updated. --- gnu/packages/pwmt.scm | 44 ++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 16173ffa60..dcf041daa3 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -187,35 +187,45 @@ DjVu and ComicBook) via plugins.") (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))) + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-ps/download/" + "zathura-ps-" version ".tar.xz")) + (sha256 + (base32 + "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y")))) (build-system meson-build-system) (arguments - `(#:tests? #f ; package does not contain tests + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas #: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. + ;; This package tries to install into directory of Zathura. + ;; That cannot be allowed. 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))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; To generate cargs for zathura + ("libnotify" ,libnotify) ; To generate cargs for zathura + ("libspectre" ,libspectre) + ("zathura" ,zathura))) + (synopsis "PostScript support for zathura") + (description "The zathura-ps plugin adds PostScript support to zathura by +using the libspectre library.") (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-pdf-poppler -- 2.26.2 --MP_/o_CInvp7KVTU0DWWCmlfth3 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0011-gnu-zathura-pdf-poppler-Update-package-definition.patch >From 22da4d2b51929e18bbf656e3c29f4bc06ef17f48 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 23:50:03 -0400 Subject: [PATCH 11/14] gnu: zathura-pdf-poppler: Update package definition. * gnu/packages/pwmt.scm (zathura-pdf-poppler): [arguments]<#:glib-or-gtk?>: New argument. [arguments]<#phases>['patch-plugin-directory]: Removed. [arguments]<#:configure-flags>[-Dplugindir]: New flag. [inputs]: New inputs. [synopsis]: Updated. [description]: Updated. --- gnu/packages/pwmt.scm | 53 +++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index dcf041daa3..e9d97bbc89 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -232,36 +232,35 @@ using the libspectre library.") (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))) + (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")))) (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))))) + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas + #:configure-flags + (list + (string-append "-Dplugindir=" + (assoc-ref %outputs "out") "/lib/zathura")))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("poppler" ,poppler) + ("zathura" ,zathura))) + (synopsis "PDF support (poppler backend) for zathura") + (description "The zathura-pdf-poppler plugin adds PDF support to zathura by +using the poppler rendering library.") (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 zathura-pdf-mupdf -- 2.26.2 --MP_/o_CInvp7KVTU0DWWCmlfth3 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0012-gnu-zathura-pdf-mupdf-Update-package-definition.patch >From ee00e7e7e931d39a9afad36a203f7f28a39647cf Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 3 May 2020 00:01:56 -0400 Subject: [PATCH 12/14] gnu: zathura-pdf-mupdf: Update package definition. * gnu/packages/pwmt.scm (zathura-pdf-mupdf): [arguments]<#:glib-or-gtk?>: New argument. [inputs]: Removed. : New inputs. [synopsis]: Updated. [description]: Updated. --- gnu/packages/pwmt.scm | 59 +++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index e9d97bbc89..7c734c2111 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -267,30 +267,24 @@ using the poppler rendering library.") (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))) + (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")))) (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") + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas + #:configure-flags + (list + (string-append "-Dplugindir=" + (assoc-ref %outputs "out") "/lib/zathura") + "-Dlink-external=true") ; For MuPDF external libraries #:phases (modify-phases %standard-phases (add-before 'configure 'add-mujs-to-dependencies @@ -301,10 +295,25 @@ using the poppler rendering library.") (string-append x " mujs = cc.find_library('mujs')\n")) (("^ libopenjp2") " libopenjp2, mujs"))))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("jbig2dec" ,jbig2dec) + ("json-c" ,json-c) ; To generate cargs for zathura + ("libjpeg" ,libjpeg) + ("libnotify" ,libnotify) ; To generate cargs for zathura + ("mujs" ,mujs) + ("mupdf" ,mupdf) + ("openjpeg" ,openjpeg) + ("zathura" ,zathura))) + (synopsis "PDF support (mupdf backend) for zathura") + (description "The zathura-pdf-mupdf plugin adds PDF support to zathura by +using the mupdf rendering library.") (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 zathura-djvu -- 2.26.2 --MP_/o_CInvp7KVTU0DWWCmlfth3 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0013-gnu-zathura-djvu-Update-package-definition.patch >From 806ae5789545cda66ff544e2c5e943fc1bb9fa28 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 3 May 2020 00:11:35 -0400 Subject: [PATCH 13/14] gnu: zathura-djvu: Update package definition. * gnu/packages/pwmt.scm (zathura-djvu): [arguments]<#:glib-or-gtk?>: New argument. <#:phases>['patch-plugin-directory]: Removed. <#:configure-flags>[-Dplugindir]: New flag. [inputs]: New inputs. [synopsis]: Updated. [description]: Updated. --- gnu/packages/pwmt.scm | 56 ++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 7c734c2111..5ad4cbe7f7 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -320,36 +320,38 @@ using the mupdf rendering library.") (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))) + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-djvu/download/" + "zathura-djvu-" version ".tar.xz")) + (sha256 + (base32 + "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln")))) (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)") + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas + #:configure-flags + (list + (string-append "-Dplugindir=" + (assoc-ref %outputs "out") "/lib/zathura")))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("djvulibre" ,djvulibre) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; To generate cargs for zathura + ("libnotify" ,libnotify) ; To generate cargs for zathura + ("zathura" ,zathura))) + (synopsis "DjVu support for zathura") (description "The zathura-djvu plugin adds DjVu support to zathura -using the DjVuLibre library.") +using the DjVu library.") + (home-page "https://pwmt.org/projects/zathura-djvu/") (license license:zlib))) (define-public zathura-cb -- 2.26.2 --MP_/o_CInvp7KVTU0DWWCmlfth3 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0014-gnu-zathura-cb-Update-package-definition.patch >From 6b4e210a1bc4282f0ff07a6279f55a8f42706a86 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sun, 3 May 2020 00:18:21 -0400 Subject: [PATCH 14/14] gnu: zathura-cb: Update package definition. * gnu/packages/pwmt.scm (zathura-cb): [arguments]<#:glib-or-gtk?>: New argument. [inputs]: New inputs. [synopsis]: Updated. [description]: Updated. --- gnu/packages/pwmt.scm | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/gnu/packages/pwmt.scm b/gnu/packages/pwmt.scm index 5ad4cbe7f7..f361c91c00 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -358,33 +358,42 @@ using the DjVu library.") (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))) + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/zathura-cb/download/" + "zathura-cb-" version ".tar.xz")) + (sha256 + (base32 + "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) (build-system meson-build-system) (arguments - `(#:tests? #f ; package does not contain tests + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas #: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. + ;; This package tries to install into directory of Zathura. + ;; That cannot be allowed. 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))))) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; To generate cargs for zathura + ("libarchive" ,libarchive) + ("libnotify" ,libnotify) ; To generate cargs for zathura + ("zathura" ,zathura))) + (synopsis "Comic book support for zathura") + (description "The zathura-cb plugin adds comic book support to zathura.") (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))) -- 2.26.2 --MP_/o_CInvp7KVTU0DWWCmlfth3--