From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 07:54:46 2020 Received: (at submit) by debbugs.gnu.org; 1 May 2020 11:54:46 +0000 Received: from localhost ([127.0.0.1]:48360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUUFY-0004i7-GW for submit@debbugs.gnu.org; Fri, 01 May 2020 07:54:46 -0400 Received: from lists.gnu.org ([209.51.188.17]:35616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUUFW-0004hx-1p for submit@debbugs.gnu.org; Fri, 01 May 2020 07:54:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39026) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jUUFM-00039s-52 for guix-patches@gnu.org; Fri, 01 May 2020 07:54:33 -0400 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,SPF_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jUUEQ-0001ws-B9 for guix-patches@gnu.org; Fri, 01 May 2020 07:54:23 -0400 Received: from knopi.disroot.org ([178.21.23.139]:33638) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1jUUEP-0001rV-4a for guix-patches@gnu.org; Fri, 01 May 2020 07:53:25 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 3C3C02CC31 for ; Fri, 1 May 2020 13:53:21 +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 fpntj-8cz1Qy for ; Fri, 1 May 2020 13:53:19 +0200 (CEST) Date: Fri, 1 May 2020 07:52:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588333995; bh=5OgieQMqzwWXMMB6ypdlOufGDLZdyHcizPL9dfD5jYM=; h=Date:From:To:Subject; b=OA3hOcmB/CAasMQ9Hmyp/YFMzn9+wuYspayreJ8kMNGwNK0NhOWL+JYgrFUsIN7Qz LTIusHu7Z89FO7ugECJ3eRZZgb81hkmj3Ye/AUwegiV0V8k8f9V+Lo2qkSZ1dElBhH xWZPbgZ5oseyvt4qB11urf9pX3YMFRyt/2GlWI+Ohf19V5OUXsEMP4a18K3PGEFemo ejblK2qS4lj5pi9O7W1JOy50p3PD0Us+gKdnXpxwNdsolndsn/CuaB9wpBs76gR8UU 2DH/c0WkSImslav52ZvGDQLIUJXH5yA1mQPvw9kIVjaOXTugKvLNWu/PagseIAKuHZ pGZhdEr4aYuNA== From: Raghav Gururajan To: guix-patches@gnu.org Subject: Programs With Movie Titles (PWMT) Message-ID: <20200501075253.0c2c27d0.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/01 07:53:21 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.21.23.139 X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit 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: -3.3 (---) Hello Guix! I am starting this thread for my patches regarding programs that belong to PWMT Project (pwmt.org). The programs are Girara, Jumanji and Zathura. I will be creating a new module, named, pwmt.scm. This is to put all PWMT packages together. The concept here is similar to suckless.scm. I will be sending patches one-by-one in this thread; with numbered prefix [N]. These patches are to be pushed in ascending order. Thank you! Regards, RG. From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 09:50:30 2020 Received: (at 40994) by debbugs.gnu.org; 1 May 2020 13:50:30 +0000 Received: from localhost ([127.0.0.1]:48469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUW3b-0007sT-Ki for submit@debbugs.gnu.org; Fri, 01 May 2020 09:50:30 -0400 Received: from knopi.disroot.org ([178.21.23.139]:34784) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUW3Z-0007sB-IX for 40994@debbugs.gnu.org; Fri, 01 May 2020 09:50:22 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id B8ECA20FBB for <40994@debbugs.gnu.org>; Fri, 1 May 2020 15:50:19 +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 MlTqzkEyS2Xg for <40994@debbugs.gnu.org>; Fri, 1 May 2020 15:50:17 +0200 (CEST) Date: Fri, 1 May 2020 09:49:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588341016; bh=otzjpToWxvtdciElFH4C772gXmfApDrnTI+YH85nnhA=; h=Date:From:To:Subject; b=hpYOQ5ovMoSTIxoy4g8O6R4u8lhOEADIOf2MVd+MPsPmwtFVHndOylKPa68HUm5xs baAlkBrjXTyq6Kt9Dw4TWrdscP9v9S9shnSzg/c4FK63OS8Ce5F5l3Lz8hMUkjvE/s 7KFNKY9Eue0mvHm8bRFMIhSCYb95j2/jwznzELKWtL5hcXSUxXdVVlCpLpIaNgjyXu fMiWPeYc8OiMmuS+F4yombuEtColzF8fXGTOE1ThIB/WeFOgzhk1SxEZSSWS+V+Qqm YwDhbeDMAawyMc6QHMKJyPJUBt/aTV8gEp99XB8hcy5p2qzaKeRDip0bcXk52069dM eDgqDKc2hFmxw== From: Raghav Gururajan To: 40994@debbugs.gnu.org Subject: 1-girara-v1 Message-ID: <20200501094948.56033139.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/7Bm+N6VVEd6V7LsgrN1mMt8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 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: -1.0 (-) --MP_/7Bm+N6VVEd6V7LsgrN1mMt8 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/7Bm+N6VVEd6V7LsgrN1mMt8 Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=1-giara-v1.patch =46rom 4f73a7fbd82838e99680e8043b78e9d7009284eb Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 1 May 2020 07:26:49 -0400 Subject: [PATCH 1/2] gnu: girara: Move to pwmt module. Moved variable from gtk.scm to pwmt.scm, for being part of pwmt project. Added extra dependencies and arguments for additional features. Changed source-origin from git to release files. Made some cosmetic changes in the definition. * gnu/packages/gtk.scm (girara): Remove variable. * gnu/packages/pwmt.scm (girara): Add variable. --- gnu/packages/gtk.scm | 49 -------------------- gnu/packages/pwmt.scm | 101 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 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..3e986c3656 --- /dev/null +++ b/gnu/packages/pwmt.scm @@ -0,0 +1,101 @@ +;;; 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 build-system gnu) + #:use-module (guix build-system meson)) + +(define-public girara + (package + (name "girara") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri + (string-append "https://pwmt.org/projects/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0cmjdismdsx9a5l7zx54zkd33mgg3mx4ckpvc7aap3x6a1ddmz2i")))) + (arguments + `(#:glib-or-gtk? #t ; To compile schemas + #:configure-flags + (list + "-Dnotify=3Denabled") ; 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 " &"))))))))) + (build-system meson-build-system) + (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 +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))) --=20 2.26.2 --MP_/7Bm+N6VVEd6V7LsgrN1mMt8-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 09:51:16 2020 Received: (at 40994) by debbugs.gnu.org; 1 May 2020 13:51:16 +0000 Received: from localhost ([127.0.0.1]:48474 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUW4R-0007uX-Qc for submit@debbugs.gnu.org; Fri, 01 May 2020 09:51:16 -0400 Received: from knopi.disroot.org ([178.21.23.139]:52292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUW4P-0007uO-OD for 40994@debbugs.gnu.org; Fri, 01 May 2020 09:51:14 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id F36132CAA9 for <40994@debbugs.gnu.org>; Fri, 1 May 2020 15:51:12 +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 6k6vOAnaeqlh for <40994@debbugs.gnu.org>; Fri, 1 May 2020 15:51:11 +0200 (CEST) Date: Fri, 1 May 2020 09:50:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588341071; bh=CUUtaEj8Nmrb2lIfSwvSZ6hAzt569GO7mOjhKEF/Ffc=; h=Date:From:To:Subject; b=eWKuZf/pU3l0vS4hXvT1N26w6pU4Fsv4xePmG+AUxVgzlxkHKwznjebsydsLe5e3b YFkWb569i6832Sef15lk+zeWWJvDKAh7k2Q7yOySCCl/nVONOBrz+QBOBBfFA8fr7h gRZpmU5ZRm1qJHsLASHWvUDh0lzKtAHoeX/GS6qTFfXDlOVXNaXqyNgEJmawe9ZxDH Sr5uk4A1DsR9cGwanrx7YCmLmgbQEw36hGv2QwgFAiDEyuOCYLr94BYNCdMPPVtNOM k8qH+IVA9WkfRS8asLKeC17SRlmVDyQdGxGsckc5Q8m1JvVI6tyYN8VwQ+vqMRISgW hldsJFO5sFOcw== From: Raghav Gururajan To: 40994@debbugs.gnu.org Subject: 2-zathura-v1 Message-ID: <20200501095049.114a6f3c.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/nfb=z4Dss2x/40Km=0KpgPb" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 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: -1.0 (-) --MP_/nfb=z4Dss2x/40Km=0KpgPb Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/nfb=z4Dss2x/40Km=0KpgPb Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=2-zathura-v1.patch >From c8951b36cd04df279fdeaabdd29b87929fbb6fbc Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 1 May 2020 09:36:57 -0400 Subject: [PATCH 2/2] gnu: zathura: Move to pwmt module. Moved variable from pdf.scm to pwmt.scm, for being part of pwmt project. Added extra dependencies and arguments for additional features. Updated synopsis and description. Made some cosmetic changes in the definition. * gnu/packages/pdf.scm (zathura): Remove variable. * gnu/packages/pwmt.scm (zathura): Add variable. --- gnu/packages/pdf.scm | 58 -------------------------------- gnu/packages/pwmt.scm | 78 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 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 3e986c3656..be9613bbf8 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -26,11 +26,18 @@ #:use-module (gnu packages) #:use-module (gnu packages check) #:use-module (gnu packages documentation) + #:use-module (gnu packages file) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages linux) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages python-xyz) + #: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) @@ -99,3 +106,74 @@ 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/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0b3nrcvykkpv2vm99kijnic2gpfzva520bsjlihaxandzfm9ff8c")))) + (build-system meson-build-system) + (arguments + `(#: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 + ("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 + (propagated-inputs + `(("girara" ,girara))) + (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/") + (license license:zlib))) -- 2.26.2 --MP_/nfb=z4Dss2x/40Km=0KpgPb-- From debbugs-submit-bounces@debbugs.gnu.org Fri May 01 13:49:12 2020 Received: (at 40994) by debbugs.gnu.org; 1 May 2020 17:49:12 +0000 Received: from localhost ([127.0.0.1]:50601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUZmi-0008Gr-08 for submit@debbugs.gnu.org; Fri, 01 May 2020 13:49:12 -0400 Received: from knopi.disroot.org ([178.21.23.139]:34612) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUZmf-0008Gh-E6 for 40994@debbugs.gnu.org; Fri, 01 May 2020 13:49:10 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 90354217EB for <40994@debbugs.gnu.org>; Fri, 1 May 2020 19:49:07 +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 sBqhPD54hOV8 for <40994@debbugs.gnu.org>; Fri, 1 May 2020 19:49:05 +0200 (CEST) Date: Fri, 1 May 2020 13:48:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588355345; bh=5Y2NGWhoHu0E64Zp5urLnPoJhYHYHOM+1pHnwrSOUhk=; h=Date:From:To:Subject; b=Bg994zRwG+g77j2Gj8bwxv/wjSDkrQiySPXW7M5UY54VfpRws0yQD70LfzEovgN2B kUfLhSAmHgedEI3lIySGRe83wR1nlEhUAbSroMm66Yx4KEcb3dt44XTp54vGPwEVHk MlT3cQc/r0Wqo/OKfsgkIwICiue48/kex/iaDiAb2uRPruJnrE/EYVoC/JeZBE+R3v MbhUIQuheuX620no1VyrrGiR36ox66PrTY5ZtzZfobk7tnOvVoYADkcVvi+h5Y703+ +1GNJ2w+TrJ+PWgxzEMzRoV8n/BaC7UfUP4IFajQczdgunp5Xg/KnP2nAI5BHej9fl 5thBtkxevDPWw== From: Raghav Gururajan To: 40994@debbugs.gnu.org Subject: 3-zathura-ps-v1 Message-ID: <20200501134842.5819e428.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/EZLtsQf4.gprw1ytyUXV3.K" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 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: -1.0 (-) --MP_/EZLtsQf4.gprw1ytyUXV3.K Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/EZLtsQf4.gprw1ytyUXV3.K Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=3-zathura-ps-v1.patch >From f399f61f261bbd3ab828ca27fc1d31f0e49d0d45 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 1 May 2020 13:42:52 -0400 Subject: [PATCH 3/3] gnu: zathura-ps: Move to pwmt module. Moved variable from pdf.scm to pwmt.scm, for being part of pwmt project. Added extra dependencies and arguments for additional features. Updated synopsis and description. Made some cosmetic changes in the definition. * gnu/packages/pdf.scm (zathura-ps): Remove variable. * gnu/packages/pwmt.scm (zathura-ps): Add variable. --- gnu/packages/pdf.scm | 35 -------------------------------- gnu/packages/pwmt.scm | 47 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 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 be9613bbf8..8b177e3e7a 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -29,6 +29,7 @@ #: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) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) @@ -177,3 +178,49 @@ libraries. It currently supports multiple back-ends (PostScript, PDF, EPUB, DjVu and ComicBook) via plugins.") (home-page "https://pwmt.org/projects/zathura/") (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/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0wygq89nyjrjnsq7vbpidqdsirjm6iq4w2rijzwpk2f83ys8bc3y")))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-directory + ;; 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 + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; For configuration dumping support + ("libnotify" ,libnotify) ; For notification support + ("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/") + (license license:zlib))) -- 2.26.2 --MP_/EZLtsQf4.gprw1ytyUXV3.K-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:18:25 2020 Received: (at 40994) by debbugs.gnu.org; 2 May 2020 08:18:25 +0000 Received: from localhost ([127.0.0.1]:51161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnLs-0001B0-O1 for submit@debbugs.gnu.org; Sat, 02 May 2020 04:18:25 -0400 Received: from knopi.disroot.org ([178.21.23.139]:53908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnLp-0001Ao-HQ for 40994@debbugs.gnu.org; Sat, 02 May 2020 04:18:24 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1940325FF8 for <40994@debbugs.gnu.org>; Sat, 2 May 2020 10:18:20 +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 FqwUJSO05W33 for <40994@debbugs.gnu.org>; Sat, 2 May 2020 10:18:18 +0200 (CEST) Date: Sat, 2 May 2020 04:17:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588407498; bh=Opez37oeEaohp5FJbFHJjskwrgmpryvadP4N/ekMfhM=; h=Date:From:To:Subject; b=XtSo5SniFaq5EBWIUJQ8aelcAGxlJdp7HlHdX1QSebwfmMBUNPFscRZpczlI0TAKp BQTTexvacouOAAR2Y68Rt9XgAJz1h4m3+jlA/Sy4tSzCZZz/6ejrAgfmtsGHXwBC/k P7UduDAO6sc67QctW/fBPQqhnRfxs7SeOeMEhHhs/MK8zLBY619TY8S4vV/43/Hann 7FfVWay790bEU3ii/c+PnVpk8hVSX5fekLSqseapmJjG3AGc78gxjU8/o0R2jHub6Q GEyc3ZtR9U5/JGfENZNx8beJWqrTV3qtOAge9oUAG+A2UTWvKEpJTwZ3KsjfU0PuIN kxAVOmQ5NvLbA== From: Raghav Gururajan To: 40994@debbugs.gnu.org Subject: 4-zathura-pdf-poppler-v1 Message-ID: <20200502041755.7e26f2a1.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/KuFC_x1BIYVKceD7H.sDUd=" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 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: -1.0 (-) --MP_/KuFC_x1BIYVKceD7H.sDUd= Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/KuFC_x1BIYVKceD7H.sDUd= Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=4-zathura-pdf-poppler-v1.patch >From e857c3eb891831dd3916e2103652416f5fabb2ef Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 04:11:49 -0400 Subject: [PATCH 4/4] gnu: zathura-pdf-poppler: Move to pwmt module. Moved variable from pdf.scm to pwmt.scm, for being part of pwmt project. Added extra dependencies and arguments for additional features. Removed phase 'patch-plugin-directory'. Added configure-flag 'plugindir'. Updated synopsis and description. Made some cosmetic changes in the definition. * gnu/packages/pdf.scm (zathura-pdf-poppler): Remove variable. * gnu/packages/pwmt.scm (zathura-pdf-poppler): Add variable. --- 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 8b177e3e7a..fa973cea17 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -34,6 +34,7 @@ #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) #:use-module (gnu packages linux) + #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) @@ -224,3 +225,39 @@ DjVu and ComicBook) via plugins.") using the libspectre library.") (home-page "https://pwmt.org/projects/zathura-ps/") (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/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1vfl4vkyy3rf39r1sqaa7y8113bgkh2bkfq3nn2inis9mrykmk6m")))) + (build-system meson-build-system) + (arguments + `(#: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 + `(("glib:bin" ,glib "bin") + ("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/") + (license license:zlib))) -- 2.26.2 --MP_/KuFC_x1BIYVKceD7H.sDUd=-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 04:50:43 2020 Received: (at 40994) by debbugs.gnu.org; 2 May 2020 08:50:43 +0000 Received: from localhost ([127.0.0.1]:51197 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnr8-0001zu-LM for submit@debbugs.gnu.org; Sat, 02 May 2020 04:50:42 -0400 Received: from knopi.disroot.org ([178.21.23.139]:58780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUnr6-0001zl-Ia for 40994@debbugs.gnu.org; Sat, 02 May 2020 04:50:42 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id F257C28458 for <40994@debbugs.gnu.org>; Sat, 2 May 2020 10:50:38 +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 vv0HAXuXHDtj for <40994@debbugs.gnu.org>; Sat, 2 May 2020 10:50:37 +0200 (CEST) Date: Sat, 2 May 2020 04:50:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588409437; bh=pJ0LDIlL7wATr/PnvT/5WpnJtdOruU18vpKh4ULaVew=; h=Date:From:To:Subject; b=VPx922HqAj4COd8RWU6+OOZp0/0MeMcQCLsHfI42M1qITYm4HHMadex8j+titq9+6 XC8sGTuZ4kl2GZE4/oHNPfRytZ0TBezqnMq6qc/3toh7ib9biwXsjUYVd+DWEUQ7mx n6IfIrjU8nXy9QEwwxdM3zype2Umo0fbdzeDdp71eoTs73UCkcDvrdrEN7a18NVFHP D9HuX5VrVwT2cqTorZR0HKYRRCyz4wpmhpFRLcjNAo5cpNjET2sEV7CXXE6LBwFsUs 6rATZwfshQLBdfoaMSLMflPaK9S2DqzGus3Z/hBipjcgRLLGejEkOn9HMUfvKuyF31 sblJ6nyM5uiAQ== From: Raghav Gururajan To: 40994@debbugs.gnu.org Subject: 5-zathura-pdf-mupdf-v1 Message-ID: <20200502045017.2b8d2530.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/4CJ1pubE0YsevXn.15z0BFu" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 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: -1.0 (-) --MP_/4CJ1pubE0YsevXn.15z0BFu Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/4CJ1pubE0YsevXn.15z0BFu Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=5-zathura-pdf-mupdf-v1.patch >From aa93196383df77cac84d4246cbd88f64685d110b Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 04:44:03 -0400 Subject: [PATCH 5/5] gnu: zathura-pdf-mupdf: Move to pwmt module. Moved variable from pdf.scm to pwmt.scm, for being part of pwmt project. Added extra dependencies and arguments for additional features. Removed openssl as input. Updated synopsis and description. Made some cosmetic changes in the definition. * gnu/packages/pdf.scm (zathura-pdf-mupdf): Remove variable. * gnu/packages/pwmt.scm (zathura-pdf-mupdf): Add variable. --- gnu/packages/pdf.scm | 44 ---------------------------------- gnu/packages/pwmt.scm | 56 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 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 fa973cea17..c2c53ca8ec 100644 --- a/gnu/packages/pwmt.scm +++ b/gnu/packages/pwmt.scm @@ -33,6 +33,8 @@ #: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 linux) #:use-module (gnu packages pdf) #:use-module (gnu packages pkg-config) @@ -261,3 +263,57 @@ using the libspectre library.") using the poppler rendering library.") (home-page "https://pwmt.org/projects/zathura-pdf-poppler/") (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/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1pjwsb7zwclxsvz229fl7y2saf1pv3ifwv3ay8viqxgrp9x3z9hq")))) + (build-system meson-build-system) + (arguments + `(#: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 + (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"))))))) + (native-inputs + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("jbig2dec" ,jbig2dec) + ("json-c" ,json-c) ; For configuration dumping support + ("libjpeg" ,libjpeg) + ("libnotify" ,libnotify) ; For notification support + ("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/") + (license license:zlib))) -- 2.26.2 --MP_/4CJ1pubE0YsevXn.15z0BFu-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 05:16:32 2020 Received: (at 40994) by debbugs.gnu.org; 2 May 2020 09:16:32 +0000 Received: from localhost ([127.0.0.1]:51235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoG7-0002d3-Uj for submit@debbugs.gnu.org; Sat, 02 May 2020 05:16:32 -0400 Received: from knopi.disroot.org ([178.21.23.139]:58616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUoG6-0002ct-JG for 40994@debbugs.gnu.org; Sat, 02 May 2020 05:16:31 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1ABE927385 for <40994@debbugs.gnu.org>; Sat, 2 May 2020 11:16:29 +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 EC9ad35dAucU for <40994@debbugs.gnu.org>; Sat, 2 May 2020 11:16:27 +0200 (CEST) Date: Sat, 2 May 2020 05:16:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588410987; bh=N7l8tWWcwbpsBT66czTXdLIDorDw0wd9EuanKxfPSgQ=; h=Date:From:To:Subject; b=bPixExDW7/a42fSbyL5udS9dYBdyxHOcWk3FZ6lhjnnIhDUNCitTVAndn8nRTy+oN 4U91BastsQkIpoLWalG5JM1Wy+fq57BZjqEfC4f6OLQ6tPGBOxeSF2f2ZRyrohMXXn xCPq23f5S96zU9wD/V2z4At8gePf+FGdTDSh7/ksgxyxUoGdZAqC+vEcAX7BjgQFK/ oikQOF7lpTX4nC4Tlc/DU3pWnnY+gL3yFWeZzWgNvMhD6+kK2iPqXxk4gZ3EEL+T+n htmceRfNzO9menov8w5jv4Dz5+Wwz76jv5Fdijr7poTOBEqGrG/Z0kOtrt2tXFLu2/ gs28L7f8pzQ/w== From: Raghav Gururajan To: 40994@debbugs.gnu.org Subject: 6-zathura-djvu-v1 Message-ID: <20200502051607.31a204b3.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/ejUUs/H1_b6jS9GAbbraFOF" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 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: -1.0 (-) --MP_/ejUUs/H1_b6jS9GAbbraFOF Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/ejUUs/H1_b6jS9GAbbraFOF Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=6-zathura-djvu-v1.patch >From e2dde54a224777bcb2b050cb828db1a9fe6da532 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 05:12:02 -0400 Subject: [PATCH 6/6] gnu: zathura-djvu: Move to pwmt module. Moved variable from pdf.scm to pwmt.scm, for being part of pwmt project. Added extra dependencies and arguments for additional features. Removed phase 'patch-plugin-directory'. Added configure-flag 'plugindir'. Updated synopsis and description. Made some cosmetic changes in the definition. * gnu/packages/pdf.scm (zathura-djvu): Remove variable. * gnu/packages/pwmt.scm (zathura-djvu): Add variable. --- gnu/packages/pdf.scm | 36 ------------------------------------ gnu/packages/pwmt.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 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 c2c53ca8ec..173a35d892 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 file) #:use-module (gnu packages freedesktop) @@ -317,3 +318,42 @@ using the poppler rendering library.") using the mupdf rendering library.") (home-page "https://pwmt.org/projects/zathura-pdf-mupdf/") (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/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0062n236414db7q7pnn3ccg5111ghxj3407pn9ri08skxskgirln")))) + (build-system meson-build-system) + (arguments + `(#: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 + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("djvulibre" ,djvulibre) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; For configuration dumping support + ("libnotify" ,libnotify) ; For notification support + ("zathura" ,zathura))) + (synopsis "DjVu support for zathura") + (description "The zathura-djvu plugin adds DjVu support to zathura +using the DjVu library.") + (home-page "https://pwmt.org/projects/zathura-djvu/") + (license license:zlib))) -- 2.26.2 --MP_/ejUUs/H1_b6jS9GAbbraFOF-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 05:59:27 2020 Received: (at 40994) by debbugs.gnu.org; 2 May 2020 09:59:27 +0000 Received: from localhost ([127.0.0.1]:51295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUova-0003g4-2A for submit@debbugs.gnu.org; Sat, 02 May 2020 05:59:27 -0400 Received: from knopi.disroot.org ([178.21.23.139]:40178) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUovY-0003fv-3O for 40994@debbugs.gnu.org; Sat, 02 May 2020 05:59:21 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 686292CC85 for <40994@debbugs.gnu.org>; Sat, 2 May 2020 11:59:18 +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 n-0UcsAP2RkA for <40994@debbugs.gnu.org>; Sat, 2 May 2020 11:59:16 +0200 (CEST) Date: Sat, 2 May 2020 05:58:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588413555; bh=4UXQyff/yaYKVH60wBjzYjeS3LRlxkPF4w7BtApJjfc=; h=Date:From:To:Subject; b=bCrsQWv9MNiBxp2ZAWthhDtOjgIK5HRIDbUXI0T6IDFFcErmqkBKK+weBvgqr7xt+ 9qnfdrr5Dc73tdpJ+4rFRVebi+hnTwZhR3Sl89ZNbFqwzb8Fnp0HTdELzfgQ9vNTlh s/t7GYZIj13HeCqKSpYu9wWQn61WFZ7iYX1lA7xb7khkIQVJ0XpG662a9KQmcBFBks yxGZFMkR35N2wtqlNP7ZCQv6xXr13taRVBI1fWmupGvPjCzpGJPxj4m4RhzpeFemYs a/TsLf3vjiGw7TS/o40+MZ9qtB+tmtOoacSiHabV7AKykkOdZiNvQzxDHifRGPC3t8 6D8Wa3hdjaqEw== From: Raghav Gururajan To: 40994@debbugs.gnu.org Subject: 7-zathura-cb-v1 Message-ID: <20200502055854.2016b98d.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/77B6Y/sNcb9RuYgaBDgHaok" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 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: -1.0 (-) --MP_/77B6Y/sNcb9RuYgaBDgHaok Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/77B6Y/sNcb9RuYgaBDgHaok Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=7-zathura-cb-v1.patch >From 60c6f623546f09070e0397395cc2b44920d99549 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 05:56:43 -0400 Subject: [PATCH 7/7] gnu: zathura-cb: Move to pwmt module. Moved variable from pdf.scm to pwmt.scm, for being part of pwmt project. Added extra dependencies and arguments for additional features. Updated synopsis and description. Made some cosmetic changes in the definition. * gnu/packages/pdf.scm (zathura-cb): Remove variable. * gnu/packages/pwmt.scm (zathura-cb): Add variable. --- gnu/packages/pdf.scm | 35 -------------------------------- gnu/packages/pwmt.scm | 46 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 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 173a35d892..a67a707faa 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) @@ -357,3 +358,48 @@ using the mupdf rendering library.") using the DjVu library.") (home-page "https://pwmt.org/projects/zathura-djvu/") (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/" name "/download/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1i6cf0vks501cggwvfsl6qb7mdaf3sszdymphimfvnspw810faj5")))) + (build-system meson-build-system) + (arguments + `(#:tests? #f ; No target + #:glib-or-gtk? #t ; To compile schemas + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-plugin-directory + ;; 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 + `(("glib:bin" ,glib "bin") + ("pkg-config" ,pkg-config))) + (inputs + `(("cairo" ,cairo) + ("girara" ,girara) + ("glib" ,glib) + ("gtk+" ,gtk+) + ("json-c" ,json-c) ; For configuration dumping support + ("libarchive" ,libarchive) + ("libnotify" ,libnotify) ; For notification support + ("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/") + (license license:zlib))) -- 2.26.2 --MP_/77B6Y/sNcb9RuYgaBDgHaok-- From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 09:24:26 2020 Received: (at 40994) by debbugs.gnu.org; 2 May 2020 13:24:26 +0000 Received: from localhost ([127.0.0.1]:51563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUs7p-0002Va-Ln for submit@debbugs.gnu.org; Sat, 02 May 2020 09:24:26 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:49395) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jUs7o-0002VH-6f for 40994@debbugs.gnu.org; Sat, 02 May 2020 09:24:12 -0400 Received: from webmail.gandi.net (webmail18.sd4.0x35.net [10.200.201.18]) (Authenticated sender: brice@waegenei.re) by relay8-d.mail.gandi.net (Postfix) with ESMTPA id 7885B1BF205; Sat, 2 May 2020 13:24:05 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 02 May 2020 13:24:05 +0000 From: Brice Waegeneire To: 40994@debbugs.gnu.org, raghavgururajan@disroot.org Subject: Re: patch#40994 Programs With Movie Titles (PWMT) Message-ID: <76c18088643dcab9d395a0f9760d3a74@waegenei.re> X-Sender: brice@waegenei.re User-Agent: Roundcube Webmail/1.3.8 X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40994 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: -1.0 (-) Hello Raghav, > I am starting this thread for my patches regarding programs that belong > to > PWMT Project (pwmt.org). The programs are Girara, Jumanji and Zathura. I don't see a patch related to jumanji, is it voluntary? > I will be creating a new module, named, pwmt.scm. This is to put all > PWMT > packages together. The concept here is similar to suckless.scm. > > I will be sending patches one-by-one in this thread; with numbered > prefix [N]. > These patches are to be pushed in ascending order. 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. - Brice. From debbugs-submit-bounces@debbugs.gnu.org Sat May 02 12:09:41 2020 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 To: Brice Waegeneire Subject: Re: patch#40994 Programs With Movie Titles (PWMT) 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-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 Cc: 40994@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: -1.0 (-) --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-- From debbugs-submit-bounces@debbugs.gnu.org Sun May 03 00:23:14 2020 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 To: Brice Waegeneire Subject: Re: patch#40994 Programs With Movie Titles (PWMT) 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-Debbugs-Envelope-To: 40994 Cc: 40994@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: -1.0 (-) --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-- From debbugs-submit-bounces@debbugs.gnu.org Wed May 06 05:42:04 2020 Received: (at 40994) by debbugs.gnu.org; 6 May 2020 09:42:04 +0000 Received: from localhost ([127.0.0.1]:38564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWGYt-0007Sq-0a for submit@debbugs.gnu.org; Wed, 06 May 2020 05:42:04 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56552) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWGYn-0007Se-KH for 40994@debbugs.gnu.org; Wed, 06 May 2020 05:41:53 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id E9C1F2E89A for <40994@debbugs.gnu.org>; Wed, 6 May 2020 11:41:47 +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 EhoQ7Zk-L6eX for <40994@debbugs.gnu.org>; Wed, 6 May 2020 11:41:43 +0200 (CEST) Date: Wed, 6 May 2020 05:41:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588758103; bh=Mwosm203+xUs+BYW06+8tJ4fMceApW8Fyiq8FEhaAys=; h=Date:From:To:Subject; b=MGdNjmv90Q5Fa5pFtM17cziCNIvOWea2x2rA5vSW16mNk1HMkByrG3WYL6fL0XkCJ yPztKUV6RmzS+nSUBoSeDUwi3P/yyMHEsb9YBYVccBph5Hf/YxtkYUg78OnYc4aVSM dm6WjFr5vRX5bfsWkoz53QCn/hfNSLExDFTw2axuRF0FzcYDRtKIwjr1I7aSf/+C3Y kl4xRv5lKPStXmP4PGmjXs9BC8yHYxy319DcukvI8mjUa/q3efb5QDqAIRz4CF07/6 jqhl4+E2gHlVD8zP6D+sGasXcOQUpdIyn1e8Hhof2UGh6XFyRgC4BXIl+MwCM4FMhB n1XKyUN2myjCg== From: Raghav Gururajan To: 40994@debbugs.gnu.org Subject: All patches attached Message-ID: <20200506054119.5200ef6c.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/Klzs8_CR/mLiczL6S+f0P46" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 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: -1.0 (-) --MP_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=1.patch =46rom cf63b0c81a49c1d7649d7ce812aa6f116754d195 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Wed, 6 May 2020 05:38:38 -0400 Subject: [PATCH] gnu: Move girara from gtk.scm to pwmt.scm. * gnu/packages/gtk.scm (girara): Move to [...] * gnu/packages/pwmt.scm (girara): [...] here. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 49 ----------------------- gnu/packages/pwmt.scm | 91 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+), 49 deletions(-) create mode 100644 gnu/packages/pwmt.scm diff --git a/gnu/local.mk b/gnu/local.mk index 3c9a10b6bc..d73f6be33d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -430,6 +430,7 @@ GNU_SYSTEM_MODULES =3D \ %D%/packages/protobuf.scm \ %D%/packages/pure.scm \ %D%/packages/pv.scm \ + %D%/packages/pwmt.scm \ %D%/packages/python.scm \ %D%/packages/python-check.scm \ %D%/packages/python-compression.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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=2.patch >From 1b3a17d3d1fba5363f0f4357fb36a0366337c1e0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 11:22:50 -0400 Subject: [PATCH 02/14] 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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=3.patch >From 0096754a6564ea8dfa7826aeb897fbce28bd7016 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 11:27:02 -0400 Subject: [PATCH 03/14] 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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=4.patch >From 47fc6ed3548bba6d65cf1d7c789d56e42cb5c106 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 11:53:48 -0400 Subject: [PATCH 04/14] 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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=5.patch >From dc3d3b63f1c4beaeca29205cbb2ae29c7dd4654a Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 11:57:05 -0400 Subject: [PATCH 05/14] 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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=6.patch >From 01abedd8f26bcc9df7b27d9905f0afa3a399a378 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 12:00:08 -0400 Subject: [PATCH 06/14] 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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=7.patch >From a9f155ad914c4f83a8d4220249d3cbf4fab096ac Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Sat, 2 May 2020 12:01:58 -0400 Subject: [PATCH 07/14] 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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=8.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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=9.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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=10.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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=11.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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=12.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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=13.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_/Klzs8_CR/mLiczL6S+f0P46 Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=14.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_/Klzs8_CR/mLiczL6S+f0P46-- From debbugs-submit-bounces@debbugs.gnu.org Wed May 06 15:29:43 2020 Received: (at 40994) by debbugs.gnu.org; 6 May 2020 19:29:43 +0000 Received: from localhost ([127.0.0.1]:41227 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWPjb-0001mI-Gg for submit@debbugs.gnu.org; Wed, 06 May 2020 15:29:43 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:57647) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWPjZ-0001m2-23 for 40994@debbugs.gnu.org; Wed, 06 May 2020 15:29:34 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 40CF46B0; Wed, 6 May 2020 15:29:25 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 06 May 2020 15:29:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=bdn2wmNdEZcCKUNHg+bflyGnpH G6Ihx6P5dCDqe4BOM=; b=S03c1xvJeTFM8BseAM5hLf0nrB0la/ps/9RXxbeXX7 Ufocfdm7GqpVh4k4iptcrnv7b98bcLoUobFrzxlsaPNvcLZ0/Ba5CX1ak5ytezWr KvSTZlgGmyCfNb0f0Hz0+CM5AlGO7mZ5gKYYJt39MS+vwWLILj9g1DerUEHegOw0 1Z67in/4Tf1mgDYxUjJupeFVdsBGb+QZ9I7RbdT9grVTH9ph2EJL7DFPnIYyb62F aY9+1pMXMNXXuYqA7NMOJJXv6NHs5w8++VorHDHmKJSajSfhWjGM9gmr4g6HCkR+ JupfMt8vND1r7qyKmoB2mooG4JQ9eHZD+Is4A6m95LPA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=bdn2wm NdEZcCKUNHg+bflyGnpHG6Ihx6P5dCDqe4BOM=; b=EBo4IABGKLho2J//O6RKNI 4lsndezmQvsODW/nJOI2SmBi0y4D9xsgDqbl6rSTv4pMYAITsvo5Q5610tmUY43C 3T+bPR2xh9P+seuCzEnuJRUbvupuJDgyNcsjZBUy5T4yOp3dGsOiKYc53fmTa0vW xqhhJeO30NFyWZl3WkyS4DN1claDasGOraOGldOUrSTnX5gYx9LZMEeZjNbsGjRG 1ooeE5r60EGUOvbBaJzhpB/H7kPLf6Nbp3p6TKxa0+UqcgwDlBnP0Cn1kW8MnXdj AcwtbXwu54g8UUnjLRyNOejBBGsLt7lRH3OU7DqVEhe6M8c7sQMK6kJVeTNM2RKQ == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrjeekgddufeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtreejnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrg htthgvrhhnpeeuveektdeuudefgfffleeuledvvdfhvdetgedtteejteeffffhtefhffdv feeltdenucffohhmrghinhepphifmhhtrdhorhhgnecukfhppeekgedrvddtvddrieekrd ejheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehm sggrkhhkvgesfhgrshhtmhgrihhlrdgtohhm X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 1B8E9328006C; Wed, 6 May 2020 15:29:23 -0400 (EDT) From: Marius Bakke To: Raghav Gururajan , Brice Waegeneire Subject: Re: [bug#40994] patch#40994 Programs With Movie Titles (PWMT) In-Reply-To: <20200502120901.36d80711.raghavgururajan@disroot.org> References: <76c18088643dcab9d395a0f9760d3a74@waegenei.re> <20200502120901.36d80711.raghavgururajan@disroot.org> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Wed, 06 May 2020 21:29:21 +0200 Message-ID: <87d07g50by.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40994 Cc: 40994@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: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi Raghav, Raghav Gururajan writes: > Please find the attachments with this email, for moving stuffs. All the m= oved > packages only refer to each other. So no need of altering any other packa= ge > definitions. I'm not convinced that moving these packages are worth the effort, though I'm not opposed to it either. What is the rationale? I do have a few nits to pick though :-) > From 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 rout= ines, Pango includes > and routines to assist in editing internationalized text.") > (license license:lgpl2.1+))) >=20=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/= Xvfb " > - 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 t= hat > -focuses on simplicity and minimalism. Currently based on GTK+, a > -cross-platform widget toolkit, it provides an interface that focuses on = three > -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 For each patch, please include the copyright information for that package only. I don't think all of these people worked on girara. That makes it easier to track when someone decides to move these packages to gtk.scm and pdf.scm in the future. ;-) > +(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) Likewise for modules: gnome, web, xorg and xdisorg seems unused for girara.=20 > + #:use-module ((guix licenses) #:prefix license:) > + #:use-module (guix packages) > + #:use-module (guix download) And (guix download). > + #:use-module (guix git-download) > + #:use-module (guix build-system gnu) And gnu-build-system. > + #: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/= Xvfb " > + 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 t= hat > +focuses on simplicity and minimalism. Currently based on GTK+, a > +cross-platform widget toolkit, it provides an interface that focuses on = three > +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 Also make sure that the files end with a newline, like all other files in Guix. For the remainder in this series, please also check whether module imports can be removed from pdf.scm (that makes it worth it IMO). --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6zEBEACgkQoqBt8qM6 VPpfYggAg2bAIpcFCzHBfyArcZOOQlnFVgDcGSMxGDeBoHgwwSAvy64Ev8y3KLk3 /iu/AFlh6SRMmnkf9ObIVdowi1mevIkiYgAin0rHuHOIP+gERNKNHy9sjxbnmQBU xT+shNmP6c4J5DvnMilzQFg4G6j/pAHdckop12zoDW+d9oBcXLhdcpXZYP4r68Ei kYM70r4/XdQ9SV7fTcy1fIimLYcxYCd5v1D7rkxp8SazlnRPX5+22Il3fhzD9Qnl j0CWleZyMgZOlw57giePoyB8z51ALuU3iH98N8cPkIQBfU7m28hLzmgqqUUGmWFr 24uaMp39B0SfI14eN7MwTiG7qvf7Kw== =xUlU -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed May 06 15:50:22 2020 Received: (at 40994) by debbugs.gnu.org; 6 May 2020 19:50:22 +0000 Received: from localhost ([127.0.0.1]:41247 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWQ3i-0002IH-6O for submit@debbugs.gnu.org; Wed, 06 May 2020 15:50:22 -0400 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:41673) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWQ3g-0002I0-G4 for 40994@debbugs.gnu.org; Wed, 06 May 2020 15:50:21 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.west.internal (Postfix) with ESMTP id 768A64E1; Wed, 6 May 2020 15:50:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 06 May 2020 15:50:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= from:to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=fm2; bh=h4ZydI0HSG1l9kaL+FZ97wjrbQ NguQ7UQdqnbOqsVGY=; b=PFLmFyfuEXY8UCVcn8RN98QFqDik0UzOaQye2oKYSK M2teiQNNJ7huwO+RYhV1+usaCXd/lLi6aQ34YV1EkVRVImkT2rxVduYVrfWDeiJN kgZIUyLqoI7gMAyP7TTqJFGOBwEazsX3im4CpAusKcSVKLt2WU2QYDlyjHef7j2f db484U4/bLn88E11aJxCoySzo903uZ4K2XVAa7EcuxED12TOg96gVB6O3GObT0AU ceiQF151lpZuuABbMX6NkVNxgi1sVBHGtp2aMR8kDc9lIMowk3SfZ2m1eDGyh8xF lEgqozHOcfUsziv6YCehGgvbJ55ABcBnhOgaG8zZuSyA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=h4ZydI 0HSG1l9kaL+FZ97wjrbQNguQ7UQdqnbOqsVGY=; b=W7YSBiWovzzr3IVlgfAVTp VRILvfcM8BZrYzt9ipvAcii2QwQSCU03YcDIapdqkykZZ2Q5XBjci24aP6j3t2Go PYAVRJClBM3+BgfE9Zy9LorvE4SPXXnzGwBgiil6QoGNyfoySI34pbRf2Nb3BGm+ OuBSfjBNLYDklkv/sY+6ZF2WS2Om6iWZHmFhySUpNHMe1eq69aGxJtWwkv39m/RG ZeBRrqbIYCyDKVWaerMwfn1qwqQejNIefZyIeum1DONJ2gvQFAVeXQZsruQO3KSz bcrajRN2BCOD1z//XF+FnqNEWZk1Oav8h00kPUp8HizfLoSP5W51PWJEcuP84kdg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduhedrjeekgddufeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufgjfhgffffkgggtsehgtderredtredtnecuhfhrohhmpeforghrihhu shcuuegrkhhkvgcuoehmsggrkhhkvgesfhgrshhtmhgrihhlrdgtohhmqeenucggtffrrg htthgvrhhnpedtvdfggeevgeeivdffueejiedttedvkedtudfggfdtgeefiedtieekffdu gfeuffenucfkphepkeegrddvtddvrdeikedrjeehnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepmhgsrghkkhgvsehfrghsthhmrghilhdrtgho mh X-ME-Proxy: Received: from localhost (ti0006q161-2604.bb.online.no [84.202.68.75]) by mail.messagingengine.com (Postfix) with ESMTPA id 41F943280065; Wed, 6 May 2020 15:50:13 -0400 (EDT) From: Marius Bakke To: Raghav Gururajan , Brice Waegeneire Subject: Re: [bug#40994] patch#40994 Programs With Movie Titles (PWMT) In-Reply-To: <20200503002240.3c2bf6a3.raghavgururajan@disroot.org> References: <76c18088643dcab9d395a0f9760d3a74@waegenei.re> <20200502120901.36d80711.raghavgururajan@disroot.org> <20200503002240.3c2bf6a3.raghavgururajan@disroot.org> User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-pc-linux-gnu) Date: Wed, 06 May 2020 21:50:11 +0200 Message-ID: <87a72k4zd8.fsf@devup.no> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 40994 Cc: 40994@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: -1.7 (-) --=-=-= Content-Type: text/plain Hi! Raghav Gururajan writes: > Here, I have attached another patch-set for modifying stuffs. :-) I have added another set of nit-picks! :-) > 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. I know it's a lot to ask, but it would be great if you could split this up in multiple patches, one per logical change. I.e. this one patch would be better as a series like: Raghav Gururajan (7): gnu: girara: Download tarball instead of git source. gnu: girara: Wrap with Glib variables. gnu: girara: Add notification support. gnu: girara: Build and install documentation. gnu: girara: Do not propagate GTK+. gnu: girara: Enable more features. gnu: girara: Update synopsis & description. That makes it possible to revert some of these changes in case of problems without undoing the whole thing, and also makes reviewing easier. I'm also skeptical about some of these (why is #:glib-or-gtk? necessary for this library, why does GTK+ no longer need to be propagated, and what are all those new inputs for?). By lumping everything together it's difficult to reason about these changes. > 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] sphinx-rtd-theme>: New inputs. Same here, what do these inputs do? > [inputs] libseccomp>: New inputs. And these? > [propagated-inputs]: Removed. > [synopsis]: Updated. > [description]: Updated. ISTM this could be split into at least four different patches. > 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. Why does this plugin package need #:glib-or-gtk?. > [inputs]: New inputs. It's strange that all of these packages require almost the exact same set of inputs. Perhaps they should be propagated somewhere? > [synopsis]: Updated. > [description]: Updated. This should also be a separate patch. I think you catch my drift here, can you send an updated series? --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAl6zFPMACgkQoqBt8qM6 VPoFcAgAlXd5PowbqJHqQZ9y2WDCOndKJiPCCah2xV1GquLmA6S0cnZ4hikZYCUS ArzLl/9vjTkA6zDdEnHIiywPJerTwdrI5gpgIQ+7H/bhB+Os3SH0eR+MJkjuGlGt 2PH7J9dxC7Pqe/gMlxB1ZAL5uCPAeno6PTpolIRigEznxUiRXxTVu/M8047xQmUU Tli4IXx/2LAl2WLcUrYDC8K9kpkXLmuU8dBahnDmzak8S6j2Nqv1sl1NSWqekZc2 7uWO+ULXE5yFsRHKJftsa9aWb4vcYxaCvAngzWrCzEvW4ZWpc1t87IpmSWv6sB9E 1IRFeDn87X2kRiek42WCQZm2lFoMhg== =eg5S -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 07 23:25:00 2020 Received: (at 40994) by debbugs.gnu.org; 8 May 2020 03:25:00 +0000 Received: from localhost ([127.0.0.1]:44332 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWtdE-0000rA-5F for submit@debbugs.gnu.org; Thu, 07 May 2020 23:25:00 -0400 Received: from knopi.disroot.org ([178.21.23.139]:47716) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWtdC-0000qz-Ab for 40994@debbugs.gnu.org; Thu, 07 May 2020 23:24:58 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6DCA035B91; Fri, 8 May 2020 05:24:56 +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 obZVW0BAcBte; Fri, 8 May 2020 05:24:54 +0200 (CEST) Date: Thu, 7 May 2020 23:24:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588908294; bh=5EvERh+umVtylMqWsUoZqQyWEQmUMqfK4GzljUTaK0U=; h=Date:From:To:Cc:Subject; b=eLDteMYM93cEl87mXZf1atGRxanBC5fvYHBnGdmyAI/WZTGsSLQBTQ5oIeIhlPu6C 1rtMQTl0afTrChMR00CQYdcLzoiEaw3g/UPCTJoadggbC/LO2sV1Ku9z+K6s744Nli ptQskq8ojzuHqgeNu2MKkK7C3/2qUEyekX+ZzHK4QZdycQkvp9LFDz1N+MAAuejXxB /B/6L++ZUHn7h8ZUugUGIu22KRFEVRheUPMbzO9li0NWl+7AwinViln8ldSV359oNW xtPWA00d9lRI0nKygvmy/u1HamPh2zMBd+PmRfZS9Kpweo2Kp+VP/1vIGpWF8PaL/3 a00KXdkxgoiaw== From: Raghav Gururajan To: 40994@debbugs.gnu.org Subject: Updated patch-set. Message-ID: <20200507232427.38f0411a.raghavgururajan@disroot.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/4oqirp/MuC4MizmW62PmQWw" X-Debbugs-Envelope-To: 40994 Cc: Marius Bakke , Brice Waegeneire 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" --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0001-gnu-girara-Move-from-gtk.scm-to-pwmt.scm.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0001-gnu-girara-Move-from-gtk.scm-to-pwmt.scm.patch RnJvbSA1MGM3Njk5MzIzNTQ5ZDJlMWVlNTM4NTE1ZTllMTMwZDYyNjllYzY5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMDozNTo0MSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMDEvMjJdIGdudTogZ2lyYXJhOiBNb3ZlIGZyb20gZ3RrLnNjbSB0byBwd210LnNjbS4K CiogZ251L3BhY2thZ2VzL2d0ay5zY20gKGdpcmFyYSk6IE1vdmUgdG8gWy4uLl0KKiBnbnUvcGFj a2FnZXMvcHdtdC5zY20gKGdpcmFyYSk6IFsuLi5dIGhlcmUuCi0tLQogZ251L2xvY2FsLm1rICAg ICAgICAgIHwgIDEgKwogZ251L3BhY2thZ2VzL2d0ay5zY20gIHwgNDkgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBnbnUvcGFja2FnZXMvcHdtdC5zY20gfCA4NiArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrCiAzIGZpbGVzIGNoYW5nZWQsIDg3IGluc2VydGlvbnMo KyksIDQ5IGRlbGV0aW9ucygtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IGdudS9wYWNrYWdlcy9wd210 LnNjbQoKZGlmZiAtLWdpdCBhL2dudS9sb2NhbC5tayBiL2dudS9sb2NhbC5tawppbmRleCA5OGJk ZjY5YzUzLi45ZDdiM2JjODFhIDEwMDY0NAotLS0gYS9nbnUvbG9jYWwubWsKKysrIGIvZ251L2xv Y2FsLm1rCkBAIC00MzEsNiArNDMxLDcgQEAgR05VX1NZU1RFTV9NT0RVTEVTID0JCQkJXAogICAl RCUvcGFja2FnZXMvcHJvdG9idWYuc2NtCQkJXAogICAlRCUvcGFja2FnZXMvcHVyZS5zY20JCQkJ XAogICAlRCUvcGFja2FnZXMvcHYuc2NtCQkJCVwKKyAgJUQlL3BhY2thZ2VzL3B3bXQuc2NtCQkJ CVwKICAgJUQlL3BhY2thZ2VzL3B5dGhvbi5zY20JCQlcCiAgICVEJS9wYWNrYWdlcy9weXRob24t Y2hlY2suc2NtCQkJXAogICAlRCUvcGFja2FnZXMvcHl0aG9uLWNvbXByZXNzaW9uLnNjbQkJXApk aWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL2d0ay5zY20gYi9nbnUvcGFja2FnZXMvZ3RrLnNjbQpp bmRleCBiZWE0ODUwZDE1Li40ZDA5M2EwZTBhIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvZ3Rr LnNjbQorKysgYi9nbnUvcGFja2FnZXMvZ3RrLnNjbQpAQCAtMTQ0NSw1NSArMTQ0NSw2IEBAIElu IGFkZGl0aW9uIHRvIHRoZSBsb3cgbGV2ZWwgbGF5b3V0IHJlbmRlcmluZyByb3V0aW5lcywgUGFu Z28gaW5jbHVkZXMKIGFuZCByb3V0aW5lcyB0byBhc3Npc3QgaW4gZWRpdGluZyBpbnRlcm5hdGlv bmFsaXplZCB0ZXh0LiIpCiAgICAgKGxpY2Vuc2UgbGljZW5zZTpsZ3BsMi4xKykpKQogCi0oZGVm aW5lLXB1YmxpYyBnaXJhcmEKLSAgKHBhY2thZ2UKLSAgICAobmFtZSAiZ2lyYXJhIikKLSAgICAo dmVyc2lvbiAiMC4zLjQiKQotICAgIChzb3VyY2UKLSAgICAgKG9yaWdpbgotICAgICAgIChtZXRo b2QgZ2l0LWZldGNoKQotICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UKLSAgICAgICAgICAgICAo dXJsICJodHRwczovL2dpdC5wd210Lm9yZy9wd210L2dpcmFyYSIpCi0gICAgICAgICAgICAgKGNv bW1pdCB2ZXJzaW9uKSkpCi0gICAgICAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFtZSBuYW1lIHZl cnNpb24pKQotICAgICAgIChzaGEyNTYKLSAgICAgICAgKGJhc2UzMiAiMDhycHc5aGthcHJtNHI4 NTN4eTFkMzVpMmFmMXBqaThjM216emwwMW1td215cjlwMHg4ayIpKSkpCi0gICAgKG5hdGl2ZS1p bnB1dHMgYCgoInBrZy1jb25maWciICxwa2ctY29uZmlnKQotICAgICAgICAgICAgICAgICAgICAg KCJjaGVjayIgLGNoZWNrKQotICAgICAgICAgICAgICAgICAgICAgKCJnZXR0ZXh0IiAsZ2V0dGV4 dC1taW5pbWFsKQotICAgICAgICAgICAgICAgICAgICAgKCJnbGliOmJpbiIgLGdsaWIgImJpbiIp Ci0gICAgICAgICAgICAgICAgICAgICAoInhvcmctc2VydmVyIiAseG9yZy1zZXJ2ZXItZm9yLXRl c3RzKSkpCi0gICAgOzsgTGlzdGVkIGluICdSZXF1aXJlcy5wcml2YXRlJyBvZiAnZ2lyYXJhLnBj Jy4KLSAgICAocHJvcGFnYXRlZC1pbnB1dHMgYCgoImd0aysiICxndGsrKSkpCi0gICAgKGFyZ3Vt ZW50cwotICAgICBgKCM6cGhhc2VzIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKLSAg ICAgICAgICAgICAgICAgIChhZGQtYmVmb3JlICdjaGVjayAnc3RhcnQteHNlcnZlcgotICAgICAg ICAgICAgICAgICAgICA7OyBUZXN0cyByZXF1aXJlIGEgcnVubmluZyBYIHNlcnZlci4KLSAgICAg ICAgICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMp Ci0gICAgICAgICAgICAgICAgICAgICAgKGxldCAoKHhvcmctc2VydmVyIChhc3NvYy1yZWYgaW5w dXRzICJ4b3JnLXNlcnZlciIpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIChkaXNwbGF5 ICI6MSIpKQotICAgICAgICAgICAgICAgICAgICAgICAgKHNldGVudiAiRElTUExBWSIgZGlzcGxh eSkKLQotICAgICAgICAgICAgICAgICAgICAgICAgOzsgT24gYnVzeSBtYWNoaW5lcywgdGVzdHMg bWF5IHRha2UgbG9uZ2VyIHRoYW4KLSAgICAgICAgICAgICAgICAgICAgICAgIDs7IHRoZSBkZWZh dWx0IG9mIGZvdXIgc2Vjb25kcy4KLSAgICAgICAgICAgICAgICAgICAgICAgIChzZXRlbnYgIkNL X0RFRkFVTFRfVElNRU9VVCIgIjIwIikKLQotICAgICAgICAgICAgICAgICAgICAgICAgOzsgRG9u J3QgZmFpbCBkdWUgdG8gbWlzc2luZyAnL2V0Yy9tYWNoaW5lLWlkJy4KLSAgICAgICAgICAgICAg ICAgICAgICAgIChzZXRlbnYgIkRCVVNfRkFUQUxfV0FSTklOR1MiICIwIikKLSAgICAgICAgICAg ICAgICAgICAgICAgICh6ZXJvPyAoc3lzdGVtIChzdHJpbmctYXBwZW5kIHhvcmctc2VydmVyICIv YmluL1h2ZmIgIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZGlzcGxheSAiICYiKSkpKSkpKSkpCi0gICAgKGJ1aWxkLXN5c3RlbSBtZXNvbi1i dWlsZC1zeXN0ZW0pCi0gICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy9n aXJhcmEvIikKLSAgICAoc3lub3BzaXMgIkxpYnJhcnkgZm9yIG1pbmltYWxpc3RpYyBndGsrMyB1 c2VyIGludGVyZmFjZXMiKQotICAgIChkZXNjcmlwdGlvbiAiR2lyYXJhIGlzIGEgbGlicmFyeSB0 aGF0IGltcGxlbWVudHMgYSB1c2VyIGludGVyZmFjZSB0aGF0Ci1mb2N1c2VzIG9uIHNpbXBsaWNp dHkgYW5kIG1pbmltYWxpc20uICBDdXJyZW50bHkgYmFzZWQgb24gR1RLKywgYQotY3Jvc3MtcGxh dGZvcm0gd2lkZ2V0IHRvb2xraXQsIGl0IHByb3ZpZGVzIGFuIGludGVyZmFjZSB0aGF0IGZvY3Vz ZXMgb24gdGhyZWUKLW1haW4gY29tcG9uZW50czogYSBzby1jYWxsZWQgdmlldyB3aWRnZXQgdGhh dCByZXByZXNlbnRzIHRoZSBhY3R1YWwKLWFwcGxpY2F0aW9uLCBhbiBpbnB1dCBiYXIgdGhhdCBp cyB1c2VkIHRvIGV4ZWN1dGUgY29tbWFuZHMgb2YgdGhlCi1hcHBsaWNhdGlvbiBhbmQgdGhlIHN0 YXR1cyBiYXIgd2hpY2ggcHJvdmlkZXMgdGhlIHVzZXIgd2l0aCBjdXJyZW50Ci1pbmZvcm1hdGlv bi4iKQotICAgIChsaWNlbnNlIGxpY2Vuc2U6emxpYikpKQotCiAoZGVmaW5lLXB1YmxpYyBndGst ZG9jCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgImd0ay1kb2MiKQpkaWZmIC0tZ2l0IGEvZ251L3Bh Y2thZ2VzL3B3bXQuc2NtIGIvZ251L3BhY2thZ2VzL3B3bXQuc2NtCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAuLjI4YWY4MDNhNDUKLS0tIC9kZXYvbnVsbAorKysgYi9nbnUv cGFja2FnZXMvcHdtdC5zY20KQEAgLTAsMCArMSw4NiBAQAorOzs7IEdOVSBHdWl4IC0tLSBGdW5j dGlvbmFsIHBhY2thZ2UgbWFuYWdlbWVudCBmb3IgR05VCis7OzsKKzs7OyBDb3B5cmlnaHQgwqkg MjAxNSBQYXVsIHZhbiBkZXIgV2FsdCA8cGF1bEBkZW5rbmVyZC5vcmc+Cis7OzsgQ29weXJpZ2h0 IMKpIDIwMTYgbmcwIDxuZzBAd2UubWFrZS5yaXR1YWwubjAuaXM+Cis7OzsgQ29weXJpZ2h0IMKp IDIwMTcgMjAxOCBNYXJpdXMgQmFra2UgPG1iYWtrZUBmYXN0bWFpbC5jb20+Cis7OzsgQ29weXJp Z2h0IMKpIDIwMTcgS2VpIEtlYnJlYXUgPGtlaUBvcGVubWFpbGJveC5vcmc+Cis7OzsgQ29weXJp Z2h0IMKpIDIwMTggMjAxOSAyMDIwIFRvYmlhcyBHZWVyaW5ja3gtUmljZSA8bWVAdG9iaWFzLmdy PgorOzs7IENvcHlyaWdodCDCqSAyMDIwIFJhZ2hhdiBHdXJ1cmFqYW4gPHJhZ2hhdmd1cnVyYWph bkBkaXNyb290Lm9yZz4KKzs7OworOzs7IFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBHdWl4Lgor Ozs7Cis7OzsgR05VIEd1aXggaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg aXQgYW5kL29yIG1vZGlmeSBpdAorOzs7IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVy YWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5Cis7OzsgdGhlIEZyZWUgU29mdHdhcmUg Rm91bmRhdGlvbjsgZWl0aGVyIHZlcnNpb24gMyBvZiB0aGUgTGljZW5zZSwgb3IgKGF0Cis7Ozsg eW91ciBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLgorOzs7Cis7OzsgR05VIEd1aXggaXMgZGlz dHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwgYnV0Cis7OzsgV0lU SE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgor Ozs7IE1FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4g IFNlZSB0aGUKKzs7OyBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxz LgorOzs7Cis7OzsgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdl bmVyYWwgUHVibGljIExpY2Vuc2UKKzs7OyBhbG9uZyB3aXRoIEdOVSBHdWl4LiAgSWYgbm90LCBz ZWUgPGh0dHA6Ly93d3cuZ251Lm9yZy9saWNlbnNlcy8+LgorCisoZGVmaW5lLW1vZHVsZSAoZ251 IHBhY2thZ2VzIHB3bXQpCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzKQorICAjOnVzZS1t b2R1bGUgKGdudSBwYWNrYWdlcyBjaGVjaykKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg ZG9jdW1lbnRhdGlvbikKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2V0dGV4dCkKKyAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2xpYikKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFj a2FnZXMgZ3RrKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwa2ctY29uZmlnKQorICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyB4b3JnKQorICAjOnVzZS1tb2R1bGUgKChndWl4IGxp Y2Vuc2VzKSAjOnByZWZpeCBsaWNlbnNlOikKKyAgIzp1c2UtbW9kdWxlIChndWl4IHBhY2thZ2Vz KQorICAjOnVzZS1tb2R1bGUgKGd1aXggZ2l0LWRvd25sb2FkKQorICAjOnVzZS1tb2R1bGUgKGd1 aXggYnVpbGQtc3lzdGVtIG1lc29uKSkKKworKGRlZmluZS1wdWJsaWMgZ2lyYXJhCisgIChwYWNr YWdlCisgICAgKG5hbWUgImdpcmFyYSIpCisgICAgKHZlcnNpb24gIjAuMy40IikKKyAgICAoc291 cmNlCisgICAgIChvcmlnaW4KKyAgICAgICAobWV0aG9kIGdpdC1mZXRjaCkKKyAgICAgICAodXJp IChnaXQtcmVmZXJlbmNlCisgICAgICAgICAgICAgKHVybCAiaHR0cHM6Ly9naXQucHdtdC5vcmcv cHdtdC9naXJhcmEiKQorICAgICAgICAgICAgIChjb21taXQgdmVyc2lvbikpKQorICAgICAgIChm aWxlLW5hbWUgKGdpdC1maWxlLW5hbWUgbmFtZSB2ZXJzaW9uKSkKKyAgICAgICAoc2hhMjU2Cisg ICAgICAgIChiYXNlMzIgIjA4cnB3OWhrYXBybTRyODUzeHkxZDM1aTJhZjFwamk4YzNtenpsMDFt bXdteXI5cDB4OGsiKSkpKQorICAgIChuYXRpdmUtaW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtn LWNvbmZpZykKKyAgICAgICAgICAgICAgICAgICAgICgiY2hlY2siICxjaGVjaykKKyAgICAgICAg ICAgICAgICAgICAgICgiZ2V0dGV4dCIgLGdldHRleHQtbWluaW1hbCkKKyAgICAgICAgICAgICAg ICAgICAgICgiZ2xpYjpiaW4iICxnbGliICJiaW4iKQorICAgICAgICAgICAgICAgICAgICAgKCJ4 b3JnLXNlcnZlciIgLHhvcmctc2VydmVyLWZvci10ZXN0cykpKQorICAgIDs7IExpc3RlZCBpbiAn UmVxdWlyZXMucHJpdmF0ZScgb2YgJ2dpcmFyYS5wYycuCisgICAgKHByb3BhZ2F0ZWQtaW5wdXRz IGAoKCJndGsrIiAsZ3RrKykpKQorICAgIChhcmd1bWVudHMKKyAgICAgYCgjOnBoYXNlcyAobW9k aWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCisgICAgICAgICAgICAgICAgICAoYWRkLWJlZm9y ZSAnY2hlY2sgJ3N0YXJ0LXhzZXJ2ZXIKKyAgICAgICAgICAgICAgICAgICAgOzsgVGVzdHMgcmVx dWlyZSBhIHJ1bm5pbmcgWCBzZXJ2ZXIuCisgICAgICAgICAgICAgICAgICAgIChsYW1iZGEqICgj OmtleSBpbnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAgICAgICAgICAgICAgIChs ZXQgKCh4b3JnLXNlcnZlciAoYXNzb2MtcmVmIGlucHV0cyAieG9yZy1zZXJ2ZXIiKSkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAoZGlzcGxheSAiOjEiKSkKKyAgICAgICAgICAgICAgICAg ICAgICAgIChzZXRlbnYgIkRJU1BMQVkiIGRpc3BsYXkpCisKKyAgICAgICAgICAgICAgICAgICAg ICAgIDs7IE9uIGJ1c3kgbWFjaGluZXMsIHRlc3RzIG1heSB0YWtlIGxvbmdlciB0aGFuCisgICAg ICAgICAgICAgICAgICAgICAgICA7OyB0aGUgZGVmYXVsdCBvZiBmb3VyIHNlY29uZHMuCisgICAg ICAgICAgICAgICAgICAgICAgICAoc2V0ZW52ICJDS19ERUZBVUxUX1RJTUVPVVQiICIyMCIpCisK KyAgICAgICAgICAgICAgICAgICAgICAgIDs7IERvbid0IGZhaWwgZHVlIHRvIG1pc3NpbmcgJy9l dGMvbWFjaGluZS1pZCcuCisgICAgICAgICAgICAgICAgICAgICAgICAoc2V0ZW52ICJEQlVTX0ZB VEFMX1dBUk5JTkdTIiAiMCIpCisgICAgICAgICAgICAgICAgICAgICAgICAoemVybz8gKHN5c3Rl bSAoc3RyaW5nLWFwcGVuZCB4b3JnLXNlcnZlciAiL2Jpbi9YdmZiICIKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpc3BsYXkgIiAmIikpKSkp KSkpKQorICAgIChidWlsZC1zeXN0ZW0gbWVzb24tYnVpbGQtc3lzdGVtKQorICAgIChob21lLXBh Z2UgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvZ2lyYXJhLyIpCisgICAgKHN5bm9wc2lzICJM aWJyYXJ5IGZvciBtaW5pbWFsaXN0aWMgZ3RrKzMgdXNlciBpbnRlcmZhY2VzIikKKyAgICAoZGVz Y3JpcHRpb24gIkdpcmFyYSBpcyBhIGxpYnJhcnkgdGhhdCBpbXBsZW1lbnRzIGEgdXNlciBpbnRl cmZhY2UgdGhhdAorZm9jdXNlcyBvbiBzaW1wbGljaXR5IGFuZCBtaW5pbWFsaXNtLiAgQ3VycmVu dGx5IGJhc2VkIG9uIEdUSyssIGEKK2Nyb3NzLXBsYXRmb3JtIHdpZGdldCB0b29sa2l0LCBpdCBw cm92aWRlcyBhbiBpbnRlcmZhY2UgdGhhdCBmb2N1c2VzIG9uIHRocmVlCittYWluIGNvbXBvbmVu dHM6IGEgc28tY2FsbGVkIHZpZXcgd2lkZ2V0IHRoYXQgcmVwcmVzZW50cyB0aGUgYWN0dWFsCith cHBsaWNhdGlvbiwgYW4gaW5wdXQgYmFyIHRoYXQgaXMgdXNlZCB0byBleGVjdXRlIGNvbW1hbmRz IG9mIHRoZQorYXBwbGljYXRpb24gYW5kIHRoZSBzdGF0dXMgYmFyIHdoaWNoIHByb3ZpZGVzIHRo ZSB1c2VyIHdpdGggY3VycmVudAoraW5mb3JtYXRpb24uIikKKyAgICAobGljZW5zZSBsaWNlbnNl OnpsaWIpKSkKLS0gCjIuMjYuMgoK --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0002-gnu-zathura-Move-from-pdf.scm-to-pwmt.scm.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0002-gnu-zathura-Move-from-pdf.scm-to-pwmt.scm.patch RnJvbSBlMTlmYjg4NDU3ZjcyYTA0NDE0NzJiNWNjN2ZjYzNiYjZiYmRmYTJmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMDo1MToyMSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMDIvMjJdIGdudTogemF0aHVyYTogTW92ZSBmcm9tIHBkZi5zY20gdG8gcHdtdC5zY20u CgoqIGdudS9wYWNrYWdlcy9wZGYuc2NtICh6YXRodXJhKTogTW92ZSB0byBbLi4uXQoqIGdudS9w YWNrYWdlcy9wd210LnNjbSAoemF0aHVyYSk6IFsuLi5dIGhlcmUuCi0tLQogZ251L3BhY2thZ2Vz L3BkZi5zY20gIHwgNTggLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQog Z251L3BhY2thZ2VzL3B3bXQuc2NtIHwgNjIgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCA2MiBpbnNlcnRpb25zKCspLCA1OCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcGRmLnNjbSBiL2dudS9wYWNrYWdl cy9wZGYuc2NtCmluZGV4IDcxYjgxNzc1ODIuLmZmNzVlMWVkNTUgMTAwNjQ0Ci0tLSBhL2dudS9w YWNrYWdlcy9wZGYuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9wZGYuc2NtCkBAIC01NzcsNjQgKzU3 Nyw2IEBAIGJ5IHVzaW5nIHRoZSBAY29kZXttdXBkZn0gcmVuZGVyaW5nIGxpYnJhcnkuIikKIGJ5 IHVzaW5nIHRoZSBwb3BwbGVyIHJlbmRlcmluZyBlbmdpbmUuIikKICAgICAobGljZW5zZSBsaWNl bnNlOnpsaWIpKSkKIAotKGRlZmluZS1wdWJsaWMgemF0aHVyYQotICAocGFja2FnZQotICAgIChu YW1lICJ6YXRodXJhIikKLSAgICAodmVyc2lvbiAiMC40LjUiKQotICAgIChzb3VyY2UgKG9yaWdp bgotICAgICAgICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkKLSAgICAgICAgICAgICAgKHVyaQot ICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMv emF0aHVyYS9kb3dubG9hZC96YXRodXJhLSIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHZlcnNpb24gIi50YXIueHoiKSkKLSAgICAgICAgICAgICAgKHNoYTI1NgotICAgICAgICAgICAg ICAgKGJhc2UzMgotICAgICAgICAgICAgICAgICIwYjNucmN2eWtrcHYydm05OWtpam5pYzJncGZ6 dmE1MjBic2psaWhheGFuZHpmbTlmZjhjIikpKSkKLSAgICAobmF0aXZlLWlucHV0cyBgKCgicGtn LWNvbmZpZyIgLHBrZy1jb25maWcpCi0gICAgICAgICAgICAgICAgICAgICAoImdldHRleHQiICxn ZXR0ZXh0LW1pbmltYWwpCi0gICAgICAgICAgICAgICAgICAgICAoImdsaWI6YmluIiAsZ2xpYiAi YmluIikKLQotICAgICAgICAgICAgICAgICAgICAgOzsgRm9yIGJ1aWxkaW5nIGRvY3VtZW50YXRp b24uCi0gICAgICAgICAgICAgICAgICAgICAoInB5dGhvbi1zcGhpbngiICxweXRob24tc3BoaW54 KQotCi0gICAgICAgICAgICAgICAgICAgICA7OyBGb3IgYnVpbGRpbmcgaWNvbnMuCi0gICAgICAg ICAgICAgICAgICAgICAoImxpYnJzdmciICxsaWJyc3ZnKQotCi0gICAgICAgICAgICAgICAgICAg ICA7OyBGb3IgdGVzdHMuCi0gICAgICAgICAgICAgICAgICAgICAoImNoZWNrIiAsY2hlY2spCi0g ICAgICAgICAgICAgICAgICAgICAoInhvcmctc2VydmVyIiAseG9yZy1zZXJ2ZXItZm9yLXRlc3Rz KSkpCi0gICAgKGlucHV0cyBgKCgic3FsaXRlIiAsc3FsaXRlKSkpCi0gICAgOzsgTGlzdGVkIGlu ICdSZXF1aXJlcy5wcml2YXRlJyBvZiAnemF0aHVyYS5wYycuCi0gICAgKHByb3BhZ2F0ZWQtaW5w dXRzIGAoKCJjYWlybyIgLGNhaXJvKQotICAgICAgICAgICAgICAgICAgICAgICAgICgiZ2lyYXJh IiAsZ2lyYXJhKSkpCi0gICAgKG5hdGl2ZS1zZWFyY2gtcGF0aHMKLSAgICAgKGxpc3QgKHNlYXJj aC1wYXRoLXNwZWNpZmljYXRpb24KLSAgICAgICAgICAgICh2YXJpYWJsZSAiWkFUSFVSQV9QTFVH SU5TX1BBVEgiKQotICAgICAgICAgICAgKGZpbGVzICcoImxpYi96YXRodXJhIikpKSkpCi0gICAg KGJ1aWxkLXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCi0gICAgKGFyZ3VtZW50cwotICAgICBg KCM6cGhhc2VzIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKLSAgICAgICAgICAgICAg ICAgIChhZGQtYmVmb3JlICdjaGVjayAnc3RhcnQteHNlcnZlcgotICAgICAgICAgICAgICAgICAg ICA7OyBUZXN0cyByZXF1aXJlIGEgcnVubmluZyBYIHNlcnZlci4KLSAgICAgICAgICAgICAgICAg ICAgKGxhbWJkYSogKCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCi0gICAgICAgICAg ICAgICAgICAgICAgKGxldCAoKHhvcmctc2VydmVyIChhc3NvYy1yZWYgaW5wdXRzICJ4b3JnLXNl cnZlciIpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIChkaXNwbGF5ICI6MSIpKQotICAg ICAgICAgICAgICAgICAgICAgICAgKHNldGVudiAiRElTUExBWSIgZGlzcGxheSkKLQotICAgICAg ICAgICAgICAgICAgICAgICAgOzsgT24gYnVzeSBtYWNoaW5lcywgdGVzdHMgbWF5IHRha2UgbG9u Z2VyIHRoYW4KLSAgICAgICAgICAgICAgICAgICAgICAgIDs7IHRoZSBkZWZhdWx0IG9mIGZvdXIg c2Vjb25kcy4KLSAgICAgICAgICAgICAgICAgICAgICAgIChzZXRlbnYgIkNLX0RFRkFVTFRfVElN RU9VVCIgIjIwIikKLQotICAgICAgICAgICAgICAgICAgICAgICAgOzsgRG9uJ3QgZmFpbCBkdWUg dG8gbWlzc2luZyAnL2V0Yy9tYWNoaW5lLWlkJy4KLSAgICAgICAgICAgICAgICAgICAgICAgIChz ZXRlbnYgIkRCVVNfRkFUQUxfV0FSTklOR1MiICIwIikKLSAgICAgICAgICAgICAgICAgICAgICAg ICh6ZXJvPyAoc3lzdGVtIChzdHJpbmctYXBwZW5kIHhvcmctc2VydmVyICIvYmluL1h2ZmIgIgot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlz cGxheSAiICYiKSkpKSkpKSkpCi0gICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9wd210Lm9yZy9wcm9q ZWN0cy96YXRodXJhLyIpCi0gICAgKHN5bm9wc2lzICJMaWdodHdlaWdodCBrZXlib2FyZC1kcml2 ZW4gUERGIHZpZXdlciIpCi0gICAgKGRlc2NyaXB0aW9uICJaYXRodXJhIGlzIGEgY3VzdG9taXph YmxlIGRvY3VtZW50IHZpZXdlci4gIEl0IHByb3ZpZGVzIGEKLW1pbmltYWxpc3RpYyBpbnRlcmZh Y2UgYW5kIGFuIGludGVyZmFjZSB0aGF0IG1haW5seSBmb2N1c2VzIG9uIGtleWJvYXJkCi1pbnRl cmFjdGlvbi4iKQotICAgIChsaWNlbnNlIGxpY2Vuc2U6emxpYikpKQotCiAoZGVmaW5lLXB1Ymxp YyBwb2RvZm8KICAgKHBhY2thZ2UKICAgICAobmFtZSAicG9kb2ZvIikKZGlmZiAtLWdpdCBhL2du dS9wYWNrYWdlcy9wd210LnNjbSBiL2dudS9wYWNrYWdlcy9wd210LnNjbQppbmRleCAyOGFmODAz YTQ1Li5kZTk1MTkwZjA5IDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvcHdtdC5zY20KKysrIGIv Z251L3BhY2thZ2VzL3B3bXQuc2NtCkBAIC0yOCwxMSArMjgsMTUgQEAKICAgIzp1c2UtbW9kdWxl IChnbnUgcGFja2FnZXMgZG9jdW1lbnRhdGlvbikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2Fn ZXMgZ2V0dGV4dCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2xpYikKKyAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgZ25vbWUpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2Vz IGd0aykKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGtnLWNvbmZpZykKKyAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgc3BoaW54KQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdl cyBzcWxpdGUpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHhvcmcpCiAgICM6dXNlLW1v ZHVsZSAoKGd1aXggbGljZW5zZXMpICM6cHJlZml4IGxpY2Vuc2U6KQogICAjOnVzZS1tb2R1bGUg KGd1aXggcGFja2FnZXMpCisgICM6dXNlLW1vZHVsZSAoZ3VpeCBkb3dubG9hZCkKICAgIzp1c2Ut bW9kdWxlIChndWl4IGdpdC1kb3dubG9hZCkKICAgIzp1c2UtbW9kdWxlIChndWl4IGJ1aWxkLXN5 c3RlbSBtZXNvbikpCiAKQEAgLTg0LDMgKzg4LDYxIEBAIGFwcGxpY2F0aW9uLCBhbiBpbnB1dCBi YXIgdGhhdCBpcyB1c2VkIHRvIGV4ZWN1dGUgY29tbWFuZHMgb2YgdGhlCiBhcHBsaWNhdGlvbiBh bmQgdGhlIHN0YXR1cyBiYXIgd2hpY2ggcHJvdmlkZXMgdGhlIHVzZXIgd2l0aCBjdXJyZW50CiBp bmZvcm1hdGlvbi4iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6emxpYikpKQorCisoZGVmaW5lLXB1 YmxpYyB6YXRodXJhCisgIChwYWNrYWdlCisgICAgKG5hbWUgInphdGh1cmEiKQorICAgICh2ZXJz aW9uICIwLjQuNSIpCisgICAgKHNvdXJjZSAob3JpZ2luCisgICAgICAgICAgICAgIChtZXRob2Qg dXJsLWZldGNoKQorICAgICAgICAgICAgICAodXJpCisgICAgICAgICAgICAgICAoc3RyaW5nLWFw cGVuZCAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy96YXRodXJhL2Rvd25sb2FkL3phdGh1cmEt IgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbiAiLnRhci54eiIpKQorICAg ICAgICAgICAgICAoc2hhMjU2CisgICAgICAgICAgICAgICAoYmFzZTMyCisgICAgICAgICAgICAg ICAgIjBiM25yY3Z5a2twdjJ2bTk5a2lqbmljMmdwZnp2YTUyMGJzamxpaGF4YW5kemZtOWZmOGMi KSkpKQorICAgIChuYXRpdmUtaW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykKKyAg ICAgICAgICAgICAgICAgICAgICgiZ2V0dGV4dCIgLGdldHRleHQtbWluaW1hbCkKKyAgICAgICAg ICAgICAgICAgICAgICgiZ2xpYjpiaW4iICxnbGliICJiaW4iKQorCisgICAgICAgICAgICAgICAg ICAgICA7OyBGb3IgYnVpbGRpbmcgZG9jdW1lbnRhdGlvbi4KKyAgICAgICAgICAgICAgICAgICAg ICgicHl0aG9uLXNwaGlueCIgLHB5dGhvbi1zcGhpbngpCisKKyAgICAgICAgICAgICAgICAgICAg IDs7IEZvciBidWlsZGluZyBpY29ucy4KKyAgICAgICAgICAgICAgICAgICAgICgibGlicnN2ZyIg LGxpYnJzdmcpCisKKyAgICAgICAgICAgICAgICAgICAgIDs7IEZvciB0ZXN0cy4KKyAgICAgICAg ICAgICAgICAgICAgICgiY2hlY2siICxjaGVjaykKKyAgICAgICAgICAgICAgICAgICAgICgieG9y Zy1zZXJ2ZXIiICx4b3JnLXNlcnZlci1mb3ItdGVzdHMpKSkKKyAgICAoaW5wdXRzIGAoKCJzcWxp dGUiICxzcWxpdGUpKSkKKyAgICA7OyBMaXN0ZWQgaW4gJ1JlcXVpcmVzLnByaXZhdGUnIG9mICd6 YXRodXJhLnBjJy4KKyAgICAocHJvcGFnYXRlZC1pbnB1dHMgYCgoImNhaXJvIiAsY2Fpcm8pCisg ICAgICAgICAgICAgICAgICAgICAgICAgKCJnaXJhcmEiICxnaXJhcmEpKSkKKyAgICAobmF0aXZl LXNlYXJjaC1wYXRocworICAgICAobGlzdCAoc2VhcmNoLXBhdGgtc3BlY2lmaWNhdGlvbgorICAg ICAgICAgICAgKHZhcmlhYmxlICJaQVRIVVJBX1BMVUdJTlNfUEFUSCIpCisgICAgICAgICAgICAo ZmlsZXMgJygibGliL3phdGh1cmEiKSkpKSkKKyAgICAoYnVpbGQtc3lzdGVtIG1lc29uLWJ1aWxk LXN5c3RlbSkKKyAgICAoYXJndW1lbnRzCisgICAgIGAoIzpwaGFzZXMgKG1vZGlmeS1waGFzZXMg JXN0YW5kYXJkLXBoYXNlcworICAgICAgICAgICAgICAgICAgKGFkZC1iZWZvcmUgJ2NoZWNrICdz dGFydC14c2VydmVyCisgICAgICAgICAgICAgICAgICAgIDs7IFRlc3RzIHJlcXVpcmUgYSBydW5u aW5nIFggc2VydmVyLgorICAgICAgICAgICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRz ICM6YWxsb3ctb3RoZXIta2V5cykKKyAgICAgICAgICAgICAgICAgICAgICAobGV0ICgoeG9yZy1z ZXJ2ZXIgKGFzc29jLXJlZiBpbnB1dHMgInhvcmctc2VydmVyIikpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKGRpc3BsYXkgIjoxIikpCisgICAgICAgICAgICAgICAgICAgICAgICAoc2V0 ZW52ICJESVNQTEFZIiBkaXNwbGF5KQorCisgICAgICAgICAgICAgICAgICAgICAgICA7OyBPbiBi dXN5IG1hY2hpbmVzLCB0ZXN0cyBtYXkgdGFrZSBsb25nZXIgdGhhbgorICAgICAgICAgICAgICAg ICAgICAgICAgOzsgdGhlIGRlZmF1bHQgb2YgZm91ciBzZWNvbmRzLgorICAgICAgICAgICAgICAg ICAgICAgICAgKHNldGVudiAiQ0tfREVGQVVMVF9USU1FT1VUIiAiMjAiKQorCisgICAgICAgICAg ICAgICAgICAgICAgICA7OyBEb24ndCBmYWlsIGR1ZSB0byBtaXNzaW5nICcvZXRjL21hY2hpbmUt aWQnLgorICAgICAgICAgICAgICAgICAgICAgICAgKHNldGVudiAiREJVU19GQVRBTF9XQVJOSU5H UyIgIjAiKQorICAgICAgICAgICAgICAgICAgICAgICAgKHplcm8/IChzeXN0ZW0gKHN0cmluZy1h cHBlbmQgeG9yZy1zZXJ2ZXIgIi9iaW4vWHZmYiAiCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5ICIgJiIpKSkpKSkpKSkKKyAgICAo aG9tZS1wYWdlICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEvIikKKyAgICAoc3lu b3BzaXMgIkxpZ2h0d2VpZ2h0IGtleWJvYXJkLWRyaXZlbiBQREYgdmlld2VyIikKKyAgICAoZGVz Y3JpcHRpb24gIlphdGh1cmEgaXMgYSBjdXN0b21pemFibGUgZG9jdW1lbnQgdmlld2VyLiAgSXQg cHJvdmlkZXMgYQorbWluaW1hbGlzdGljIGludGVyZmFjZSBhbmQgYW4gaW50ZXJmYWNlIHRoYXQg bWFpbmx5IGZvY3VzZXMgb24ga2V5Ym9hcmQKK2ludGVyYWN0aW9uLiIpCisgICAgKGxpY2Vuc2Ug bGljZW5zZTp6bGliKSkpCi0tIAoyLjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0003-gnu-zathura-ps-Move-from-pdf.scm-to-pwmt.scm.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0003-gnu-zathura-ps-Move-from-pdf.scm-to-pwmt.scm.patch RnJvbSBjMmJkYTljN2U0OGEzN2I0YzM2MjdlMjI5NmU0YmVhYmJiOTJmNWQwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMDo1NjowOSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMDMvMjJdIGdudTogemF0aHVyYS1wczogTW92ZSBmcm9tIHBkZi5zY20gdG8gcHdtdC5z Y20uCgoqIGdudS9wYWNrYWdlcy9wZGYuc2NtICh6YXRodXJhLXBzKTogTW92ZSB0byBbLi4uXQoq IGdudS9wYWNrYWdlcy9wd210LnNjbSAoemF0aHVyYS1wcyk6IFsuLi5dIGhlcmUuCi0tLQogZ251 L3BhY2thZ2VzL3BkZi5zY20gIHwgMzUgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGdudS9wYWNrYWdlcy9wd210LnNjbSB8IDM2ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcGRmLnNjbSBiL2dudS9wYWNrYWdlcy9w ZGYuc2NtCmluZGV4IGZmNzVlMWVkNTUuLmM1NTM5YzdkZjUgMTAwNjQ0Ci0tLSBhL2dudS9wYWNr YWdlcy9wZGYuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9wZGYuc2NtCkBAIC00MjYsNDEgKzQyNiw2 IEBAIHJlYWRpbmcgYW5kIGVkaXRpbmcgb2YgZXhpc3RpbmcgUERGIGZpbGVzLiIpCiB1c2luZyBs aWJhcmNoaXZlLiIpCiAgICAgKGxpY2Vuc2UgbGljZW5zZTp6bGliKSkpCiAKLShkZWZpbmUtcHVi bGljIHphdGh1cmEtcHMKLSAgKHBhY2thZ2UKLSAgICAobmFtZSAiemF0aHVyYS1wcyIpCi0gICAg KHZlcnNpb24gIjAuMi42IikKLSAgICAoc291cmNlIChvcmlnaW4KLSAgICAgICAgICAgICAgKG1l dGhvZCB1cmwtZmV0Y2gpCi0gICAgICAgICAgICAgICh1cmkKLSAgICAgICAgICAgICAgIChzdHJp bmctYXBwZW5kICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtcHMvZG93bmxvYWQv emF0aHVyYS1wcy0iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uICIudGFy Lnh6IikpCi0gICAgICAgICAgICAgIChzaGEyNTYKLSAgICAgICAgICAgICAgIChiYXNlMzIKLSAg ICAgICAgICAgICAgICAiMHd5Z3E4OW55anJqbnNxN3ZicGlkcWRzaXJqbTZpcTR3MnJpanp3cGsy ZjgzeXM4YmMzeSIpKSkpCi0gICAgKG5hdGl2ZS1pbnB1dHMgYCgoInBrZy1jb25maWciICxwa2ct Y29uZmlnKSkpCi0gICAgKGlucHV0cyBgKCgibGlic3BlY3RyZSIgLGxpYnNwZWN0cmUpCi0gICAg ICAgICAgICAgICgiemF0aHVyYSIgLHphdGh1cmEpKSkKLSAgICAoYnVpbGQtc3lzdGVtIG1lc29u LWJ1aWxkLXN5c3RlbSkKLSAgICAoYXJndW1lbnRzCi0gICAgIGAoIzp0ZXN0cz8gI2YgICAgICAg ICAgICAgICAgICAgICAgOyBwYWNrYWdlIGRvZXMgbm90IGNvbnRhaW4gdGVzdHMKLSAgICAgICAj OnBoYXNlcwotICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1waGFzZXMKLSAgICAgICAg IChhZGQtYWZ0ZXIgJ3VucGFjayAncGF0Y2gtcGx1Z2luLWRpcmVjdG9yeQotICAgICAgICAgICA7 OyBTb21ldGhpbmcgb2YgYSByZWdyZXNzaW9uIGluIDAuMi42OiB0aGUgbmV3IE1lc29uIGJ1aWxk IHN5c3RlbQotICAgICAgICAgICA7OyBub3cgaGFyZC1jb2RlcyBhbiBpbmNvcnJlY3QgcGx1Z2lu IGRpcmVjdG9yeS4gIEZpeCBpdC4KLSAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91dHB1dHMg IzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAibWVzb24uYnVp bGQiCi0gICAgICAgICAgICAgICAoKCIoaW5zdGFsbF9kaXI6KS4qIiBfIGtleSkKLSAgICAgICAg ICAgICAgICAoc3RyaW5nLWFwcGVuZCBrZXkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiJyIgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSAiL2xpYi96YXRodXJhJ1xuIikpKQotICAg ICAgICAgICAgICN0KSkpKSkKLSAgICAoaG9tZS1wYWdlICJodHRwczovL3B3bXQub3JnL3Byb2pl Y3RzL3phdGh1cmEtcHMvIikKLSAgICAoc3lub3BzaXMgIlBTIHN1cHBvcnQgZm9yIHphdGh1cmEg KGxpYnNwZWN0cmUgYmFja2VuZCkiKQotICAgIChkZXNjcmlwdGlvbiAiVGhlIHphdGh1cmEtcHMg cGx1Z2luIGFkZHMgUFMgc3VwcG9ydCB0byB6YXRodXJhCi11c2luZyBsaWJzcGVjdHJlLiIpCi0g ICAgKGxpY2Vuc2UgbGljZW5zZTp6bGliKSkpCi0KIChkZWZpbmUtcHVibGljIHphdGh1cmEtZGp2 dQogICAocGFja2FnZQogICAgIChuYW1lICJ6YXRodXJhLWRqdnUiKQpkaWZmIC0tZ2l0IGEvZ251 L3BhY2thZ2VzL3B3bXQuc2NtIGIvZ251L3BhY2thZ2VzL3B3bXQuc2NtCmluZGV4IGRlOTUxOTBm MDkuLjMyYWJlNmQxMjkgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9wd210LnNjbQorKysgYi9n bnUvcGFja2FnZXMvcHdtdC5zY20KQEAgLTI3LDYgKzI3LDcgQEAKICAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgY2hlY2spCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGRvY3VtZW50 YXRpb24pCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdldHRleHQpCisgICM6dXNlLW1v ZHVsZSAoZ251IHBhY2thZ2VzIGdob3N0c2NyaXB0KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBnbGliKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBnbm9tZSkKICAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgZ3RrKQpAQCAtMTQ2LDMgKzE0NywzOCBAQCBpbmZvcm1hdGlv bi4iKQogbWluaW1hbGlzdGljIGludGVyZmFjZSBhbmQgYW4gaW50ZXJmYWNlIHRoYXQgbWFpbmx5 IGZvY3VzZXMgb24ga2V5Ym9hcmQKIGludGVyYWN0aW9uLiIpCiAgICAgKGxpY2Vuc2UgbGljZW5z ZTp6bGliKSkpCisKKyhkZWZpbmUtcHVibGljIHphdGh1cmEtcHMKKyAgKHBhY2thZ2UKKyAgICAo bmFtZSAiemF0aHVyYS1wcyIpCisgICAgKHZlcnNpb24gIjAuMi42IikKKyAgICAoc291cmNlIChv cmlnaW4KKyAgICAgICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgICAgICAgICh1 cmkKKyAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJodHRwczovL3B3bXQub3JnL3Byb2pl Y3RzL3phdGh1cmEtcHMvZG93bmxvYWQvemF0aHVyYS1wcy0iCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB2ZXJzaW9uICIudGFyLnh6IikpCisgICAgICAgICAgICAgIChzaGEyNTYKKyAg ICAgICAgICAgICAgIChiYXNlMzIKKyAgICAgICAgICAgICAgICAiMHd5Z3E4OW55anJqbnNxN3Zi cGlkcWRzaXJqbTZpcTR3MnJpanp3cGsyZjgzeXM4YmMzeSIpKSkpCisgICAgKG5hdGl2ZS1pbnB1 dHMgYCgoInBrZy1jb25maWciICxwa2ctY29uZmlnKSkpCisgICAgKGlucHV0cyBgKCgibGlic3Bl Y3RyZSIgLGxpYnNwZWN0cmUpCisgICAgICAgICAgICAgICgiemF0aHVyYSIgLHphdGh1cmEpKSkK KyAgICAoYnVpbGQtc3lzdGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkKKyAgICAoYXJndW1lbnRzCisg ICAgIGAoIzp0ZXN0cz8gI2YgICAgICAgICAgICAgICAgICAgICAgOyBwYWNrYWdlIGRvZXMgbm90 IGNvbnRhaW4gdGVzdHMKKyAgICAgICAjOnBoYXNlcworICAgICAgIChtb2RpZnktcGhhc2VzICVz dGFuZGFyZC1waGFzZXMKKyAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAncGF0Y2gtcGx1Z2lu LWRpcmVjdG9yeQorICAgICAgICAgICA7OyBTb21ldGhpbmcgb2YgYSByZWdyZXNzaW9uIGluIDAu Mi42OiB0aGUgbmV3IE1lc29uIGJ1aWxkIHN5c3RlbQorICAgICAgICAgICA7OyBub3cgaGFyZC1j b2RlcyBhbiBpbmNvcnJlY3QgcGx1Z2luIGRpcmVjdG9yeS4gIEZpeCBpdC4KKyAgICAgICAgICAg KGxhbWJkYSogKCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQorICAgICAgICAgICAg IChzdWJzdGl0dXRlKiAibWVzb24uYnVpbGQiCisgICAgICAgICAgICAgICAoKCIoaW5zdGFsbF9k aXI6KS4qIiBfIGtleSkKKyAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBrZXkKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiJyIgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSAi L2xpYi96YXRodXJhJ1xuIikpKQorICAgICAgICAgICAgICN0KSkpKSkKKyAgICAoaG9tZS1wYWdl ICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtcHMvIikKKyAgICAoc3lub3BzaXMg IlBTIHN1cHBvcnQgZm9yIHphdGh1cmEgKGxpYnNwZWN0cmUgYmFja2VuZCkiKQorICAgIChkZXNj cmlwdGlvbiAiVGhlIHphdGh1cmEtcHMgcGx1Z2luIGFkZHMgUFMgc3VwcG9ydCB0byB6YXRodXJh Cit1c2luZyBsaWJzcGVjdHJlLiIpCisgICAgKGxpY2Vuc2UgbGljZW5zZTp6bGliKSkpCi0tIAoy LjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0004-gnu-zathura-pdf-poppler-Move-from-pdf.scm-to-pwmt.sc.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0004-gnu-zathura-pdf-poppler-Move-from-pdf.scm-to-pwmt.sc.patch RnJvbSAxMGI2ODIxOTEyMjQ4NDFjN2UzZThjNDUwMzRkZTU0ZDlkM2U0NWI1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMDo1OTo1OCAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMDQvMjJdIGdudTogemF0aHVyYS1wZGYtcG9wcGxlcjogTW92ZSBmcm9tIHBkZi5zY20g dG8KIHB3bXQuc2NtLgoKKiBnbnUvcGFja2FnZXMvcGRmLnNjbSAoemF0aHVyYS1wZGYtcG9wcGxl cik6IE1vdmUgdG8gWy4uLl0KKiBnbnUvcGFja2FnZXMvcHdtdC5zY20gKHphdGh1cmEtcGRmLXBv cHBsZXIpOiBbLi4uXSBoZXJlLgotLS0KIGdudS9wYWNrYWdlcy9wZGYuc2NtICB8IDM2IC0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZ251L3BhY2thZ2VzL3B3bXQuc2NtIHwg MzcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2Vk LCAzNyBpbnNlcnRpb25zKCspLCAzNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFj a2FnZXMvcGRmLnNjbSBiL2dudS9wYWNrYWdlcy9wZGYuc2NtCmluZGV4IGM1NTM5YzdkZjUuLjBh Y2ExZTcwN2EgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9wZGYuc2NtCisrKyBiL2dudS9wYWNr YWdlcy9wZGYuc2NtCkBAIC01MDYsNDIgKzUwNiw2IEBAIHVzaW5nIHRoZSBEalZ1TGlicmUgbGli cmFyeS4iKQogYnkgdXNpbmcgdGhlIEBjb2Rle211cGRmfSByZW5kZXJpbmcgbGlicmFyeS4iKQog ICAgIChsaWNlbnNlIGxpY2Vuc2U6emxpYikpKQogCi0oZGVmaW5lLXB1YmxpYyB6YXRodXJhLXBk Zi1wb3BwbGVyCi0gIChwYWNrYWdlCi0gICAgKG5hbWUgInphdGh1cmEtcGRmLXBvcHBsZXIiKQot ICAgICh2ZXJzaW9uICIwLjMuMCIpCi0gICAgKHNvdXJjZSAob3JpZ2luCi0gICAgICAgICAgICAg IChtZXRob2QgdXJsLWZldGNoKQotICAgICAgICAgICAgICAodXJpCi0gICAgICAgICAgICAgICAo c3RyaW5nLWFwcGVuZCAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy96YXRodXJhLXBkZi1wb3Bw bGVyL2Rvd25sb2FkL3phdGh1cmEtcGRmLXBvcHBsZXItIgotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdmVyc2lvbiAiLnRhci54eiIpKQotICAgICAgICAgICAgICAoc2hhMjU2Ci0gICAg ICAgICAgICAgICAoYmFzZTMyCi0gICAgICAgICAgICAgICAgIjF2Zmw0dmt5eTNyZjM5cjFzcWFh N3k4MTEzYmdraDJia2ZxM25uMmluaXM5bXJ5a21rNm0iKSkpKQotICAgIChuYXRpdmUtaW5wdXRz IGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykpKQotICAgIChpbnB1dHMKLSAgICAgYCgoInBv cHBsZXIiICxwb3BwbGVyKQotICAgICAgICgiemF0aHVyYSIgLHphdGh1cmEpKSkKLSAgICAoYnVp bGQtc3lzdGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkKLSAgICAoYXJndW1lbnRzCi0gICAgIGAoIzp0 ZXN0cz8gI2YgICAgICAgICAgICAgICAgICAgICAgOyBwYWNrYWdlIGRvZXMgbm90IGluY2x1ZGUg dGVzdHMKLSAgICAgICAjOnBoYXNlcwotICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1w aGFzZXMKLSAgICAgICAgIChhZGQtYWZ0ZXIgJ3VucGFjayAncGF0Y2gtcGx1Z2luLWRpcmVjdG9y eQotICAgICAgICAgICA7OyBTb21ldGhpbmcgb2YgYSByZWdyZXNzaW9uIGluIDAuMi45OiB0aGUg bmV3IE1lc29uIGJ1aWxkIHN5c3RlbQotICAgICAgICAgICA7OyBub3cgaGFyZC1jb2RlcyBhbiBp bmNvcnJlY3QgcGx1Z2luIGRpcmVjdG9yeS4gIEZpeCBpdC4KLSAgICAgICAgICAgKGxhbWJkYSog KCM6a2V5IG91dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgIChzdWJzdGl0 dXRlKiAibWVzb24uYnVpbGQiCi0gICAgICAgICAgICAgICAoKCIoaW5zdGFsbF9kaXI6KS4qIiBf IGtleSkKLSAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBrZXkKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiJyIgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSAiL2xpYi96YXRo dXJhJ1xuIikpKQotICAgICAgICAgICAgICN0KSkpKSkKLSAgICAoaG9tZS1wYWdlICJodHRwczov L3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtcGRmLXBvcHBsZXIvIikKLSAgICAoc3lub3BzaXMg IlBERiBzdXBwb3J0IGZvciB6YXRodXJhIChwb3BwbGVyIGJhY2tlbmQpIikKLSAgICAoZGVzY3Jp cHRpb24gIlRoZSB6YXRodXJhLXBkZi1wb3BwbGVyIHBsdWdpbiBhZGRzIFBERiBzdXBwb3J0IHRv IHphdGh1cmEKLWJ5IHVzaW5nIHRoZSBwb3BwbGVyIHJlbmRlcmluZyBlbmdpbmUuIikKLSAgICAo bGljZW5zZSBsaWNlbnNlOnpsaWIpKSkKLQogKGRlZmluZS1wdWJsaWMgcG9kb2ZvCiAgIChwYWNr YWdlCiAgICAgKG5hbWUgInBvZG9mbyIpCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcHdtdC5z Y20gYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KaW5kZXggMzJhYmU2ZDEyOS4uZjk4NGYxYjMyNyAx MDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3B3bXQuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9wd210 LnNjbQpAQCAtMzEsNiArMzEsNyBAQAogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBnbGli KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBnbm9tZSkKICAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgZ3RrKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwZGYpCiAgICM6 dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBrZy1jb25maWcpCiAgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzIHNwaGlueCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc3FsaXRlKQpA QCAtMTgyLDMgKzE4MywzOSBAQCBpbnRlcmFjdGlvbi4iKQogICAgIChkZXNjcmlwdGlvbiAiVGhl IHphdGh1cmEtcHMgcGx1Z2luIGFkZHMgUFMgc3VwcG9ydCB0byB6YXRodXJhCiB1c2luZyBsaWJz cGVjdHJlLiIpCiAgICAgKGxpY2Vuc2UgbGljZW5zZTp6bGliKSkpCisKKyhkZWZpbmUtcHVibGlj IHphdGh1cmEtcGRmLXBvcHBsZXIKKyAgKHBhY2thZ2UKKyAgICAobmFtZSAiemF0aHVyYS1wZGYt cG9wcGxlciIpCisgICAgKHZlcnNpb24gIjAuMy4wIikKKyAgICAoc291cmNlIChvcmlnaW4KKyAg ICAgICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCisgICAgICAgICAgICAgICh1cmkKKyAgICAg ICAgICAgICAgIChzdHJpbmctYXBwZW5kICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1 cmEtcGRmLXBvcHBsZXIvZG93bmxvYWQvemF0aHVyYS1wZGYtcG9wcGxlci0iCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uICIudGFyLnh6IikpCisgICAgICAgICAgICAgIChz aGEyNTYKKyAgICAgICAgICAgICAgIChiYXNlMzIKKyAgICAgICAgICAgICAgICAiMXZmbDR2a3l5 M3JmMzlyMXNxYWE3eTgxMTNiZ2toMmJrZnEzbm4yaW5pczltcnlrbWs2bSIpKSkpCisgICAgKG5h dGl2ZS1pbnB1dHMgYCgoInBrZy1jb25maWciICxwa2ctY29uZmlnKSkpCisgICAgKGlucHV0cwor ICAgICBgKCgicG9wcGxlciIgLHBvcHBsZXIpCisgICAgICAgKCJ6YXRodXJhIiAsemF0aHVyYSkp KQorICAgIChidWlsZC1zeXN0ZW0gbWVzb24tYnVpbGQtc3lzdGVtKQorICAgIChhcmd1bWVudHMK KyAgICAgYCgjOnRlc3RzPyAjZiAgICAgICAgICAgICAgICAgICAgICA7IHBhY2thZ2UgZG9lcyBu b3QgaW5jbHVkZSB0ZXN0cworICAgICAgICM6cGhhc2VzCisgICAgICAgKG1vZGlmeS1waGFzZXMg JXN0YW5kYXJkLXBoYXNlcworICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdwYXRjaC1wbHVn aW4tZGlyZWN0b3J5CisgICAgICAgICAgIDs7IFNvbWV0aGluZyBvZiBhIHJlZ3Jlc3Npb24gaW4g MC4yLjk6IHRoZSBuZXcgTWVzb24gYnVpbGQgc3lzdGVtCisgICAgICAgICAgIDs7IG5vdyBoYXJk LWNvZGVzIGFuIGluY29ycmVjdCBwbHVnaW4gZGlyZWN0b3J5LiAgRml4IGl0LgorICAgICAgICAg ICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAgICAg ICAgKHN1YnN0aXR1dGUqICJtZXNvbi5idWlsZCIKKyAgICAgICAgICAgICAgICgoIihpbnN0YWxs X2RpcjopLioiIF8ga2V5KQorICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGtleQorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICInIiAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIp ICIvbGliL3phdGh1cmEnXG4iKSkpCisgICAgICAgICAgICAgI3QpKSkpKQorICAgIChob21lLXBh Z2UgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1wZGYtcG9wcGxlci8iKQorICAg IChzeW5vcHNpcyAiUERGIHN1cHBvcnQgZm9yIHphdGh1cmEgKHBvcHBsZXIgYmFja2VuZCkiKQor ICAgIChkZXNjcmlwdGlvbiAiVGhlIHphdGh1cmEtcGRmLXBvcHBsZXIgcGx1Z2luIGFkZHMgUERG IHN1cHBvcnQgdG8gemF0aHVyYQorYnkgdXNpbmcgdGhlIHBvcHBsZXIgcmVuZGVyaW5nIGVuZ2lu ZS4iKQorICAgIChsaWNlbnNlIGxpY2Vuc2U6emxpYikpKQotLSAKMi4yNi4yCgo= --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0005-gnu-zathura-pdf-mupdf-Move-from-pdf.scm-to-pwmt.scm.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0005-gnu-zathura-pdf-mupdf-Move-from-pdf.scm-to-pwmt.scm.patch RnJvbSBmNjkzZGJiNzExMDY5MWI5MjM3Mjg2OTNjYzNmYzlmMzYwMGQ4NjI0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMTowNToxNSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMDUvMjJdIGdudTogemF0aHVyYS1wZGYtbXVwZGY6IE1vdmUgZnJvbSBwZGYuc2NtIHRv IHB3bXQuc2NtLgoKKiBnbnUvcGFja2FnZXMvcGRmLnNjbSAoemF0aHVyYS1wZGYtbXVwZGYpOiBN b3ZlIHRvIFsuLi5dCiogZ251L3BhY2thZ2VzL3B3bXQuc2NtICh6YXRodXJhLXBkZi1tdXBkZik6 IFsuLi5dIGhlcmUuCi0tLQogZ251L3BhY2thZ2VzL3BkZi5zY20gIHwgNDQgLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogZ251L3BhY2thZ2VzL3B3bXQuc2NtIHwgNDcg KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogMiBmaWxlcyBjaGFu Z2VkLCA0NyBpbnNlcnRpb25zKCspLCA0NCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUv cGFja2FnZXMvcGRmLnNjbSBiL2dudS9wYWNrYWdlcy9wZGYuc2NtCmluZGV4IDBhY2ExZTcwN2Eu LjMwYThlYzIwZTYgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9wZGYuc2NtCisrKyBiL2dudS9w YWNrYWdlcy9wZGYuc2NtCkBAIC00NjIsNTAgKzQ2Miw2IEBAIHVzaW5nIGxpYmFyY2hpdmUuIikK IHVzaW5nIHRoZSBEalZ1TGlicmUgbGlicmFyeS4iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6emxp YikpKQogCi0oZGVmaW5lLXB1YmxpYyB6YXRodXJhLXBkZi1tdXBkZgotICAocGFja2FnZQotICAg IChuYW1lICJ6YXRodXJhLXBkZi1tdXBkZiIpCi0gICAgKHZlcnNpb24gIjAuMy41IikKLSAgICAo c291cmNlIChvcmlnaW4KLSAgICAgICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCi0gICAgICAg ICAgICAgICh1cmkKLSAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kICJodHRwczovL3B3bXQu b3JnL3Byb2plY3RzL3phdGh1cmEtcGRmLW11cGRmIgotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIi9kb3dubG9hZC96YXRodXJhLXBkZi1tdXBkZi0iIHZlcnNpb24gIi50YXIueHoiKSkK LSAgICAgICAgICAgICAgKHNoYTI1NgotICAgICAgICAgICAgICAgKGJhc2UzMgotICAgICAgICAg ICAgICAgICIxcGp3c2I3endjbHhzdnoyMjlmbDd5MnNhZjFwdjNpZnd2M2F5OHZpcXhncnA5eDN6 OWhxIikpKSkKLSAgICAobmF0aXZlLWlucHV0cyBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcp KSkKLSAgICAoaW5wdXRzCi0gICAgIGAoKCJqYmlnMmRlYyIgLGpiaWcyZGVjKQotICAgICAgICgi bGlianBlZyIgLGxpYmpwZWcpCi0gICAgICAgKCJtdWpzIiAsbXVqcykKLSAgICAgICAoIm11cGRm IiAsbXVwZGYpCi0gICAgICAgKCJvcGVuanBlZyIgLG9wZW5qcGVnKQotICAgICAgICgib3BlbnNz bCIgLG9wZW5zc2wpCi0gICAgICAgKCJ6YXRodXJhIiAsemF0aHVyYSkpKQotICAgIChidWlsZC1z eXN0ZW0gbWVzb24tYnVpbGQtc3lzdGVtKQotICAgIChhcmd1bWVudHMKLSAgICAgYCgjOnRlc3Rz PyAjZiAgICAgICAgICAgICAgICAgICAgICA7IHBhY2thZ2UgZG9lcyBub3QgY29udGFpbiB0ZXN0 cwotICAgICAgICM6Y29uZmlndXJlLWZsYWdzIChsaXN0IChzdHJpbmctYXBwZW5kICItRHBsdWdp bmRpcj0iCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKGFz c29jLXJlZiAlb3V0cHV0cyAib3V0IikKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAiL2xpYi96YXRodXJhIikKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiLURsaW5rLWV4dGVybmFsPXRydWUiKQotICAgICAgICM6cGhhc2VzCi0gICAgICAgKG1v ZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwotICAgICAgICAgKGFkZC1iZWZvcmUgJ2NvbmZp Z3VyZSAnYWRkLW11anMtdG8tZGVwZW5kZW5jaWVzCi0gICAgICAgICAgIChsYW1iZGEgXwotICAg ICAgICAgICAgIDs7IEFkZCBtdWpzIHRvIHRoZSAnYnVpbGRfZGVwZW5kZW5jaWVzJy4KLSAgICAg ICAgICAgICAoc3Vic3RpdHV0ZSogIm1lc29uLmJ1aWxkIgotICAgICAgICAgICAgICAgKCgiXiAg bGlib3BlbmpwMiA9IGRlcGVuZGVuY3kuKiIgeCkKLSAgICAgICAgICAgICAgICAoc3RyaW5nLWFw cGVuZCB4ICIgIG11anMgPSBjYy5maW5kX2xpYnJhcnkoJ211anMnKVxuIikpCi0gICAgICAgICAg ICAgICAoKCJeICAgIGxpYm9wZW5qcDIiKQotICAgICAgICAgICAgICAgICIgICAgbGlib3Blbmpw MiwgbXVqcyIpKSkpKSkpCi0gICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0 cy96YXRodXJhLXBkZi1tdXBkZi8iKQotICAgIChzeW5vcHNpcyAiUERGIHN1cHBvcnQgZm9yIHph dGh1cmEgKG11cGRmIGJhY2tlbmQpIikKLSAgICAoZGVzY3JpcHRpb24gIlRoZSB6YXRodXJhLXBk Zi1tdXBkZiBwbHVnaW4gYWRkcyBQREYgc3VwcG9ydCB0byB6YXRodXJhCi1ieSB1c2luZyB0aGUg QGNvZGV7bXVwZGZ9IHJlbmRlcmluZyBsaWJyYXJ5LiIpCi0gICAgKGxpY2Vuc2UgbGljZW5zZTp6 bGliKSkpCi0KIChkZWZpbmUtcHVibGljIHBvZG9mbwogICAocGFja2FnZQogICAgIChuYW1lICJw b2RvZm8iKQpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3B3bXQuc2NtIGIvZ251L3BhY2thZ2Vz L3B3bXQuc2NtCmluZGV4IGY5ODRmMWIzMjcuLjNkM2FiZTE2OGQgMTAwNjQ0Ci0tLSBhL2dudS9w YWNrYWdlcy9wd210LnNjbQorKysgYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KQEAgLTMxLDEwICsz MSwxMyBAQAogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBnbGliKQogICAjOnVzZS1tb2R1 bGUgKGdudSBwYWNrYWdlcyBnbm9tZSkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ3Rr KQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBpbWFnZSkKKyAgIzp1c2UtbW9kdWxlIChn bnUgcGFja2FnZXMgamF2YXNjcmlwdCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgcGRm KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBwa2ctY29uZmlnKQogICAjOnVzZS1tb2R1 bGUgKGdudSBwYWNrYWdlcyBzcGhpbngpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHNx bGl0ZSkKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgdGxzKQogICAjOnVzZS1tb2R1bGUg KGdudSBwYWNrYWdlcyB4b3JnKQogICAjOnVzZS1tb2R1bGUgKChndWl4IGxpY2Vuc2VzKSAjOnBy ZWZpeCBsaWNlbnNlOikKICAgIzp1c2UtbW9kdWxlIChndWl4IHBhY2thZ2VzKQpAQCAtMjE5LDMg KzIyMiw0NyBAQCB1c2luZyBsaWJzcGVjdHJlLiIpCiAgICAgKGRlc2NyaXB0aW9uICJUaGUgemF0 aHVyYS1wZGYtcG9wcGxlciBwbHVnaW4gYWRkcyBQREYgc3VwcG9ydCB0byB6YXRodXJhCiBieSB1 c2luZyB0aGUgcG9wcGxlciByZW5kZXJpbmcgZW5naW5lLiIpCiAgICAgKGxpY2Vuc2UgbGljZW5z ZTp6bGliKSkpCisKKyhkZWZpbmUtcHVibGljIHphdGh1cmEtcGRmLW11cGRmCisgIChwYWNrYWdl CisgICAgKG5hbWUgInphdGh1cmEtcGRmLW11cGRmIikKKyAgICAodmVyc2lvbiAiMC4zLjUiKQor ICAgIChzb3VyY2UgKG9yaWdpbgorICAgICAgICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkKKyAg ICAgICAgICAgICAgKHVyaQorICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgImh0dHBzOi8v cHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1wZGYtbXVwZGYiCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAiL2Rvd25sb2FkL3phdGh1cmEtcGRmLW11cGRmLSIgdmVyc2lvbiAiLnRhci54 eiIpKQorICAgICAgICAgICAgICAoc2hhMjU2CisgICAgICAgICAgICAgICAoYmFzZTMyCisgICAg ICAgICAgICAgICAgIjFwandzYjd6d2NseHN2ejIyOWZsN3kyc2FmMXB2M2lmd3YzYXk4dmlxeGdy cDl4M3o5aHEiKSkpKQorICAgIChuYXRpdmUtaW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtnLWNv bmZpZykpKQorICAgIChpbnB1dHMKKyAgICAgYCgoImpiaWcyZGVjIiAsamJpZzJkZWMpCisgICAg ICAgKCJsaWJqcGVnIiAsbGlianBlZykKKyAgICAgICAoIm11anMiICxtdWpzKQorICAgICAgICgi bXVwZGYiICxtdXBkZikKKyAgICAgICAoIm9wZW5qcGVnIiAsb3BlbmpwZWcpCisgICAgICAgKCJv cGVuc3NsIiAsb3BlbnNzbCkKKyAgICAgICAoInphdGh1cmEiICx6YXRodXJhKSkpCisgICAgKGJ1 aWxkLXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCisgICAgKGFyZ3VtZW50cworICAgICBgKCM6 dGVzdHM/ICNmICAgICAgICAgICAgICAgICAgICAgIDsgcGFja2FnZSBkb2VzIG5vdCBjb250YWlu IHRlc3RzCisgICAgICAgIzpjb25maWd1cmUtZmxhZ3MgKGxpc3QgKHN0cmluZy1hcHBlbmQgIi1E cGx1Z2luZGlyPSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAoYXNzb2MtcmVmICVvdXRwdXRzICJvdXQiKQorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICIvbGliL3phdGh1cmEiKQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICItRGxpbmstZXh0ZXJuYWw9dHJ1ZSIpCisgICAgICAgIzpwaGFzZXMKKyAgICAg ICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCisgICAgICAgICAoYWRkLWJlZm9yZSAn Y29uZmlndXJlICdhZGQtbXVqcy10by1kZXBlbmRlbmNpZXMKKyAgICAgICAgICAgKGxhbWJkYSBf CisgICAgICAgICAgICAgOzsgQWRkIG11anMgdG8gdGhlICdidWlsZF9kZXBlbmRlbmNpZXMnLgor ICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAibWVzb24uYnVpbGQiCisgICAgICAgICAgICAgICAo KCJeICBsaWJvcGVuanAyID0gZGVwZW5kZW5jeS4qIiB4KQorICAgICAgICAgICAgICAgIChzdHJp bmctYXBwZW5kIHggIiAgbXVqcyA9IGNjLmZpbmRfbGlicmFyeSgnbXVqcycpXG4iKSkKKyAgICAg ICAgICAgICAgICgoIl4gICAgbGlib3BlbmpwMiIpCisgICAgICAgICAgICAgICAgIiAgICBsaWJv cGVuanAyLCBtdWpzIikpKSkpKSkKKyAgICAoaG9tZS1wYWdlICJodHRwczovL3B3bXQub3JnL3By b2plY3RzL3phdGh1cmEtcGRmLW11cGRmLyIpCisgICAgKHN5bm9wc2lzICJQREYgc3VwcG9ydCBm b3IgemF0aHVyYSAobXVwZGYgYmFja2VuZCkiKQorICAgIChkZXNjcmlwdGlvbiAiVGhlIHphdGh1 cmEtcGRmLW11cGRmIHBsdWdpbiBhZGRzIFBERiBzdXBwb3J0IHRvIHphdGh1cmEKK2J5IHVzaW5n IHRoZSBAY29kZXttdXBkZn0gcmVuZGVyaW5nIGxpYnJhcnkuIikKKyAgICAobGljZW5zZSBsaWNl bnNlOnpsaWIpKSkKLS0gCjIuMjYuMgoK --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0006-gnu-zathura-djvu-Move-from-pdf.scm-to-pwmt.scm.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0006-gnu-zathura-djvu-Move-from-pdf.scm-to-pwmt.scm.patch RnJvbSBhNTU4MjEyZjQyOGM4NDdjNTM2YWU5NzUyZTc0NjNiMzc3NWEyMTE1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMTowODoxNiAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMDYvMjJdIGdudTogemF0aHVyYS1kanZ1OiBNb3ZlIGZyb20gcGRmLnNjbSB0byBwd210 LnNjbS4KCiogZ251L3BhY2thZ2VzL3BkZi5zY20gKHphdGh1cmEtZGp2dSk6IE1vdmUgdG8gWy4u Ll0KKiBnbnUvcGFja2FnZXMvcHdtdC5zY20gKHphdGh1cmEtZGp2dSk6IFsuLi5dIGhlcmUuCi0t LQogZ251L3BhY2thZ2VzL3BkZi5zY20gIHwgMzYgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tCiBnbnUvcGFja2FnZXMvcHdtdC5zY20gfCAzNyArKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKyksIDM2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wZGYuc2NtIGIvZ251L3Bh Y2thZ2VzL3BkZi5zY20KaW5kZXggMzBhOGVjMjBlNi4uNjk0OWNhNDc1MCAxMDA2NDQKLS0tIGEv Z251L3BhY2thZ2VzL3BkZi5zY20KKysrIGIvZ251L3BhY2thZ2VzL3BkZi5zY20KQEAgLTQyNiw0 MiArNDI2LDYgQEAgcmVhZGluZyBhbmQgZWRpdGluZyBvZiBleGlzdGluZyBQREYgZmlsZXMuIikK IHVzaW5nIGxpYmFyY2hpdmUuIikKICAgICAobGljZW5zZSBsaWNlbnNlOnpsaWIpKSkKIAotKGRl ZmluZS1wdWJsaWMgemF0aHVyYS1kanZ1Ci0gIChwYWNrYWdlCi0gICAgKG5hbWUgInphdGh1cmEt ZGp2dSIpCi0gICAgKHZlcnNpb24gIjAuMi45IikKLSAgICAoc291cmNlIChvcmlnaW4KLSAgICAg ICAgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gpCi0gICAgICAgICAgICAgICh1cmkKLSAgICAgICAg ICAgICAgIChzdHJpbmctYXBwZW5kICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEt ZGp2dS9kb3dubG9hZC96YXRodXJhLWRqdnUtIgotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgdmVyc2lvbiAiLnRhci54eiIpKQotICAgICAgICAgICAgICAoc2hhMjU2Ci0gICAgICAgICAg ICAgICAoYmFzZTMyCi0gICAgICAgICAgICAgICAgIjAwNjJuMjM2NDE0ZGI3cTdwbm4zY2NnNTEx MWdoeGozNDA3cG45cmkwOHNreHNrZ2lybG4iKSkpKQotICAgIChuYXRpdmUtaW5wdXRzIGAoKCJw a2ctY29uZmlnIiAscGtnLWNvbmZpZykpKQotICAgIChpbnB1dHMKLSAgICAgYCgoImRqdnVsaWJy ZSIgLGRqdnVsaWJyZSkKLSAgICAgICAoInphdGh1cmEiICx6YXRodXJhKSkpCi0gICAgKGJ1aWxk LXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCi0gICAgKGFyZ3VtZW50cwotICAgICBgKCM6dGVz dHM/ICNmICAgICAgICAgICAgICAgICAgICAgIDsgcGFja2FnZSBkb2VzIG5vdCBjb250YWluIHRl c3RzCi0gICAgICAgIzpwaGFzZXMKLSAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhh c2VzCi0gICAgICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ3BhdGNoLXBsdWdpbi1kaXJlY3RvcnkK LSAgICAgICAgICAgOzsgU29tZXRoaW5nIG9mIGEgcmVncmVzc2lvbiBpbiAwLjIuODogdGhlIG5l dyBNZXNvbiBidWlsZCBzeXN0ZW0KLSAgICAgICAgICAgOzsgbm93IGhhcmQtY29kZXMgYW4gaW5j b3JyZWN0IHBsdWdpbiBkaXJlY3RvcnkuICBGaXggaXQuCi0gICAgICAgICAgIChsYW1iZGEqICgj OmtleSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAgICAgICAoc3Vic3RpdHV0 ZSogIm1lc29uLmJ1aWxkIgotICAgICAgICAgICAgICAgKCgiKGluc3RhbGxfZGlyOikuKiIgXyBr ZXkpCi0gICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQga2V5Ci0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIiciIChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikgIi9saWIvemF0aHVy YSdcbiIpKSkKLSAgICAgICAgICAgICAjdCkpKSkpCi0gICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9w d210Lm9yZy9wcm9qZWN0cy96YXRodXJhLWRqdnUvIikKLSAgICAoc3lub3BzaXMgIkRqVnUgc3Vw cG9ydCBmb3IgemF0aHVyYSAoRGpWdUxpYnJlIGJhY2tlbmQpIikKLSAgICAoZGVzY3JpcHRpb24g IlRoZSB6YXRodXJhLWRqdnUgcGx1Z2luIGFkZHMgRGpWdSBzdXBwb3J0IHRvIHphdGh1cmEKLXVz aW5nIHRoZSBEalZ1TGlicmUgbGlicmFyeS4iKQotICAgIChsaWNlbnNlIGxpY2Vuc2U6emxpYikp KQotCiAoZGVmaW5lLXB1YmxpYyBwb2RvZm8KICAgKHBhY2thZ2UKICAgICAobmFtZSAicG9kb2Zv IikKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wd210LnNjbSBiL2dudS9wYWNrYWdlcy9wd210 LnNjbQppbmRleCAzZDNhYmUxNjhkLi5lNTM1ZDA5ZjA2IDEwMDY0NAotLS0gYS9nbnUvcGFja2Fn ZXMvcHdtdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL3B3bXQuc2NtCkBAIC0yNSw2ICsyNSw3IEBA CiAoZGVmaW5lLW1vZHVsZSAoZ251IHBhY2thZ2VzIHB3bXQpCiAgICM6dXNlLW1vZHVsZSAoZ251 IHBhY2thZ2VzKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBjaGVjaykKKyAgIzp1c2Ut bW9kdWxlIChnbnUgcGFja2FnZXMgZGp2dSkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMg ZG9jdW1lbnRhdGlvbikKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2V0dGV4dCkKICAg Izp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2hvc3RzY3JpcHQpCkBAIC0yNjYsMyArMjY3LDM5 IEBAIGJ5IHVzaW5nIHRoZSBwb3BwbGVyIHJlbmRlcmluZyBlbmdpbmUuIikKICAgICAoZGVzY3Jp cHRpb24gIlRoZSB6YXRodXJhLXBkZi1tdXBkZiBwbHVnaW4gYWRkcyBQREYgc3VwcG9ydCB0byB6 YXRodXJhCiBieSB1c2luZyB0aGUgQGNvZGV7bXVwZGZ9IHJlbmRlcmluZyBsaWJyYXJ5LiIpCiAg ICAgKGxpY2Vuc2UgbGljZW5zZTp6bGliKSkpCisKKyhkZWZpbmUtcHVibGljIHphdGh1cmEtZGp2 dQorICAocGFja2FnZQorICAgIChuYW1lICJ6YXRodXJhLWRqdnUiKQorICAgICh2ZXJzaW9uICIw LjIuOSIpCisgICAgKHNvdXJjZSAob3JpZ2luCisgICAgICAgICAgICAgIChtZXRob2QgdXJsLWZl dGNoKQorICAgICAgICAgICAgICAodXJpCisgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCAi aHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy96YXRodXJhLWRqdnUvZG93bmxvYWQvemF0aHVyYS1k anZ1LSIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi50YXIueHoiKSkK KyAgICAgICAgICAgICAgKHNoYTI1NgorICAgICAgICAgICAgICAgKGJhc2UzMgorICAgICAgICAg ICAgICAgICIwMDYybjIzNjQxNGRiN3E3cG5uM2NjZzUxMTFnaHhqMzQwN3BuOXJpMDhza3hza2dp cmxuIikpKSkKKyAgICAobmF0aXZlLWlucHV0cyBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcp KSkKKyAgICAoaW5wdXRzCisgICAgIGAoKCJkanZ1bGlicmUiICxkanZ1bGlicmUpCisgICAgICAg KCJ6YXRodXJhIiAsemF0aHVyYSkpKQorICAgIChidWlsZC1zeXN0ZW0gbWVzb24tYnVpbGQtc3lz dGVtKQorICAgIChhcmd1bWVudHMKKyAgICAgYCgjOnRlc3RzPyAjZiAgICAgICAgICAgICAgICAg ICAgICA7IHBhY2thZ2UgZG9lcyBub3QgY29udGFpbiB0ZXN0cworICAgICAgICM6cGhhc2VzCisg ICAgICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcworICAgICAgICAgKGFkZC1hZnRl ciAndW5wYWNrICdwYXRjaC1wbHVnaW4tZGlyZWN0b3J5CisgICAgICAgICAgIDs7IFNvbWV0aGlu ZyBvZiBhIHJlZ3Jlc3Npb24gaW4gMC4yLjg6IHRoZSBuZXcgTWVzb24gYnVpbGQgc3lzdGVtCisg ICAgICAgICAgIDs7IG5vdyBoYXJkLWNvZGVzIGFuIGluY29ycmVjdCBwbHVnaW4gZGlyZWN0b3J5 LiAgRml4IGl0LgorICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90 aGVyLWtleXMpCisgICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJtZXNvbi5idWlsZCIKKyAgICAg ICAgICAgICAgICgoIihpbnN0YWxsX2RpcjopLioiIF8ga2V5KQorICAgICAgICAgICAgICAgIChz dHJpbmctYXBwZW5kIGtleQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICInIiAoYXNz b2MtcmVmIG91dHB1dHMgIm91dCIpICIvbGliL3phdGh1cmEnXG4iKSkpCisgICAgICAgICAgICAg I3QpKSkpKQorICAgIChob21lLXBhZ2UgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVy YS1kanZ1LyIpCisgICAgKHN5bm9wc2lzICJEalZ1IHN1cHBvcnQgZm9yIHphdGh1cmEgKERqVnVM aWJyZSBiYWNrZW5kKSIpCisgICAgKGRlc2NyaXB0aW9uICJUaGUgemF0aHVyYS1kanZ1IHBsdWdp biBhZGRzIERqVnUgc3VwcG9ydCB0byB6YXRodXJhCit1c2luZyB0aGUgRGpWdUxpYnJlIGxpYnJh cnkuIikKKyAgICAobGljZW5zZSBsaWNlbnNlOnpsaWIpKSkKLS0gCjIuMjYuMgoK --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0007-gnu-zathura-cb-Move-from-pdf.scm-to-pwmt.scm.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0007-gnu-zathura-cb-Move-from-pdf.scm-to-pwmt.scm.patch RnJvbSA0MGQ4YjE5Y2EwOTFhNjQyZWE3NWZkYjU5ZWU0ZmZkZmU2NDk4MmQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMToxNDoxMyAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMDcvMjJdIGdudTogemF0aHVyYS1jYjogTW92ZSBmcm9tIHBkZi5zY20gdG8gcHdtdC5z Y20uCgoqIGdudS9wYWNrYWdlcy9wZGYuc2NtICh6YXRodXJhLWNiKTogTW92ZSB0byBbLi4uXQoq IGdudS9wYWNrYWdlcy9wd210LnNjbSAoemF0aHVyYS1jYik6IFsuLi5dIGhlcmUuCi0tLQogZ251 L3BhY2thZ2VzL3BkZi5zY20gIHwgMzUgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0KIGdudS9wYWNrYWdlcy9wd210LnNjbSB8IDM2ICsrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKwogMiBmaWxlcyBjaGFuZ2VkLCAzNiBpbnNlcnRpb25zKCspLCAzNSBkZWxldGlv bnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcGRmLnNjbSBiL2dudS9wYWNrYWdlcy9w ZGYuc2NtCmluZGV4IDY5NDljYTQ3NTAuLmNhYWU4NjQ5NzkgMTAwNjQ0Ci0tLSBhL2dudS9wYWNr YWdlcy9wZGYuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9wZGYuc2NtCkBAIC0zOTEsNDEgKzM5MSw2 IEBAIHJlYWRpbmcgYW5kIGVkaXRpbmcgb2YgZXhpc3RpbmcgUERGIGZpbGVzLiIpCiAgICAobGlj ZW5zZSBsaWNlbnNlOmdwbDMpICAgICAgICAgICAgIDsgb3IgZ3BsMiwgYnV0IG5vdCBncGwyKwog ICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly93d3cueHBkZnJlYWRlci5jb20vIikpKQogCi0oZGVmaW5l LXB1YmxpYyB6YXRodXJhLWNiCi0gIChwYWNrYWdlCi0gICAgKG5hbWUgInphdGh1cmEtY2IiKQot ICAgICh2ZXJzaW9uICIwLjEuOCIpCi0gICAgKHNvdXJjZSAob3JpZ2luCi0gICAgICAgICAgICAg IChtZXRob2QgdXJsLWZldGNoKQotICAgICAgICAgICAgICAodXJpCi0gICAgICAgICAgICAgICAo c3RyaW5nLWFwcGVuZCAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy96YXRodXJhLWNiL2Rvd25s b2FkL3phdGh1cmEtY2ItIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbiAi LnRhci54eiIpKQotICAgICAgICAgICAgICAoc2hhMjU2Ci0gICAgICAgICAgICAgICAoYmFzZTMy Ci0gICAgICAgICAgICAgICAgIjFpNmNmMHZrczUwMWNnZ3d2ZnNsNnFiN21kYWYzc3N6ZHltcGhp bWZ2bnNwdzgxMGZhajUiKSkpKQotICAgIChuYXRpdmUtaW5wdXRzIGAoKCJwa2ctY29uZmlnIiAs cGtnLWNvbmZpZykpKQotICAgIChpbnB1dHMgYCgoImxpYmFyY2hpdmUiICxsaWJhcmNoaXZlKQot ICAgICAgICAgICAgICAoInphdGh1cmEiICx6YXRodXJhKSkpCi0gICAgKGJ1aWxkLXN5c3RlbSBt ZXNvbi1idWlsZC1zeXN0ZW0pCi0gICAgKGFyZ3VtZW50cwotICAgICBgKCM6dGVzdHM/ICNmICAg ICAgICAgICAgICAgICAgICAgIDsgcGFja2FnZSBkb2VzIG5vdCBjb250YWluIHRlc3RzCi0gICAg ICAgIzpwaGFzZXMKLSAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCi0gICAg ICAgICAoYWRkLWFmdGVyICd1bnBhY2sgJ3BhdGNoLXBsdWdpbi1kaXJlY3RvcnkKLSAgICAgICAg ICAgOzsgU29tZXRoaW5nIG9mIGEgcmVncmVzc2lvbiBpbiAwLjEuODogdGhlIG5ldyBNZXNvbiBi dWlsZCBzeXN0ZW0KLSAgICAgICAgICAgOzsgbm93IGhhcmQtY29kZXMgYW4gaW5jb3JyZWN0IHBs dWdpbiBkaXJlY3RvcnkuICBGaXggaXQuCi0gICAgICAgICAgIChsYW1iZGEqICgjOmtleSBvdXRw dXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAgICAgICAoc3Vic3RpdHV0ZSogIm1lc29u LmJ1aWxkIgotICAgICAgICAgICAgICAgKCgiKGluc3RhbGxfZGlyOikuKiIgXyBrZXkpCi0gICAg ICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQga2V5Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIiciIChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikgIi9saWIvemF0aHVyYSdcbiIpKSkK LSAgICAgICAgICAgICAjdCkpKSkpCi0gICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9wd210Lm9yZy9w cm9qZWN0cy96YXRodXJhLWNiLyIpCi0gICAgKHN5bm9wc2lzICJDb21pYyBib29rIHN1cHBvcnQg Zm9yIHphdGh1cmEgKGxpYmFyY2hpdmUgYmFja2VuZCkiKQotICAgIChkZXNjcmlwdGlvbiAiVGhl IHphdGh1cmEtY2IgcGx1Z2luIGFkZHMgY29taWMgYm9vayBzdXBwb3J0IHRvIHphdGh1cmEKLXVz aW5nIGxpYmFyY2hpdmUuIikKLSAgICAobGljZW5zZSBsaWNlbnNlOnpsaWIpKSkKLQogKGRlZmlu ZS1wdWJsaWMgcG9kb2ZvCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgInBvZG9mbyIpCmRpZmYgLS1n aXQgYS9nbnUvcGFja2FnZXMvcHdtdC5zY20gYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KaW5kZXgg ZTUzNWQwOWYwNi4uNjU1ZGMzOWUyNiAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3B3bXQuc2Nt CisrKyBiL2dudS9wYWNrYWdlcy9wd210LnNjbQpAQCAtMjQsNiArMjQsNyBAQAogCiAoZGVmaW5l LW1vZHVsZSAoZ251IHBhY2thZ2VzIHB3bXQpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2Vz KQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBiYWNrdXApCiAgICM6dXNlLW1vZHVsZSAo Z251IHBhY2thZ2VzIGNoZWNrKQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBkanZ1KQog ICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBkb2N1bWVudGF0aW9uKQpAQCAtMzAzLDMgKzMw NCwzOCBAQCBieSB1c2luZyB0aGUgQGNvZGV7bXVwZGZ9IHJlbmRlcmluZyBsaWJyYXJ5LiIpCiAg ICAgKGRlc2NyaXB0aW9uICJUaGUgemF0aHVyYS1kanZ1IHBsdWdpbiBhZGRzIERqVnUgc3VwcG9y dCB0byB6YXRodXJhCiB1c2luZyB0aGUgRGpWdUxpYnJlIGxpYnJhcnkuIikKICAgICAobGljZW5z ZSBsaWNlbnNlOnpsaWIpKSkKKworKGRlZmluZS1wdWJsaWMgemF0aHVyYS1jYgorICAocGFja2Fn ZQorICAgIChuYW1lICJ6YXRodXJhLWNiIikKKyAgICAodmVyc2lvbiAiMC4xLjgiKQorICAgIChz b3VyY2UgKG9yaWdpbgorICAgICAgICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkKKyAgICAgICAg ICAgICAgKHVyaQorICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgImh0dHBzOi8vcHdtdC5v cmcvcHJvamVjdHMvemF0aHVyYS1jYi9kb3dubG9hZC96YXRodXJhLWNiLSIKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi50YXIueHoiKSkKKyAgICAgICAgICAgICAgKHNo YTI1NgorICAgICAgICAgICAgICAgKGJhc2UzMgorICAgICAgICAgICAgICAgICIxaTZjZjB2a3M1 MDFjZ2d3dmZzbDZxYjdtZGFmM3NzemR5bXBoaW1mdm5zcHc4MTBmYWo1IikpKSkKKyAgICAobmF0 aXZlLWlucHV0cyBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpKSkKKyAgICAoaW5wdXRzIGAo KCJsaWJhcmNoaXZlIiAsbGliYXJjaGl2ZSkKKyAgICAgICAgICAgICAgKCJ6YXRodXJhIiAsemF0 aHVyYSkpKQorICAgIChidWlsZC1zeXN0ZW0gbWVzb24tYnVpbGQtc3lzdGVtKQorICAgIChhcmd1 bWVudHMKKyAgICAgYCgjOnRlc3RzPyAjZiAgICAgICAgICAgICAgICAgICAgICA7IHBhY2thZ2Ug ZG9lcyBub3QgY29udGFpbiB0ZXN0cworICAgICAgICM6cGhhc2VzCisgICAgICAgKG1vZGlmeS1w aGFzZXMgJXN0YW5kYXJkLXBoYXNlcworICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdwYXRj aC1wbHVnaW4tZGlyZWN0b3J5CisgICAgICAgICAgIDs7IFNvbWV0aGluZyBvZiBhIHJlZ3Jlc3Np b24gaW4gMC4xLjg6IHRoZSBuZXcgTWVzb24gYnVpbGQgc3lzdGVtCisgICAgICAgICAgIDs7IG5v dyBoYXJkLWNvZGVzIGFuIGluY29ycmVjdCBwbHVnaW4gZGlyZWN0b3J5LiAgRml4IGl0LgorICAg ICAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAg ICAgICAgICAgKHN1YnN0aXR1dGUqICJtZXNvbi5idWlsZCIKKyAgICAgICAgICAgICAgICgoIihp bnN0YWxsX2RpcjopLioiIF8ga2V5KQorICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGtl eQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICInIiAoYXNzb2MtcmVmIG91dHB1dHMg Im91dCIpICIvbGliL3phdGh1cmEnXG4iKSkpCisgICAgICAgICAgICAgI3QpKSkpKQorICAgICho b21lLXBhZ2UgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1jYi8iKQorICAgIChz eW5vcHNpcyAiQ29taWMgYm9vayBzdXBwb3J0IGZvciB6YXRodXJhIChsaWJhcmNoaXZlIGJhY2tl bmQpIikKKyAgICAoZGVzY3JpcHRpb24gIlRoZSB6YXRodXJhLWNiIHBsdWdpbiBhZGRzIGNvbWlj IGJvb2sgc3VwcG9ydCB0byB6YXRodXJhCit1c2luZyBsaWJhcmNoaXZlLiIpCisgICAgKGxpY2Vu c2UgbGljZW5zZTp6bGliKSkpCi0tIAoyLjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0008-gnu-girara-Download-tarball-instead-of-git-source.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0008-gnu-girara-Download-tarball-instead-of-git-source.patch RnJvbSAxZThlOTY1ODlkNDlmMTg4OTQ2NTA1YzI4MjY5NjBmYmU2M2E0MGVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMToyNDoyMSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMDgvMjJdIGdudTogZ2lyYXJhOiBEb3dubG9hZCB0YXJiYWxsIGluc3RlYWQgb2YgZ2l0 IHNvdXJjZS4KCiogZ251L3BhY2thZ2VzL3B3bXQuc2NtIChnaXJhcmEpOiBDaGFuZ2UgZnJvbSBn aXQtZmV0Y2ggdG8gdXJsLWZldGNoLgotLS0KIGdudS9wYWNrYWdlcy9wd210LnNjbSB8IDExICsr KysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wd210LnNjbSBiL2dudS9wYWNrYWdlcy9wd210 LnNjbQppbmRleCA2NTVkYzM5ZTI2Li41N2YxODQ3YTM5IDEwMDY0NAotLS0gYS9nbnUvcGFja2Fn ZXMvcHdtdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL3B3bXQuc2NtCkBAIC01MywxMyArNTMsMTIg QEAKICAgICAodmVyc2lvbiAiMC4zLjQiKQogICAgIChzb3VyY2UKICAgICAgKG9yaWdpbgotICAg ICAgIChtZXRob2QgZ2l0LWZldGNoKQotICAgICAgICh1cmkgKGdpdC1yZWZlcmVuY2UKLSAgICAg ICAgICAgICAodXJsICJodHRwczovL2dpdC5wd210Lm9yZy9wd210L2dpcmFyYSIpCi0gICAgICAg ICAgICAgKGNvbW1pdCB2ZXJzaW9uKSkpCi0gICAgICAgKGZpbGUtbmFtZSAoZ2l0LWZpbGUtbmFt ZSBuYW1lIHZlcnNpb24pKQorICAgICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICh1cmkK KyAgICAgICAgKHN0cmluZy1hcHBlbmQgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvZ2lyYXJh L2Rvd25sb2FkL2dpcmFyYS0iCisgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi50YXIu eHoiKSkKICAgICAgICAoc2hhMjU2Ci0gICAgICAgIChiYXNlMzIgIjA4cnB3OWhrYXBybTRyODUz eHkxZDM1aTJhZjFwamk4YzNtenpsMDFtbXdteXI5cDB4OGsiKSkpKQorICAgICAgICAoYmFzZTMy ICIwY21qZGlzbWRzeDlhNWw3eng1NHprZDMzbWdnM214NGNrcHZjN2FhcDN4NmExZGRtejJpIikp KSkKICAgICAobmF0aXZlLWlucHV0cyBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpCiAgICAg ICAgICAgICAgICAgICAgICAoImNoZWNrIiAsY2hlY2spCiAgICAgICAgICAgICAgICAgICAgICAo ImdldHRleHQiICxnZXR0ZXh0LW1pbmltYWwpCi0tIAoyLjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0009-gnu-girara-Rearrange-elements-of-package-definition.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0009-gnu-girara-Rearrange-elements-of-package-definition.patch RnJvbSBkMWU0Y2I1NmQxNDhmZjM1YWFlMWRiMDliOTQ4NjJiZDY1OWM0ZTJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMTozMTo1NSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMDkvMjJdIGdudTogZ2lyYXJhOiBSZWFycmFuZ2UgZWxlbWVudHMgb2YgcGFja2FnZSBk ZWZpbml0aW9uLgoKKiBnbnUvcGFja2FnZXMvcHdtdC5zY20gKGdpcmFyYSk6IFJlb3JkZXIgZmll bGRzLgotLS0KIGdudS9wYWNrYWdlcy9wd210LnNjbSB8IDE4ICsrKysrKysrKy0tLS0tLS0tLQog MSBmaWxlIGNoYW5nZWQsIDkgaW5zZXJ0aW9ucygrKSwgOSBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9nbnUvcGFja2FnZXMvcHdtdC5zY20gYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KaW5kZXgg NTdmMTg0N2EzOS4uOTc3YmEzOWNjYyAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3B3bXQuc2Nt CisrKyBiL2dudS9wYWNrYWdlcy9wd210LnNjbQpAQCAtNTksMTMgKzU5LDcgQEAKICAgICAgICAg ICAgICAgICAgICAgICAgdmVyc2lvbiAiLnRhci54eiIpKQogICAgICAgIChzaGEyNTYKICAgICAg ICAgKGJhc2UzMiAiMGNtamRpc21kc3g5YTVsN3p4NTR6a2QzM21nZzNteDRja3B2YzdhYXAzeDZh MWRkbXoyaSIpKSkpCi0gICAgKG5hdGl2ZS1pbnB1dHMgYCgoInBrZy1jb25maWciICxwa2ctY29u ZmlnKQotICAgICAgICAgICAgICAgICAgICAgKCJjaGVjayIgLGNoZWNrKQotICAgICAgICAgICAg ICAgICAgICAgKCJnZXR0ZXh0IiAsZ2V0dGV4dC1taW5pbWFsKQotICAgICAgICAgICAgICAgICAg ICAgKCJnbGliOmJpbiIgLGdsaWIgImJpbiIpCi0gICAgICAgICAgICAgICAgICAgICAoInhvcmct c2VydmVyIiAseG9yZy1zZXJ2ZXItZm9yLXRlc3RzKSkpCi0gICAgOzsgTGlzdGVkIGluICdSZXF1 aXJlcy5wcml2YXRlJyBvZiAnZ2lyYXJhLnBjJy4KLSAgICAocHJvcGFnYXRlZC1pbnB1dHMgYCgo Imd0aysiICxndGsrKSkpCisgICAgKGJ1aWxkLXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCiAg ICAgKGFyZ3VtZW50cwogICAgICBgKCM6cGhhc2VzIChtb2RpZnktcGhhc2VzICVzdGFuZGFyZC1w aGFzZXMKICAgICAgICAgICAgICAgICAgIChhZGQtYmVmb3JlICdjaGVjayAnc3RhcnQteHNlcnZl cgpAQCAtODMsOCArNzcsMTMgQEAKICAgICAgICAgICAgICAgICAgICAgICAgIChzZXRlbnYgIkRC VVNfRkFUQUxfV0FSTklOR1MiICIwIikKICAgICAgICAgICAgICAgICAgICAgICAgICh6ZXJvPyAo c3lzdGVtIChzdHJpbmctYXBwZW5kIHhvcmctc2VydmVyICIvYmluL1h2ZmIgIgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlzcGxheSAiICYi KSkpKSkpKSkpCi0gICAgKGJ1aWxkLXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCi0gICAgKGhv bWUtcGFnZSAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy9naXJhcmEvIikKKyAgICAobmF0aXZl LWlucHV0cyBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpCisgICAgICAgICAgICAgICAgICAg ICAoImNoZWNrIiAsY2hlY2spCisgICAgICAgICAgICAgICAgICAgICAoImdldHRleHQiICxnZXR0 ZXh0LW1pbmltYWwpCisgICAgICAgICAgICAgICAgICAgICAoImdsaWI6YmluIiAsZ2xpYiAiYmlu IikKKyAgICAgICAgICAgICAgICAgICAgICgieG9yZy1zZXJ2ZXIiICx4b3JnLXNlcnZlci1mb3It dGVzdHMpKSkKKyAgICA7OyBMaXN0ZWQgaW4gJ1JlcXVpcmVzLnByaXZhdGUnIG9mICdnaXJhcmEu cGMnLgorICAgIChwcm9wYWdhdGVkLWlucHV0cyBgKCgiZ3RrKyIgLGd0ayspKSkKICAgICAoc3lu b3BzaXMgIkxpYnJhcnkgZm9yIG1pbmltYWxpc3RpYyBndGsrMyB1c2VyIGludGVyZmFjZXMiKQog ICAgIChkZXNjcmlwdGlvbiAiR2lyYXJhIGlzIGEgbGlicmFyeSB0aGF0IGltcGxlbWVudHMgYSB1 c2VyIGludGVyZmFjZSB0aGF0CiBmb2N1c2VzIG9uIHNpbXBsaWNpdHkgYW5kIG1pbmltYWxpc20u ICBDdXJyZW50bHkgYmFzZWQgb24gR1RLKywgYQpAQCAtOTMsNiArOTIsNyBAQCBtYWluIGNvbXBv bmVudHM6IGEgc28tY2FsbGVkIHZpZXcgd2lkZ2V0IHRoYXQgcmVwcmVzZW50cyB0aGUgYWN0dWFs CiBhcHBsaWNhdGlvbiwgYW4gaW5wdXQgYmFyIHRoYXQgaXMgdXNlZCB0byBleGVjdXRlIGNvbW1h bmRzIG9mIHRoZQogYXBwbGljYXRpb24gYW5kIHRoZSBzdGF0dXMgYmFyIHdoaWNoIHByb3ZpZGVz IHRoZSB1c2VyIHdpdGggY3VycmVudAogaW5mb3JtYXRpb24uIikKKyAgICAoaG9tZS1wYWdlICJo dHRwczovL3B3bXQub3JnL3Byb2plY3RzL2dpcmFyYS8iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6 emxpYikpKQogCiAoZGVmaW5lLXB1YmxpYyB6YXRodXJhCi0tIAoyLjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0010-gnu-girara-Update-package-definition.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0010-gnu-girara-Update-package-definition.patch RnJvbSBhYzQ1Njk1OWExNGYxMTIzNTYwNTFmYzM3YjRiMzBiNTRkNDc1ZjNkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMjowMTozMyAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTAvMjJdIGdudTogZ2lyYXJhOiBVcGRhdGUgcGFja2FnZSBkZWZpbml0aW9uLgoKKiBn bnUvcGFja2FnZXMvcHdtdC5zY20gKGdpcmFyYSk6IE1ha2UgY2hhbmdlcyB0byByZWZsZWN0IHBh cnRpY3VsYXJzCmluIHJlY2VudCB2ZXJzaW9uIG9mIHNvdXJjZSBjb2RlLgpbYXJndW1lbnRzXTog QWRkIGdsaWItb3ItZ3RrIG9wdGlvbi4KW2FyZ3VtZW50c106IEFkZCBub3RpZnkgY29uZmlndXJl LWZsYWcuCltuYXRpdmUtaW5wdXRzXTogQWRkIGRveHlnZW4uCltpbnB1dHNdOiBBZGQgZ2xpYiwg anNvbi1jLCBsaWJub3RpZnkgYW5kIHBhbmdvLgpbcHJvcGFnYXRlZC1pbnB1dHNdOiBNb3ZlIGd0 aysgdG8gaW5wdXRzLgpbc3lub3BzaXNdOiBVcGRhdGUuCltkZXNjcmlwdGlvbl06IFVwZGF0ZS4K LS0tCiBnbnUvcGFja2FnZXMvcHdtdC5zY20gfCA3MiArKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNDIgaW5zZXJ0aW9ucygrKSwgMzAg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3B3bXQuc2NtIGIvZ251L3Bh Y2thZ2VzL3B3bXQuc2NtCmluZGV4IDk3N2JhMzljY2MuLjkwMDgyNjM2NWYgMTAwNjQ0Ci0tLSBh L2dudS9wYWNrYWdlcy9wd210LnNjbQorKysgYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KQEAgLTQw LDYgKzQwLDcgQEAKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgc3BoaW54KQogICAjOnVz ZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBzcWxpdGUpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2th Z2VzIHRscykKKyAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgd2ViKQogICAjOnVzZS1tb2R1 bGUgKGdudSBwYWNrYWdlcyB4b3JnKQogICAjOnVzZS1tb2R1bGUgKChndWl4IGxpY2Vuc2VzKSAj OnByZWZpeCBsaWNlbnNlOikKICAgIzp1c2UtbW9kdWxlIChndWl4IHBhY2thZ2VzKQpAQCAtNjEs MzcgKzYyLDQ4IEBACiAgICAgICAgIChiYXNlMzIgIjBjbWpkaXNtZHN4OWE1bDd6eDU0emtkMzNt Z2czbXg0Y2twdmM3YWFwM3g2YTFkZG16MmkiKSkpKQogICAgIChidWlsZC1zeXN0ZW0gbWVzb24t YnVpbGQtc3lzdGVtKQogICAgIChhcmd1bWVudHMKLSAgICAgYCgjOnBoYXNlcyAobW9kaWZ5LXBo YXNlcyAlc3RhbmRhcmQtcGhhc2VzCi0gICAgICAgICAgICAgICAgICAoYWRkLWJlZm9yZSAnY2hl Y2sgJ3N0YXJ0LXhzZXJ2ZXIKLSAgICAgICAgICAgICAgICAgICAgOzsgVGVzdHMgcmVxdWlyZSBh IHJ1bm5pbmcgWCBzZXJ2ZXIuCi0gICAgICAgICAgICAgICAgICAgIChsYW1iZGEqICgjOmtleSBp bnB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQotICAgICAgICAgICAgICAgICAgICAgIChsZXQgKCh4 b3JnLXNlcnZlciAoYXNzb2MtcmVmIGlucHV0cyAieG9yZy1zZXJ2ZXIiKSkKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAoZGlzcGxheSAiOjEiKSkKLSAgICAgICAgICAgICAgICAgICAgICAg IChzZXRlbnYgIkRJU1BMQVkiIGRpc3BsYXkpCi0KLSAgICAgICAgICAgICAgICAgICAgICAgIDs7 IE9uIGJ1c3kgbWFjaGluZXMsIHRlc3RzIG1heSB0YWtlIGxvbmdlciB0aGFuCi0gICAgICAgICAg ICAgICAgICAgICAgICA7OyB0aGUgZGVmYXVsdCBvZiBmb3VyIHNlY29uZHMuCi0gICAgICAgICAg ICAgICAgICAgICAgICAoc2V0ZW52ICJDS19ERUZBVUxUX1RJTUVPVVQiICIyMCIpCi0KLSAgICAg ICAgICAgICAgICAgICAgICAgIDs7IERvbid0IGZhaWwgZHVlIHRvIG1pc3NpbmcgJy9ldGMvbWFj aGluZS1pZCcuCi0gICAgICAgICAgICAgICAgICAgICAgICAoc2V0ZW52ICJEQlVTX0ZBVEFMX1dB Uk5JTkdTIiAiMCIpCi0gICAgICAgICAgICAgICAgICAgICAgICAoemVybz8gKHN5c3RlbSAoc3Ry aW5nLWFwcGVuZCB4b3JnLXNlcnZlciAiL2Jpbi9YdmZiICIKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRpc3BsYXkgIiAmIikpKSkpKSkpKQot ICAgIChuYXRpdmUtaW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykKLSAgICAgICAg ICAgICAgICAgICAgICgiY2hlY2siICxjaGVjaykKLSAgICAgICAgICAgICAgICAgICAgICgiZ2V0 dGV4dCIgLGdldHRleHQtbWluaW1hbCkKLSAgICAgICAgICAgICAgICAgICAgICgiZ2xpYjpiaW4i ICxnbGliICJiaW4iKQotICAgICAgICAgICAgICAgICAgICAgKCJ4b3JnLXNlcnZlciIgLHhvcmct c2VydmVyLWZvci10ZXN0cykpKQotICAgIDs7IExpc3RlZCBpbiAnUmVxdWlyZXMucHJpdmF0ZScg b2YgJ2dpcmFyYS5wYycuCi0gICAgKHByb3BhZ2F0ZWQtaW5wdXRzIGAoKCJndGsrIiAsZ3RrKykp KQotICAgIChzeW5vcHNpcyAiTGlicmFyeSBmb3IgbWluaW1hbGlzdGljIGd0ayszIHVzZXIgaW50 ZXJmYWNlcyIpCisgICAgIGAoIzpnbGliLW9yLWd0az8gI3QgICAgICAgICAgICAgICAgOyBUbyBj b21waWxlIHNjaGVtYXMKKyAgICAgICAjOmNvbmZpZ3VyZS1mbGFncworICAgICAgIChsaXN0Cisg ICAgICAgICItRG5vdGlmeT1lbmFibGVkIikgICAgICAgICAgICAgOyBGb3Igbm90aWZpY2F0aW9u IHN1cHBvcnQKKyAgICAgICAjOnBoYXNlcworICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFy ZC1waGFzZXMKKyAgICAgICAgIChhZGQtYmVmb3JlICdjaGVjayAnc3RhcnQteHNlcnZlcgorICAg ICAgICAgICA7OyBUZXN0cyByZXF1aXJlIGEgcnVubmluZyBYIHNlcnZlci4KKyAgICAgICAgICAg KGxhbWJkYSogKCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAgICAgICAg KGxldAorICAgICAgICAgICAgICAgICAoKHhvcmctc2VydmVyIChhc3NvYy1yZWYgaW5wdXRzICJ4 b3JnLXNlcnZlciIpKQorICAgICAgICAgICAgICAgICAgKGRpc3BsYXkgIjoxIikpCisgICAgICAg ICAgICAgICAoc2V0ZW52ICJESVNQTEFZIiBkaXNwbGF5KQorICAgICAgICAgICAgICAgOzsgT24g YnVzeSBtYWNoaW5lcywgdGVzdHMgbWF5IHRha2UgbG9uZ2VyIHRoYW4KKyAgICAgICAgICAgICAg IDs7IHRoZSBkZWZhdWx0IG9mIGZvdXIgc2Vjb25kcy4KKyAgICAgICAgICAgICAgIChzZXRlbnYg IkNLX0RFRkFVTFRfVElNRU9VVCIgIjIwIikKKyAgICAgICAgICAgICAgIDs7IERvbid0IGZhaWwg ZHVlIHRvIG1pc3NpbmcgJy9ldGMvbWFjaGluZS1pZCcuCisgICAgICAgICAgICAgICAoc2V0ZW52 ICJEQlVTX0ZBVEFMX1dBUk5JTkdTIiAiMCIpCisgICAgICAgICAgICAgICAoemVybz8KKyAgICAg ICAgICAgICAgICAoc3lzdGVtCisgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIHhvcmct c2VydmVyICIvYmluL1h2ZmIgIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXNw bGF5ICIgJiIpKSkpKSkpKSkKKyAgICAobmF0aXZlLWlucHV0cworICAgICBgKCgiY2hlY2siICxj aGVjaykgICAgICAgICAgICAgICAgIDsgRm9yIHRlc3RzCisgICAgICAgKCJkb3h5Z2VuIiAsZG94 eWdlbikgICAgICAgICAgICAgOyBGb3IgZG9jcworICAgICAgICgiZ2V0dGV4dCIgLGdldHRleHQt bWluaW1hbCkKKyAgICAgICAoImdsaWI6YmluIiAsZ2xpYiAiYmluIikKKyAgICAgICAoInBrZy1j b25maWciICxwa2ctY29uZmlnKQorICAgICAgICgieG9yZy1zZXJ2ZXIiICx4b3JnLXNlcnZlci1m b3ItdGVzdHMpKSkgOyBGb3IgdGVzdHMKKyAgICAoaW5wdXRzCisgICAgIGAoKCJnbGliIiAsZ2xp YikKKyAgICAgICAoImd0aysiICxndGsrKQorICAgICAgICgianNvbi1jIiAsanNvbi1jKSAgICAg ICAgICA7IEZvciBjb25maWd1cmF0aW9uIGR1bXBpbmcgc3VwcG9ydAorICAgICAgICgibGlibm90 aWZ5IiAsbGlibm90aWZ5KSAgICA7IEZvciBub3RpZmljYXRpb24gc3VwcG9ydAorICAgICAgICgi cGFuZ28iICxwYW5nbykpKQorICAgIChzeW5vcHNpcyAiVXNlciBpbnRlcmZhY2UgbGlicmFyeSIp CiAgICAgKGRlc2NyaXB0aW9uICJHaXJhcmEgaXMgYSBsaWJyYXJ5IHRoYXQgaW1wbGVtZW50cyBh IHVzZXIgaW50ZXJmYWNlIHRoYXQKLWZvY3VzZXMgb24gc2ltcGxpY2l0eSBhbmQgbWluaW1hbGlz bS4gIEN1cnJlbnRseSBiYXNlZCBvbiBHVEsrLCBhCi1jcm9zcy1wbGF0Zm9ybSB3aWRnZXQgdG9v bGtpdCwgaXQgcHJvdmlkZXMgYW4gaW50ZXJmYWNlIHRoYXQgZm9jdXNlcyBvbiB0aHJlZQotbWFp biBjb21wb25lbnRzOiBhIHNvLWNhbGxlZCB2aWV3IHdpZGdldCB0aGF0IHJlcHJlc2VudHMgdGhl IGFjdHVhbAotYXBwbGljYXRpb24sIGFuIGlucHV0IGJhciB0aGF0IGlzIHVzZWQgdG8gZXhlY3V0 ZSBjb21tYW5kcyBvZiB0aGUKLWFwcGxpY2F0aW9uIGFuZCB0aGUgc3RhdHVzIGJhciB3aGljaCBw cm92aWRlcyB0aGUgdXNlciB3aXRoIGN1cnJlbnQKLWluZm9ybWF0aW9uLiIpCitmb2N1c2VzIG9u IHNpbXBsaWNpdHkgYW5kIG1pbmltYWxpc20uICBDdXJyZW50bHkgYmFzZWQgb24gR1RLKywgYSBj cm9zcy1wbGF0Zm9ybQord2lkZ2V0IHRvb2xraXQsIGl0IHByb3ZpZGVzIGFuIGludGVyZmFjZSB0 aGF0IGZvY3VzZXMgb24gdGhyZWUgbWFpbiBjb21wb25lbnRzOgorQSBzby1jYWxsZWQgdmlldyB3 aWRnZXQgdGhhdCByZXByZXNlbnRzIHRoZSBhY3R1YWwgYXBwbGljYXRpb24sIGFuIGlucHV0IGJh cgordGhhdCBpcyB1c2VkIHRvIGV4ZWN1dGUgY29tbWFuZHMgb2YgdGhlIGFwcGxpY2F0aW9uIGFu ZCB0aGUgc3RhdHVzIGJhciB3aGljaAorcHJvdmlkZXMgdGhlIHVzZXIgd2l0aCBjdXJyZW50IGlu Zm9ybWF0aW9uLiIpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy9n aXJhcmEvIikKICAgICAobGljZW5zZSBsaWNlbnNlOnpsaWIpKSkKIAotLSAKMi4yNi4yCgo= --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0011-gnu-zathura-Rearrange-elements-of-package-definition.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0011-gnu-zathura-Rearrange-elements-of-package-definition.patch RnJvbSBkMWQ5YTU4ZDhlZTM2Y2JkMmZlMWE5YmI0NmRiOGI2YWYwYWE0ZTU0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMjowNDoxMyAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTEvMjJdIGdudTogemF0aHVyYTogUmVhcnJhbmdlIGVsZW1lbnRzIG9mIHBhY2thZ2Ug ZGVmaW5pdGlvbi4KCiogZ251L3BhY2thZ2VzL3B3bXQuc2NtICh6YXRodXJhKTogUmVvcmRlciBm aWVsZHMuCi0tLQogZ251L3BhY2thZ2VzL3B3bXQuc2NtIHwgMzggKysrKysrKysrKysrKysrKysr Ky0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCAx OSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcHdtdC5zY20gYi9nbnUv cGFja2FnZXMvcHdtdC5zY20KaW5kZXggOTAwODI2MzY1Zi4uMWUwMWQwMDk2NSAxMDA2NDQKLS0t IGEvZ251L3BhY2thZ2VzL3B3bXQuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9wd210LnNjbQpAQCAt MTE5LDYgKzExOSwyNCBAQCBwcm92aWRlcyB0aGUgdXNlciB3aXRoIGN1cnJlbnQgaW5mb3JtYXRp b24uIikKICAgICAgICAgICAgICAgKHNoYTI1NgogICAgICAgICAgICAgICAgKGJhc2UzMgogICAg ICAgICAgICAgICAgICIwYjNucmN2eWtrcHYydm05OWtpam5pYzJncGZ6dmE1MjBic2psaWhheGFu ZHpmbTlmZjhjIikpKSkKKyAgICAoYnVpbGQtc3lzdGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkKKyAg ICAoYXJndW1lbnRzCisgICAgIGAoIzpwaGFzZXMgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBo YXNlcworICAgICAgICAgICAgICAgICAgKGFkZC1iZWZvcmUgJ2NoZWNrICdzdGFydC14c2VydmVy CisgICAgICAgICAgICAgICAgICAgIDs7IFRlc3RzIHJlcXVpcmUgYSBydW5uaW5nIFggc2VydmVy LgorICAgICAgICAgICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzICM6YWxsb3ctb3Ro ZXIta2V5cykKKyAgICAgICAgICAgICAgICAgICAgICAobGV0ICgoeG9yZy1zZXJ2ZXIgKGFzc29j LXJlZiBpbnB1dHMgInhvcmctc2VydmVyIikpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg KGRpc3BsYXkgIjoxIikpCisgICAgICAgICAgICAgICAgICAgICAgICAoc2V0ZW52ICJESVNQTEFZ IiBkaXNwbGF5KQorCisgICAgICAgICAgICAgICAgICAgICAgICA7OyBPbiBidXN5IG1hY2hpbmVz LCB0ZXN0cyBtYXkgdGFrZSBsb25nZXIgdGhhbgorICAgICAgICAgICAgICAgICAgICAgICAgOzsg dGhlIGRlZmF1bHQgb2YgZm91ciBzZWNvbmRzLgorICAgICAgICAgICAgICAgICAgICAgICAgKHNl dGVudiAiQ0tfREVGQVVMVF9USU1FT1VUIiAiMjAiKQorCisgICAgICAgICAgICAgICAgICAgICAg ICA7OyBEb24ndCBmYWlsIGR1ZSB0byBtaXNzaW5nICcvZXRjL21hY2hpbmUtaWQnLgorICAgICAg ICAgICAgICAgICAgICAgICAgKHNldGVudiAiREJVU19GQVRBTF9XQVJOSU5HUyIgIjAiKQorICAg ICAgICAgICAgICAgICAgICAgICAgKHplcm8/IChzeXN0ZW0gKHN0cmluZy1hcHBlbmQgeG9yZy1z ZXJ2ZXIgIi9iaW4vWHZmYiAiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkaXNwbGF5ICIgJiIpKSkpKSkpKSkKICAgICAobmF0aXZlLWlucHV0 cyBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpCiAgICAgICAgICAgICAgICAgICAgICAoImdl dHRleHQiICxnZXR0ZXh0LW1pbmltYWwpCiAgICAgICAgICAgICAgICAgICAgICAoImdsaWI6Ymlu IiAsZ2xpYiAiYmluIikKQEAgLTE0MCwyOSArMTU4LDExIEBAIHByb3ZpZGVzIHRoZSB1c2VyIHdp dGggY3VycmVudCBpbmZvcm1hdGlvbi4iKQogICAgICAobGlzdCAoc2VhcmNoLXBhdGgtc3BlY2lm aWNhdGlvbgogICAgICAgICAgICAgKHZhcmlhYmxlICJaQVRIVVJBX1BMVUdJTlNfUEFUSCIpCiAg ICAgICAgICAgICAoZmlsZXMgJygibGliL3phdGh1cmEiKSkpKSkKLSAgICAoYnVpbGQtc3lzdGVt IG1lc29uLWJ1aWxkLXN5c3RlbSkKLSAgICAoYXJndW1lbnRzCi0gICAgIGAoIzpwaGFzZXMgKG1v ZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwotICAgICAgICAgICAgICAgICAgKGFkZC1iZWZv cmUgJ2NoZWNrICdzdGFydC14c2VydmVyCi0gICAgICAgICAgICAgICAgICAgIDs7IFRlc3RzIHJl cXVpcmUgYSBydW5uaW5nIFggc2VydmVyLgotICAgICAgICAgICAgICAgICAgICAobGFtYmRhKiAo IzprZXkgaW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAgICAgICAgICAgICAgICAo bGV0ICgoeG9yZy1zZXJ2ZXIgKGFzc29jLXJlZiBpbnB1dHMgInhvcmctc2VydmVyIikpCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgKGRpc3BsYXkgIjoxIikpCi0gICAgICAgICAgICAgICAg ICAgICAgICAoc2V0ZW52ICJESVNQTEFZIiBkaXNwbGF5KQotCi0gICAgICAgICAgICAgICAgICAg ICAgICA7OyBPbiBidXN5IG1hY2hpbmVzLCB0ZXN0cyBtYXkgdGFrZSBsb25nZXIgdGhhbgotICAg ICAgICAgICAgICAgICAgICAgICAgOzsgdGhlIGRlZmF1bHQgb2YgZm91ciBzZWNvbmRzLgotICAg ICAgICAgICAgICAgICAgICAgICAgKHNldGVudiAiQ0tfREVGQVVMVF9USU1FT1VUIiAiMjAiKQot Ci0gICAgICAgICAgICAgICAgICAgICAgICA7OyBEb24ndCBmYWlsIGR1ZSB0byBtaXNzaW5nICcv ZXRjL21hY2hpbmUtaWQnLgotICAgICAgICAgICAgICAgICAgICAgICAgKHNldGVudiAiREJVU19G QVRBTF9XQVJOSU5HUyIgIjAiKQotICAgICAgICAgICAgICAgICAgICAgICAgKHplcm8/IChzeXN0 ZW0gKHN0cmluZy1hcHBlbmQgeG9yZy1zZXJ2ZXIgIi9iaW4vWHZmYiAiCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXNwbGF5ICIgJiIpKSkp KSkpKSkKLSAgICAoaG9tZS1wYWdlICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEv IikKICAgICAoc3lub3BzaXMgIkxpZ2h0d2VpZ2h0IGtleWJvYXJkLWRyaXZlbiBQREYgdmlld2Vy IikKICAgICAoZGVzY3JpcHRpb24gIlphdGh1cmEgaXMgYSBjdXN0b21pemFibGUgZG9jdW1lbnQg dmlld2VyLiAgSXQgcHJvdmlkZXMgYQogbWluaW1hbGlzdGljIGludGVyZmFjZSBhbmQgYW4gaW50 ZXJmYWNlIHRoYXQgbWFpbmx5IGZvY3VzZXMgb24ga2V5Ym9hcmQKIGludGVyYWN0aW9uLiIpCisg ICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy96YXRodXJhLyIpCiAgICAg KGxpY2Vuc2UgbGljZW5zZTp6bGliKSkpCiAKIChkZWZpbmUtcHVibGljIHphdGh1cmEtcHMKLS0g CjIuMjYuMgoK --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0012-gnu-zathura-Update-package-definition.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0012-gnu-zathura-Update-package-definition.patch RnJvbSBjMmU4YTIyZDUyNDEwODA2NTAyY2E1MzM4MjVkYTkwYWVmMmVkODNjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMjoyMToyNSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTIvMjJdIGdudTogemF0aHVyYTogVXBkYXRlIHBhY2thZ2UgZGVmaW5pdGlvbi4KCiog Z251L3BhY2thZ2VzL3B3bXQuc2NtICh6YXRodXJhKTogTWFrZSBjaGFuZ2VzIHRvIHJlZmxlY3Qg cGFydGljdWxhcnMKb2YgcmVjZW50IHNvdXJjZSBjb2RlLgpbYXJndW1lbnRzXTogQWRkIGdsaWIt b3ItZ3RrIG9wdGlvbi4KW25hdGl2ZS1pbnB1dHNdOiBBZGQgZGVza3RvcC1maWxldXRpbHMsIGRv eHlnZW4sIHB5dGhvbi1icmVhdGhlIGFuZApweXRob24tc3BoaW54LXJ0ZC10aGVtZS4KW2lucHV0 c106IEFkZCBhcHBzdHJlYW0tZ2xpYiwgZmlsZSwgZ2xpYiwganNvbi1jLCBndGsrLCBsaWJub3Rp ZnkgYW5kCmxpYnNlY2NvbXAuCltwcm9wYWdhdGVkLWlucHV0c106IE1vdmUgY2Fpcm8gYW5kIGdp cmFyYSB0byBpbnB1dHMuCltzeW5vcHNpc106IFVwZGF0ZWQuCltkZXNjcmlwdGlvbl06IFVwZGF0 ZWQuCi0tLQogZ251L3BhY2thZ2VzL3B3bXQuc2NtIHwgMTExICsrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYzIGluc2VydGlvbnMoKyks IDQ4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wd210LnNjbSBiL2du dS9wYWNrYWdlcy9wd210LnNjbQppbmRleCAxZTAxZDAwOTY1Li5mNjhiYWFjMDgzIDEwMDY0NAot LS0gYS9nbnUvcGFja2FnZXMvcHdtdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL3B3bXQuc2NtCkBA IC0yOCw2ICsyOCw4IEBACiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGNoZWNrKQogICAj OnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBkanZ1KQogICAjOnVzZS1tb2R1bGUgKGdudSBwYWNr YWdlcyBkb2N1bWVudGF0aW9uKQorICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBmaWxlKQor ICAjOnVzZS1tb2R1bGUgKGdudSBwYWNrYWdlcyBmcmVlZGVza3RvcCkKICAgIzp1c2UtbW9kdWxl IChnbnUgcGFja2FnZXMgZ2V0dGV4dCkKICAgIzp1c2UtbW9kdWxlIChnbnUgcGFja2FnZXMgZ2hv c3RzY3JpcHQpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGdsaWIpCkBAIC0zNSw2ICsz Nyw3IEBACiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGd0aykKICAgIzp1c2UtbW9kdWxl IChnbnUgcGFja2FnZXMgaW1hZ2UpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGphdmFz Y3JpcHQpCisgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIGxpbnV4KQogICAjOnVzZS1tb2R1 bGUgKGdudSBwYWNrYWdlcyBwZGYpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHBrZy1j b25maWcpCiAgICM6dXNlLW1vZHVsZSAoZ251IHBhY2thZ2VzIHNwaGlueCkKQEAgLTExMSw1NyAr MTE0LDY5IEBAIHByb3ZpZGVzIHRoZSB1c2VyIHdpdGggY3VycmVudCBpbmZvcm1hdGlvbi4iKQog ICAocGFja2FnZQogICAgIChuYW1lICJ6YXRodXJhIikKICAgICAodmVyc2lvbiAiMC40LjUiKQot ICAgIChzb3VyY2UgKG9yaWdpbgotICAgICAgICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkKLSAg ICAgICAgICAgICAgKHVyaQotICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgImh0dHBzOi8v cHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS9kb3dubG9hZC96YXRodXJhLSIKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi50YXIueHoiKSkKLSAgICAgICAgICAgICAgKHNo YTI1NgotICAgICAgICAgICAgICAgKGJhc2UzMgotICAgICAgICAgICAgICAgICIwYjNucmN2eWtr cHYydm05OWtpam5pYzJncGZ6dmE1MjBic2psaWhheGFuZHpmbTlmZjhjIikpKSkKKyAgICAoc291 cmNlCisgICAgIChvcmlnaW4KKyAgICAgICAobWV0aG9kIHVybC1mZXRjaCkKKyAgICAgICAodXJp CisgICAgICAgIChzdHJpbmctYXBwZW5kICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1 cmEvZG93bmxvYWQvemF0aHVyYS0iCisgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi50 YXIueHoiKSkKKyAgICAgICAoc2hhMjU2CisgICAgICAgIChiYXNlMzIKKyAgICAgICAgICIwYjNu cmN2eWtrcHYydm05OWtpam5pYzJncGZ6dmE1MjBic2psaWhheGFuZHpmbTlmZjhjIikpKSkKICAg ICAoYnVpbGQtc3lzdGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkKICAgICAoYXJndW1lbnRzCi0gICAg IGAoIzpwaGFzZXMgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwotICAgICAgICAgICAg ICAgICAgKGFkZC1iZWZvcmUgJ2NoZWNrICdzdGFydC14c2VydmVyCi0gICAgICAgICAgICAgICAg ICAgIDs7IFRlc3RzIHJlcXVpcmUgYSBydW5uaW5nIFggc2VydmVyLgotICAgICAgICAgICAgICAg ICAgICAobGFtYmRhKiAoIzprZXkgaW5wdXRzICM6YWxsb3ctb3RoZXIta2V5cykKLSAgICAgICAg ICAgICAgICAgICAgICAobGV0ICgoeG9yZy1zZXJ2ZXIgKGFzc29jLXJlZiBpbnB1dHMgInhvcmct c2VydmVyIikpCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgKGRpc3BsYXkgIjoxIikpCi0g ICAgICAgICAgICAgICAgICAgICAgICAoc2V0ZW52ICJESVNQTEFZIiBkaXNwbGF5KQotCi0gICAg ICAgICAgICAgICAgICAgICAgICA7OyBPbiBidXN5IG1hY2hpbmVzLCB0ZXN0cyBtYXkgdGFrZSBs b25nZXIgdGhhbgotICAgICAgICAgICAgICAgICAgICAgICAgOzsgdGhlIGRlZmF1bHQgb2YgZm91 ciBzZWNvbmRzLgotICAgICAgICAgICAgICAgICAgICAgICAgKHNldGVudiAiQ0tfREVGQVVMVF9U SU1FT1VUIiAiMjAiKQotCi0gICAgICAgICAgICAgICAgICAgICAgICA7OyBEb24ndCBmYWlsIGR1 ZSB0byBtaXNzaW5nICcvZXRjL21hY2hpbmUtaWQnLgotICAgICAgICAgICAgICAgICAgICAgICAg KHNldGVudiAiREJVU19GQVRBTF9XQVJOSU5HUyIgIjAiKQotICAgICAgICAgICAgICAgICAgICAg ICAgKHplcm8/IChzeXN0ZW0gKHN0cmluZy1hcHBlbmQgeG9yZy1zZXJ2ZXIgIi9iaW4vWHZmYiAi Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBk aXNwbGF5ICIgJiIpKSkpKSkpKSkKLSAgICAobmF0aXZlLWlucHV0cyBgKCgicGtnLWNvbmZpZyIg LHBrZy1jb25maWcpCi0gICAgICAgICAgICAgICAgICAgICAoImdldHRleHQiICxnZXR0ZXh0LW1p bmltYWwpCi0gICAgICAgICAgICAgICAgICAgICAoImdsaWI6YmluIiAsZ2xpYiAiYmluIikKLQot ICAgICAgICAgICAgICAgICAgICAgOzsgRm9yIGJ1aWxkaW5nIGRvY3VtZW50YXRpb24uCi0gICAg ICAgICAgICAgICAgICAgICAoInB5dGhvbi1zcGhpbngiICxweXRob24tc3BoaW54KQotCi0gICAg ICAgICAgICAgICAgICAgICA7OyBGb3IgYnVpbGRpbmcgaWNvbnMuCi0gICAgICAgICAgICAgICAg ICAgICAoImxpYnJzdmciICxsaWJyc3ZnKQotCi0gICAgICAgICAgICAgICAgICAgICA7OyBGb3Ig dGVzdHMuCi0gICAgICAgICAgICAgICAgICAgICAoImNoZWNrIiAsY2hlY2spCi0gICAgICAgICAg ICAgICAgICAgICAoInhvcmctc2VydmVyIiAseG9yZy1zZXJ2ZXItZm9yLXRlc3RzKSkpCi0gICAg KGlucHV0cyBgKCgic3FsaXRlIiAsc3FsaXRlKSkpCi0gICAgOzsgTGlzdGVkIGluICdSZXF1aXJl cy5wcml2YXRlJyBvZiAnemF0aHVyYS5wYycuCi0gICAgKHByb3BhZ2F0ZWQtaW5wdXRzIGAoKCJj YWlybyIgLGNhaXJvKQotICAgICAgICAgICAgICAgICAgICAgICAgICgiZ2lyYXJhIiAsZ2lyYXJh KSkpCisgICAgIGAoIzpnbGliLW9yLWd0az8gI3QgICAgICAgICAgICAgICAgOyBUbyBjb21waWxl IHNjaGVtYXMKKyAgICAgICAjOnBoYXNlcworICAgICAgIChtb2RpZnktcGhhc2VzICVzdGFuZGFy ZC1waGFzZXMKKyAgICAgICAgIChhZGQtYmVmb3JlICdjaGVjayAnc3RhcnQteHNlcnZlcgorICAg ICAgICAgICA7OyBUZXN0cyByZXF1aXJlIGEgcnVubmluZyBYIHNlcnZlci4KKyAgICAgICAgICAg KGxhbWJkYSogKCM6a2V5IGlucHV0cyAjOmFsbG93LW90aGVyLWtleXMpCisgICAgICAgICAgICAg KGxldAorICAgICAgICAgICAgICAgICAoKHhvcmctc2VydmVyIChhc3NvYy1yZWYgaW5wdXRzICJ4 b3JnLXNlcnZlciIpKQorICAgICAgICAgICAgICAgICAgKGRpc3BsYXkgIjoxIikpCisgICAgICAg ICAgICAgICAoc2V0ZW52ICJESVNQTEFZIiBkaXNwbGF5KQorICAgICAgICAgICAgICAgOzsgT24g YnVzeSBtYWNoaW5lcywgdGVzdHMgbWF5IHRha2UgbG9uZ2VyIHRoYW4KKyAgICAgICAgICAgICAg IDs7IHRoZSBkZWZhdWx0IG9mIGZvdXIgc2Vjb25kcy4KKyAgICAgICAgICAgICAgIChzZXRlbnYg IkNLX0RFRkFVTFRfVElNRU9VVCIgIjIwIikKKyAgICAgICAgICAgICAgIDs7IERvbid0IGZhaWwg ZHVlIHRvIG1pc3NpbmcgJy9ldGMvbWFjaGluZS1pZCcuCisgICAgICAgICAgICAgICAoc2V0ZW52 ICJEQlVTX0ZBVEFMX1dBUk5JTkdTIiAiMCIpCisgICAgICAgICAgICAgICAoemVybz8KKyAgICAg ICAgICAgICAgICAoc3lzdGVtCisgICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIHhvcmct c2VydmVyICIvYmluL1h2ZmIgIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaXNw bGF5ICIgJiIpKSkpKSkpKSkKKyAgICAobmF0aXZlLWlucHV0cworICAgICBgKCgiY2hlY2siICxj aGVjaykgICAgICAgICAgICAgICAgIDsgRm9yIHRlc3RzCisgICAgICAgKCJkZXNrdG9wLWZpbGUt dXRpbHMiICxkZXNrdG9wLWZpbGUtdXRpbHMpCisgICAgICAgKCJkb3h5Z2VuIiAsZG94eWdlbikg ICAgICAgICAgICAgOyBGb3IgZG9jcworICAgICAgICgiZ2V0dGV4dCIgLGdldHRleHQtbWluaW1h bCkKKyAgICAgICAoImdsaWI6YmluIiAsZ2xpYiAiYmluIikKKyAgICAgICAoImxpYnJzdmciICxs aWJyc3ZnKSAgICAgICAgICAgICA7IEZvciBpY29ucworICAgICAgICgicGtnLWNvbmZpZyIgLHBr Zy1jb25maWcpCisgICAgICAgKCJweXRob24tYnJlYXRoZSIgLHB5dGhvbi1icmVhdGhlKSAgICAg ICAgICAgICAgICAgICA7IEZvciBkb2NzCisgICAgICAgKCJweXRob24tc3BoaW54LXJ0ZC10aGVt ZSIgLHB5dGhvbi1zcGhpbngtcnRkLXRoZW1lKSA7IEZvciBkb2NzCisgICAgICAgKCJweXRob24t c3BoaW54IiAscHl0aG9uLXNwaGlueCkgICAgICAgICAgICAgICAgICAgICA7IEZvciBkb2NzCisg ICAgICAgKCJ4b3JnLXNlcnZlciIgLHhvcmctc2VydmVyLWZvci10ZXN0cykpKSA7IEZvciB0ZXN0 cworICAgIChpbnB1dHMKKyAgICAgYCgoImFwcHN0cmVhbS1nbGliIiAsYXBwc3RyZWFtLWdsaWIp CisgICAgICAgKCJjYWlybyIgLGNhaXJvKQorICAgICAgICgiZmlsZSIgLGZpbGUpICAgICAgICAg ICAgICAgICAgIDsgRm9yIG1pbWUtdHlwZSBkZXRlY3Rpb24KKyAgICAgICAoImdpcmFyYSIgLGdp cmFyYSkKKyAgICAgICAoImdsaWIiICxnbGliKQorICAgICAgICgianNvbi1jIiAsanNvbi1jKSAg ICAgICAgICA7IEZvciBjb25maWd1cmF0aW9uIGR1bXBpbmcgc3VwcG9ydAorICAgICAgICgiZ3Rr KyIgLGd0ayspCisgICAgICAgKCJsaWJub3RpZnkiICxsaWJub3RpZnkpICAgICAgICAgOyBGb3Ig bm90aWZpY2F0aW9uIHN1cHBvcnQKKyAgICAgICAoImxpYnNlY2NvbXAiICxsaWJzZWNjb21wKSAg ICAgICA7IEZvciBzYW5kYm94IHN1cHBvcnQKKyAgICAgICAoInNxbGl0ZSIgLHNxbGl0ZSkpKSAg ICAgICAgICAgICA7IEZvciBkYXRhYmFzZSBiYWNrZW5kCiAgICAgKG5hdGl2ZS1zZWFyY2gtcGF0 aHMKLSAgICAgKGxpc3QgKHNlYXJjaC1wYXRoLXNwZWNpZmljYXRpb24KLSAgICAgICAgICAgICh2 YXJpYWJsZSAiWkFUSFVSQV9QTFVHSU5TX1BBVEgiKQotICAgICAgICAgICAgKGZpbGVzICcoImxp Yi96YXRodXJhIikpKSkpCi0gICAgKHN5bm9wc2lzICJMaWdodHdlaWdodCBrZXlib2FyZC1kcml2 ZW4gUERGIHZpZXdlciIpCi0gICAgKGRlc2NyaXB0aW9uICJaYXRodXJhIGlzIGEgY3VzdG9taXph YmxlIGRvY3VtZW50IHZpZXdlci4gIEl0IHByb3ZpZGVzIGEKLW1pbmltYWxpc3RpYyBpbnRlcmZh Y2UgYW5kIGFuIGludGVyZmFjZSB0aGF0IG1haW5seSBmb2N1c2VzIG9uIGtleWJvYXJkCi1pbnRl cmFjdGlvbi4iKQorICAgICAobGlzdAorICAgICAgKHNlYXJjaC1wYXRoLXNwZWNpZmljYXRpb24K KyAgICAgICAodmFyaWFibGUgIlpBVEhVUkFfUExVR0lOU19QQVRIIikKKyAgICAgICAoZmlsZXMg JygibGliL3phdGh1cmEiKSkpKSkKKyAgICAoc3lub3BzaXMgIkRvY3VtZW50IFZpZXdlciIpCisg ICAgKGRlc2NyaXB0aW9uICJaYXRodXJhIGlzIGEgaGlnaGx5IGN1c3RvbWl6YWJsZSBhbmQgZnVu Y3Rpb25hbCBkb2N1bWVudAordmlld2VyIGJhc2VkIG9uIHRoZSBnaXJhcmEgdXNlciBpbnRlcmZh Y2UgbGlicmFyeSBhbmQgc2V2ZXJhbCBkb2N1bWVudAorbGlicmFyaWVzLiAgSXQgY3VycmVudGx5 IHN1cHBvcnRzIG11bHRpcGxlIGJhY2stZW5kcyAoUG9zdFNjcmlwdCwgUERGLCBFUFVCLAorRGpW dSBhbmQgQ29taWNCb29rKSB2aWEgcGx1Z2lucy4iKQogICAgIChob21lLXBhZ2UgImh0dHBzOi8v cHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS8iKQogICAgIChsaWNlbnNlIGxpY2Vuc2U6emxpYikp KQogCi0tIAoyLjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0013-gnu-zathura-ps-Rearrange-elements-of-package-definit.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0013-gnu-zathura-ps-Rearrange-elements-of-package-definit.patch RnJvbSAwMmU4ODMzNDhhMzA0ZjBmZDc0MGJmYjkyNmY4M2VlMDUwNDFlYWIzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMjozMzowNSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTMvMjJdIGdudTogemF0aHVyYS1wczogUmVhcnJhbmdlIGVsZW1lbnRzIG9mIHBhY2th Z2UKIGRlZmluaXRpb24uCgoqIGdudS9wYWNrYWdlcy9wd210LnNjbSAoemF0aHVyYS1wcyk6IFJl b3JkZXIgZmllbGRzLgotLS0KIGdudS9wYWNrYWdlcy9wd210LnNjbSB8IDggKysrKy0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCA0IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvZ251L3BhY2thZ2VzL3B3bXQuc2NtIGIvZ251L3BhY2thZ2VzL3B3bXQuc2NtCmluZGV4IGY2 OGJhYWMwODMuLjQ1NDgxYWQ1M2MgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9wd210LnNjbQor KysgYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KQEAgLTE5Miw5ICsxOTIsNiBAQCBEalZ1IGFuZCBD b21pY0Jvb2spIHZpYSBwbHVnaW5zLiIpCiAgICAgICAgICAgICAgIChzaGEyNTYKICAgICAgICAg ICAgICAgIChiYXNlMzIKICAgICAgICAgICAgICAgICAiMHd5Z3E4OW55anJqbnNxN3ZicGlkcWRz aXJqbTZpcTR3MnJpanp3cGsyZjgzeXM4YmMzeSIpKSkpCi0gICAgKG5hdGl2ZS1pbnB1dHMgYCgo InBrZy1jb25maWciICxwa2ctY29uZmlnKSkpCi0gICAgKGlucHV0cyBgKCgibGlic3BlY3RyZSIg LGxpYnNwZWN0cmUpCi0gICAgICAgICAgICAgICgiemF0aHVyYSIgLHphdGh1cmEpKSkKICAgICAo YnVpbGQtc3lzdGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkKICAgICAoYXJndW1lbnRzCiAgICAgIGAo Izp0ZXN0cz8gI2YgICAgICAgICAgICAgICAgICAgICAgOyBwYWNrYWdlIGRvZXMgbm90IGNvbnRh aW4gdGVzdHMKQEAgLTIwOSwxMCArMjA2LDEzIEBAIERqVnUgYW5kIENvbWljQm9vaykgdmlhIHBs dWdpbnMuIikKICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBrZXkKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiJyIgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSAiL2xpYi96 YXRodXJhJ1xuIikpKQogICAgICAgICAgICAgICN0KSkpKSkKLSAgICAoaG9tZS1wYWdlICJodHRw czovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtcHMvIikKKyAgICAobmF0aXZlLWlucHV0cyBg KCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpKSkKKyAgICAoaW5wdXRzIGAoKCJsaWJzcGVjdHJl IiAsbGlic3BlY3RyZSkKKyAgICAgICAgICAgICAgKCJ6YXRodXJhIiAsemF0aHVyYSkpKQogICAg IChzeW5vcHNpcyAiUFMgc3VwcG9ydCBmb3IgemF0aHVyYSAobGlic3BlY3RyZSBiYWNrZW5kKSIp CiAgICAgKGRlc2NyaXB0aW9uICJUaGUgemF0aHVyYS1wcyBwbHVnaW4gYWRkcyBQUyBzdXBwb3J0 IHRvIHphdGh1cmEKIHVzaW5nIGxpYnNwZWN0cmUuIikKKyAgICAoaG9tZS1wYWdlICJodHRwczov L3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtcHMvIikKICAgICAobGljZW5zZSBsaWNlbnNlOnps aWIpKSkKIAogKGRlZmluZS1wdWJsaWMgemF0aHVyYS1wZGYtcG9wcGxlcgotLSAKMi4yNi4yCgo= --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0014-gnu-zathura-ps-Update-package-definition.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0014-gnu-zathura-ps-Update-package-definition.patch RnJvbSBiMzU3NWFiNmU2OTI4M2Q4ZTNlYjJkZjliMmM0YTQxNzMzZDNiNTA2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMjo0MDo0MiAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTQvMjJdIGdudTogemF0aHVyYS1wczogVXBkYXRlIHBhY2thZ2UgZGVmaW5pdGlvbi4K CiogZ251L3BhY2thZ2VzL3B3bXQuc2NtICh6YXRodXJhLXBzKTogTWFrZSBjaGFuZ2VzIHRvIHJl ZmxlY3QgcGFydGljdWxhcnMKb2YgcmVjZW50IHNvdXJjZSBjb2RlLgpbaW5wdXRzXTogQWRkIGNh aXJvLCBnaXJhcmEsIGdsaWIsIGd0ayssIGpzb24tYyBhbmQgbGlibm90aWZ5Lgpbc3lub3BzaXNd OiBVcGRhdGVkLgpbZGVzY3JpcHRpb25dOiBVcGRhdGVkLgotLS0KIGdudS9wYWNrYWdlcy9wd210 LnNjbSB8IDQzICsrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAxNyBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9nbnUvcGFja2FnZXMvcHdtdC5zY20gYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KaW5kZXgg NDU0ODFhZDUzYy4uMjU1MGRlMGEzMyAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3B3bXQuc2Nt CisrKyBiL2dudS9wYWNrYWdlcy9wd210LnNjbQpAQCAtMTg0LDM0ICsxODQsNDMgQEAgRGpWdSBh bmQgQ29taWNCb29rKSB2aWEgcGx1Z2lucy4iKQogICAocGFja2FnZQogICAgIChuYW1lICJ6YXRo dXJhLXBzIikKICAgICAodmVyc2lvbiAiMC4yLjYiKQotICAgIChzb3VyY2UgKG9yaWdpbgotICAg ICAgICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkKLSAgICAgICAgICAgICAgKHVyaQotICAgICAg ICAgICAgICAgKHN0cmluZy1hcHBlbmQgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVy YS1wcy9kb3dubG9hZC96YXRodXJhLXBzLSIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHZlcnNpb24gIi50YXIueHoiKSkKLSAgICAgICAgICAgICAgKHNoYTI1NgotICAgICAgICAgICAg ICAgKGJhc2UzMgotICAgICAgICAgICAgICAgICIwd3lncTg5bnlqcmpuc3E3dmJwaWRxZHNpcmpt NmlxNHcycmlqendwazJmODN5czhiYzN5IikpKSkKKyAgICAoc291cmNlCisgICAgIChvcmlnaW4K KyAgICAgICAobWV0aG9kIHVybC1mZXRjaCkKKyAgICAgICAodXJpCisgICAgICAgIChzdHJpbmct YXBwZW5kICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtcHMvZG93bmxvYWQvemF0 aHVyYS1wcy0iCisgICAgICAgICAgICAgICAgICAgICAgIHZlcnNpb24gIi50YXIueHoiKSkKKyAg ICAgICAoc2hhMjU2CisgICAgICAgIChiYXNlMzIKKyAgICAgICAgICIwd3lncTg5bnlqcmpuc3E3 dmJwaWRxZHNpcmptNmlxNHcycmlqendwazJmODN5czhiYzN5IikpKSkKICAgICAoYnVpbGQtc3lz dGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkKICAgICAoYXJndW1lbnRzCi0gICAgIGAoIzp0ZXN0cz8g I2YgICAgICAgICAgICAgICAgICAgICAgOyBwYWNrYWdlIGRvZXMgbm90IGNvbnRhaW4gdGVzdHMK KyAgICAgYCgjOnRlc3RzPyAjZiAgICAgICAgICAgICAgICAgICAgICA7IE5vIHRhcmdldAogICAg ICAgICM6cGhhc2VzCiAgICAgICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwogICAg ICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdwYXRjaC1wbHVnaW4tZGlyZWN0b3J5Ci0gICAgICAg ICAgIDs7IFNvbWV0aGluZyBvZiBhIHJlZ3Jlc3Npb24gaW4gMC4yLjY6IHRoZSBuZXcgTWVzb24g YnVpbGQgc3lzdGVtCi0gICAgICAgICAgIDs7IG5vdyBoYXJkLWNvZGVzIGFuIGluY29ycmVjdCBw bHVnaW4gZGlyZWN0b3J5LiAgRml4IGl0LgorICAgICAgICAgICA7OyBUaGlzIHBhY2thZ2UgdHJp ZXMgdG8gaW5zdGFsbCBpbnRvIGRpcmVjdG9yeSBvZiBaYXRodXJhLgorICAgICAgICAgICA7OyBU aGF0IGNhbm5vdCBiZSBhbGxvd2VkLiBGaXggaXQuCiAgICAgICAgICAgIChsYW1iZGEqICgjOmtl eSBvdXRwdXRzICM6YWxsb3ctb3RoZXIta2V5cykKICAgICAgICAgICAgICAoc3Vic3RpdHV0ZSog Im1lc29uLmJ1aWxkIgogICAgICAgICAgICAgICAgKCgiKGluc3RhbGxfZGlyOikuKiIgXyBrZXkp CiAgICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQga2V5CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIiciIChhc3NvYy1yZWYgb3V0cHV0cyAib3V0IikgIi9saWIvemF0aHVyYSdc biIpKSkKICAgICAgICAgICAgICAjdCkpKSkpCi0gICAgKG5hdGl2ZS1pbnB1dHMgYCgoInBrZy1j b25maWciICxwa2ctY29uZmlnKSkpCi0gICAgKGlucHV0cyBgKCgibGlic3BlY3RyZSIgLGxpYnNw ZWN0cmUpCi0gICAgICAgICAgICAgICgiemF0aHVyYSIgLHphdGh1cmEpKSkKLSAgICAoc3lub3Bz aXMgIlBTIHN1cHBvcnQgZm9yIHphdGh1cmEgKGxpYnNwZWN0cmUgYmFja2VuZCkiKQotICAgIChk ZXNjcmlwdGlvbiAiVGhlIHphdGh1cmEtcHMgcGx1Z2luIGFkZHMgUFMgc3VwcG9ydCB0byB6YXRo dXJhCi11c2luZyBsaWJzcGVjdHJlLiIpCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAgYCgoInBr Zy1jb25maWciICxwa2ctY29uZmlnKSkpCisgICAgKGlucHV0cworICAgICBgKCgiY2Fpcm8iICxj YWlybykKKyAgICAgICAoImdpcmFyYSIgLGdpcmFyYSkKKyAgICAgICAoImdsaWIiICxnbGliKQor ICAgICAgICgiZ3RrKyIgLGd0ayspCisgICAgICAgKCJqc29uLWMiICxqc29uLWMpICAgICAgICAg ICAgICA7IFRvIGdlbmVyYXRlIGNhcmdzIGZvciB6YXRodXJhCisgICAgICAgKCJsaWJub3RpZnki ICxsaWJub3RpZnkpICAgICAgICA7IFRvIGdlbmVyYXRlIGNhcmdzIGZvciB6YXRodXJhCisgICAg ICAgKCJsaWJzcGVjdHJlIiAsbGlic3BlY3RyZSkKKyAgICAgICAoInphdGh1cmEiICx6YXRodXJh KSkpCisgICAgKHN5bm9wc2lzICJQb3N0U2NyaXB0IHN1cHBvcnQgZm9yIHphdGh1cmEiKQorICAg IChkZXNjcmlwdGlvbiAiVGhlIHphdGh1cmEtcHMgcGx1Z2luIGFkZHMgUG9zdFNjcmlwdCBzdXBw b3J0IHRvIHphdGh1cmEgYnkKK3VzaW5nIHRoZSBsaWJzcGVjdHJlIGxpYnJhcnkuIikKICAgICAo aG9tZS1wYWdlICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtcHMvIikKICAgICAo bGljZW5zZSBsaWNlbnNlOnpsaWIpKSkKIAotLSAKMi4yNi4yCgo= --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0015-gnu-zathura-pdf-poppler-Rearrange-elements-of-packag.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0015-gnu-zathura-pdf-poppler-Rearrange-elements-of-packag.patch RnJvbSA0ZDUzZGVkOGFiODE5MWJkN2VmYzcyZjcyZGUyYTNiMmQxMWZjNDVkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMjo0NTo0OSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTUvMjJdIGdudTogemF0aHVyYS1wZGYtcG9wcGxlcjogUmVhcnJhbmdlIGVsZW1lbnRz IG9mIHBhY2thZ2UKIGRlZmluaXRpb24uCgoqIGdudS9wYWNrYWdlcy9wd210LnNjbSAoemF0aHVy YS1wZGYtcG9wcGxlcik6IFJlb3JkZXIgZmllbGRzLgotLS0KIGdudS9wYWNrYWdlcy9wd210LnNj bSB8IDEwICsrKysrLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDUgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3B3bXQuc2NtIGIvZ251L3BhY2th Z2VzL3B3bXQuc2NtCmluZGV4IDI1NTBkZTBhMzMuLjY3OTI5ZmFlODkgMTAwNjQ0Ci0tLSBhL2du dS9wYWNrYWdlcy9wd210LnNjbQorKysgYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KQEAgLTIzNiwx MCArMjM2LDYgQEAgdXNpbmcgdGhlIGxpYnNwZWN0cmUgbGlicmFyeS4iKQogICAgICAgICAgICAg ICAoc2hhMjU2CiAgICAgICAgICAgICAgICAoYmFzZTMyCiAgICAgICAgICAgICAgICAgIjF2Zmw0 dmt5eTNyZjM5cjFzcWFhN3k4MTEzYmdraDJia2ZxM25uMmluaXM5bXJ5a21rNm0iKSkpKQotICAg IChuYXRpdmUtaW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykpKQotICAgIChpbnB1 dHMKLSAgICAgYCgoInBvcHBsZXIiICxwb3BwbGVyKQotICAgICAgICgiemF0aHVyYSIgLHphdGh1 cmEpKSkKICAgICAoYnVpbGQtc3lzdGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkKICAgICAoYXJndW1l bnRzCiAgICAgIGAoIzp0ZXN0cz8gI2YgICAgICAgICAgICAgICAgICAgICAgOyBwYWNrYWdlIGRv ZXMgbm90IGluY2x1ZGUgdGVzdHMKQEAgLTI1NCwxMCArMjUwLDE0IEBAIHVzaW5nIHRoZSBsaWJz cGVjdHJlIGxpYnJhcnkuIikKICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBrZXkKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiJyIgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQi KSAiL2xpYi96YXRodXJhJ1xuIikpKQogICAgICAgICAgICAgICN0KSkpKSkKLSAgICAoaG9tZS1w YWdlICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtcGRmLXBvcHBsZXIvIikKKyAg ICAobmF0aXZlLWlucHV0cyBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpKSkKKyAgICAoaW5w dXRzCisgICAgIGAoKCJwb3BwbGVyIiAscG9wcGxlcikKKyAgICAgICAoInphdGh1cmEiICx6YXRo dXJhKSkpCiAgICAgKHN5bm9wc2lzICJQREYgc3VwcG9ydCBmb3IgemF0aHVyYSAocG9wcGxlciBi YWNrZW5kKSIpCiAgICAgKGRlc2NyaXB0aW9uICJUaGUgemF0aHVyYS1wZGYtcG9wcGxlciBwbHVn aW4gYWRkcyBQREYgc3VwcG9ydCB0byB6YXRodXJhCiBieSB1c2luZyB0aGUgcG9wcGxlciByZW5k ZXJpbmcgZW5naW5lLiIpCisgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0 cy96YXRodXJhLXBkZi1wb3BwbGVyLyIpCiAgICAgKGxpY2Vuc2UgbGljZW5zZTp6bGliKSkpCiAK IChkZWZpbmUtcHVibGljIHphdGh1cmEtcGRmLW11cGRmCi0tIAoyLjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0016-gnu-zathura-pdf-poppler-Update-package-definition.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0016-gnu-zathura-pdf-poppler-Update-package-definition.patch RnJvbSA5OTdhMDY4YTVhNGU1Mzc0ODk3MzU5YjBiNjQxOWQ0ZjI1MDgxNzNiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMjo1NDoyNSAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTYvMjJdIGdudTogemF0aHVyYS1wZGYtcG9wcGxlcjogVXBkYXRlIHBhY2thZ2UgZGVm aW5pdGlvbi4KCiogZ251L3BhY2thZ2VzL3B3bXQuc2NtICh6YXRodXJhLXBkZi1wb3BwbGVyKTog TWFrZSBjaGFuZ2VzIHRvIHJlZmxlY3QKcGFydGljdWxhcnMgb2YgcmVjZW50IHNvdXJjZSBjb2Rl LgpbYXJndW1lbnRzXTogUmVtb3ZlIHBoYXNlIHBhdGNoLXBsdWdpbi1kaXJlY3RvcnkuClthcmd1 bWVudHNdOiBBZGQgcGx1Z2luZGlyIGNvbmZpZ3VyZS1mbGFnLgpbaW5wdXRzXTogQWRkIGNhaXJv LCBnaXJhcmEgYW5kIGdsaWIuCltzeW5vcHNpc106IFVwZGF0ZWQuCltkZXNjcmlwdGlvbl06IFVw ZGF0ZWQuCi0tLQogZ251L3BhY2thZ2VzL3B3bXQuc2NtIHwgNDggKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIzIGluc2VydGlvbnMo KyksIDI1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wd210LnNjbSBi L2dudS9wYWNrYWdlcy9wd210LnNjbQppbmRleCA2NzkyOWZhZTg5Li40YTcyOWQxNWNhIDEwMDY0 NAotLS0gYS9nbnUvcGFja2FnZXMvcHdtdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL3B3bXQuc2Nt CkBAIC0yMjgsMzUgKzIyOCwzMyBAQCB1c2luZyB0aGUgbGlic3BlY3RyZSBsaWJyYXJ5LiIpCiAg IChwYWNrYWdlCiAgICAgKG5hbWUgInphdGh1cmEtcGRmLXBvcHBsZXIiKQogICAgICh2ZXJzaW9u ICIwLjMuMCIpCi0gICAgKHNvdXJjZSAob3JpZ2luCi0gICAgICAgICAgICAgIChtZXRob2QgdXJs LWZldGNoKQotICAgICAgICAgICAgICAodXJpCi0gICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVu ZCAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy96YXRodXJhLXBkZi1wb3BwbGVyL2Rvd25sb2Fk L3phdGh1cmEtcGRmLXBvcHBsZXItIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmVy c2lvbiAiLnRhci54eiIpKQotICAgICAgICAgICAgICAoc2hhMjU2Ci0gICAgICAgICAgICAgICAo YmFzZTMyCi0gICAgICAgICAgICAgICAgIjF2Zmw0dmt5eTNyZjM5cjFzcWFhN3k4MTEzYmdraDJi a2ZxM25uMmluaXM5bXJ5a21rNm0iKSkpKQorICAgIChzb3VyY2UKKyAgICAgKG9yaWdpbgorICAg ICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICh1cmkKKyAgICAgICAgKHN0cmluZy1hcHBl bmQgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1wZGYtcG9wcGxlci9kb3dubG9h ZC8iCisgICAgICAgICAgICAgICAgICAgICAgICJ6YXRodXJhLXBkZi1wb3BwbGVyLSIgdmVyc2lv biAiLnRhci54eiIpKQorICAgICAgIChzaGEyNTYKKyAgICAgICAgKGJhc2UzMgorICAgICAgICAg IjF2Zmw0dmt5eTNyZjM5cjFzcWFhN3k4MTEzYmdraDJia2ZxM25uMmluaXM5bXJ5a21rNm0iKSkp KQogICAgIChidWlsZC1zeXN0ZW0gbWVzb24tYnVpbGQtc3lzdGVtKQogICAgIChhcmd1bWVudHMK LSAgICAgYCgjOnRlc3RzPyAjZiAgICAgICAgICAgICAgICAgICAgICA7IHBhY2thZ2UgZG9lcyBu b3QgaW5jbHVkZSB0ZXN0cwotICAgICAgICM6cGhhc2VzCi0gICAgICAgKG1vZGlmeS1waGFzZXMg JXN0YW5kYXJkLXBoYXNlcwotICAgICAgICAgKGFkZC1hZnRlciAndW5wYWNrICdwYXRjaC1wbHVn aW4tZGlyZWN0b3J5Ci0gICAgICAgICAgIDs7IFNvbWV0aGluZyBvZiBhIHJlZ3Jlc3Npb24gaW4g MC4yLjk6IHRoZSBuZXcgTWVzb24gYnVpbGQgc3lzdGVtCi0gICAgICAgICAgIDs7IG5vdyBoYXJk LWNvZGVzIGFuIGluY29ycmVjdCBwbHVnaW4gZGlyZWN0b3J5LiAgRml4IGl0LgotICAgICAgICAg ICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90aGVyLWtleXMpCi0gICAgICAgICAg ICAgKHN1YnN0aXR1dGUqICJtZXNvbi5idWlsZCIKLSAgICAgICAgICAgICAgICgoIihpbnN0YWxs X2RpcjopLioiIF8ga2V5KQotICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIGtleQotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICInIiAoYXNzb2MtcmVmIG91dHB1dHMgIm91dCIp ICIvbGliL3phdGh1cmEnXG4iKSkpCi0gICAgICAgICAgICAgI3QpKSkpKQotICAgIChuYXRpdmUt aW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykpKQorICAgICBgKCM6dGVzdHM/ICNm ICAgICAgICAgICAgICAgICAgICAgIDsgTm8gdGFyZ2V0CisgICAgICAgIzpjb25maWd1cmUtZmxh Z3MKKyAgICAgICAobGlzdAorICAgICAgICAoc3RyaW5nLWFwcGVuZCAiLURwbHVnaW5kaXI9Igor ICAgICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVmICVvdXRwdXRzICJvdXQiKSAiL2xpYi96 YXRodXJhIikpKSkKKyAgICAobmF0aXZlLWlucHV0cworICAgICBgKCgicGtnLWNvbmZpZyIgLHBr Zy1jb25maWcpKSkKICAgICAoaW5wdXRzCi0gICAgIGAoKCJwb3BwbGVyIiAscG9wcGxlcikKKyAg ICAgYCgoImNhaXJvIiAsY2Fpcm8pCisgICAgICAgKCJnaXJhcmEiICxnaXJhcmEpCisgICAgICAg KCJnbGliIiAsZ2xpYikKKyAgICAgICAoInBvcHBsZXIiICxwb3BwbGVyKQogICAgICAgICgiemF0 aHVyYSIgLHphdGh1cmEpKSkKLSAgICAoc3lub3BzaXMgIlBERiBzdXBwb3J0IGZvciB6YXRodXJh IChwb3BwbGVyIGJhY2tlbmQpIikKLSAgICAoZGVzY3JpcHRpb24gIlRoZSB6YXRodXJhLXBkZi1w b3BwbGVyIHBsdWdpbiBhZGRzIFBERiBzdXBwb3J0IHRvIHphdGh1cmEKLWJ5IHVzaW5nIHRoZSBw b3BwbGVyIHJlbmRlcmluZyBlbmdpbmUuIikKKyAgICAoc3lub3BzaXMgIlBERiBzdXBwb3J0IChw b3BwbGVyIGJhY2tlbmQpIGZvciB6YXRodXJhIikKKyAgICAoZGVzY3JpcHRpb24gIlRoZSB6YXRo dXJhLXBkZi1wb3BwbGVyIHBsdWdpbiBhZGRzIFBERiBzdXBwb3J0IHRvIHphdGh1cmEgYnkKK3Vz aW5nIHRoZSBwb3BwbGVyIHJlbmRlcmluZyBsaWJyYXJ5LiIpCiAgICAgKGhvbWUtcGFnZSAiaHR0 cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy96YXRodXJhLXBkZi1wb3BwbGVyLyIpCiAgICAgKGxpY2Vu c2UgbGljZW5zZTp6bGliKSkpCiAKLS0gCjIuMjYuMgoK --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0017-gnu-zathura-pdf-mupdf-Rearrange-elements-of-package-.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0017-gnu-zathura-pdf-mupdf-Rearrange-elements-of-package-.patch RnJvbSBjNjIyNGIxMGZkM2FmZWNmZGFjYjdkMzA2MGZiMzAyZTViMWZlMDBhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMzowMDowMiAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTcvMjJdIGdudTogemF0aHVyYS1wZGYtbXVwZGY6IFJlYXJyYW5nZSBlbGVtZW50cyBv ZiBwYWNrYWdlCiBkZWZpbml0aW9uLgoKKiBnbnUvcGFja2FnZXMvcHdtdC5zY20gKHphdGh1cmEt cGRmLW11cGRmKTogUmVvcmRlciBmaWVsZHMuCi0tLQogZ251L3BhY2thZ2VzL3B3bXQuc2NtIHwg MjAgKysrKysrKysrKy0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxMCBpbnNlcnRpb25zKCsp LCAxMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9nbnUvcGFja2FnZXMvcHdtdC5zY20gYi9n bnUvcGFja2FnZXMvcHdtdC5zY20KaW5kZXggNGE3MjlkMTVjYS4uZTg4ZmQ0YzBjNCAxMDA2NDQK LS0tIGEvZ251L3BhY2thZ2VzL3B3bXQuc2NtCisrKyBiL2dudS9wYWNrYWdlcy9wd210LnNjbQpA QCAtMjcwLDE1ICsyNzAsNiBAQCB1c2luZyB0aGUgcG9wcGxlciByZW5kZXJpbmcgbGlicmFyeS4i KQogICAgICAgICAgICAgICAoc2hhMjU2CiAgICAgICAgICAgICAgICAoYmFzZTMyCiAgICAgICAg ICAgICAgICAgIjFwandzYjd6d2NseHN2ejIyOWZsN3kyc2FmMXB2M2lmd3YzYXk4dmlxeGdycDl4 M3o5aHEiKSkpKQotICAgIChuYXRpdmUtaW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZp ZykpKQotICAgIChpbnB1dHMKLSAgICAgYCgoImpiaWcyZGVjIiAsamJpZzJkZWMpCi0gICAgICAg KCJsaWJqcGVnIiAsbGlianBlZykKLSAgICAgICAoIm11anMiICxtdWpzKQotICAgICAgICgibXVw ZGYiICxtdXBkZikKLSAgICAgICAoIm9wZW5qcGVnIiAsb3BlbmpwZWcpCi0gICAgICAgKCJvcGVu c3NsIiAsb3BlbnNzbCkKLSAgICAgICAoInphdGh1cmEiICx6YXRodXJhKSkpCiAgICAgKGJ1aWxk LXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCiAgICAgKGFyZ3VtZW50cwogICAgICBgKCM6dGVz dHM/ICNmICAgICAgICAgICAgICAgICAgICAgIDsgcGFja2FnZSBkb2VzIG5vdCBjb250YWluIHRl c3RzCkBAIC0yOTYsMTAgKzI4NywxOSBAQCB1c2luZyB0aGUgcG9wcGxlciByZW5kZXJpbmcgbGli cmFyeS4iKQogICAgICAgICAgICAgICAgIChzdHJpbmctYXBwZW5kIHggIiAgbXVqcyA9IGNjLmZp bmRfbGlicmFyeSgnbXVqcycpXG4iKSkKICAgICAgICAgICAgICAgICgoIl4gICAgbGlib3Blbmpw MiIpCiAgICAgICAgICAgICAgICAgIiAgICBsaWJvcGVuanAyLCBtdWpzIikpKSkpKSkKLSAgICAo aG9tZS1wYWdlICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtcGRmLW11cGRmLyIp CisgICAgKG5hdGl2ZS1pbnB1dHMgYCgoInBrZy1jb25maWciICxwa2ctY29uZmlnKSkpCisgICAg KGlucHV0cworICAgICBgKCgiamJpZzJkZWMiICxqYmlnMmRlYykKKyAgICAgICAoImxpYmpwZWci ICxsaWJqcGVnKQorICAgICAgICgibXVqcyIgLG11anMpCisgICAgICAgKCJtdXBkZiIgLG11cGRm KQorICAgICAgICgib3BlbmpwZWciICxvcGVuanBlZykKKyAgICAgICAoIm9wZW5zc2wiICxvcGVu c3NsKQorICAgICAgICgiemF0aHVyYSIgLHphdGh1cmEpKSkKICAgICAoc3lub3BzaXMgIlBERiBz dXBwb3J0IGZvciB6YXRodXJhIChtdXBkZiBiYWNrZW5kKSIpCiAgICAgKGRlc2NyaXB0aW9uICJU aGUgemF0aHVyYS1wZGYtbXVwZGYgcGx1Z2luIGFkZHMgUERGIHN1cHBvcnQgdG8gemF0aHVyYQog YnkgdXNpbmcgdGhlIEBjb2Rle211cGRmfSByZW5kZXJpbmcgbGlicmFyeS4iKQorICAgIChob21l LXBhZ2UgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1wZGYtbXVwZGYvIikKICAg ICAobGljZW5zZSBsaWNlbnNlOnpsaWIpKSkKIAogKGRlZmluZS1wdWJsaWMgemF0aHVyYS1kanZ1 Ci0tIAoyLjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0018-gnu-zathura-pdf-mupdf-Update-package-definition.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0018-gnu-zathura-pdf-mupdf-Update-package-definition.patch RnJvbSA1ODY2YTY0ODQ0ZjkyNGQ5ZjJlY2JjYmExOWU0Y2Q3M2ZmZGMwNDQ3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMzowNDozNCAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTgvMjJdIGdudTogemF0aHVyYS1wZGYtbXVwZGY6IFVwZGF0ZSBwYWNrYWdlIGRlZmlu aXRpb24uCgoqIGdudS9wYWNrYWdlcy9wd210LnNjbSAoemF0aHVyYS1wZGYtbXVwZGYpOiBNYWtl IGNoYW5nZXMgdG8gcmVmbGVjdApwYXJ0aWN1bGFycyBvZiByZWNlbnQgc291cmNlIGNvZGUuCltp bnB1dHNdOiBBZGQgY2Fpcm8sIGdsaWIsIGd0ayssIGpzb24tYyBhbmQgbGlibm90aWZ5LiBSZW1v dmUgb3BlbnNzbC4KW3N5bm9wc2lzXTogVXBkYXRlZC4KW2Rlc2NyaXB0aW9uXTogVXBkYXRlZC4K LS0tCiBnbnUvcGFja2FnZXMvcHdtdC5zY20gfCA0NiArKysrKysrKysrKysrKysrKysrKysrKysr LS0tLS0tLS0tLS0tLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgMjcgaW5zZXJ0aW9ucygrKSwgMTkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ251L3BhY2thZ2VzL3B3bXQuc2NtIGIvZ251L3Bh Y2thZ2VzL3B3bXQuc2NtCmluZGV4IGU4OGZkNGMwYzQuLmNjNWU4NDc1OWUgMTAwNjQ0Ci0tLSBh L2dudS9wYWNrYWdlcy9wd210LnNjbQorKysgYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KQEAgLTI2 MiwyMSArMjYyLDIzIEBAIHVzaW5nIHRoZSBwb3BwbGVyIHJlbmRlcmluZyBsaWJyYXJ5LiIpCiAg IChwYWNrYWdlCiAgICAgKG5hbWUgInphdGh1cmEtcGRmLW11cGRmIikKICAgICAodmVyc2lvbiAi MC4zLjUiKQotICAgIChzb3VyY2UgKG9yaWdpbgotICAgICAgICAgICAgICAobWV0aG9kIHVybC1m ZXRjaCkKLSAgICAgICAgICAgICAgKHVyaQotICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQg Imh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1wZGYtbXVwZGYiCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAiL2Rvd25sb2FkL3phdGh1cmEtcGRmLW11cGRmLSIgdmVyc2lv biAiLnRhci54eiIpKQotICAgICAgICAgICAgICAoc2hhMjU2Ci0gICAgICAgICAgICAgICAoYmFz ZTMyCi0gICAgICAgICAgICAgICAgIjFwandzYjd6d2NseHN2ejIyOWZsN3kyc2FmMXB2M2lmd3Yz YXk4dmlxeGdycDl4M3o5aHEiKSkpKQorICAgIChzb3VyY2UKKyAgICAgKG9yaWdpbgorICAgICAg IChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICh1cmkKKyAgICAgICAgKHN0cmluZy1hcHBlbmQg Imh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1wZGYtbXVwZGYiCisgICAgICAgICAg ICAgICAgICAgICAgICIvZG93bmxvYWQvemF0aHVyYS1wZGYtbXVwZGYtIiB2ZXJzaW9uICIudGFy Lnh6IikpCisgICAgICAgKHNoYTI1NgorICAgICAgICAoYmFzZTMyCisgICAgICAgICAiMXBqd3Ni N3p3Y2x4c3Z6MjI5Zmw3eTJzYWYxcHYzaWZ3djNheTh2aXF4Z3JwOXgzejlocSIpKSkpCiAgICAg KGJ1aWxkLXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCiAgICAgKGFyZ3VtZW50cwotICAgICBg KCM6dGVzdHM/ICNmICAgICAgICAgICAgICAgICAgICAgIDsgcGFja2FnZSBkb2VzIG5vdCBjb250 YWluIHRlc3RzCi0gICAgICAgIzpjb25maWd1cmUtZmxhZ3MgKGxpc3QgKHN0cmluZy1hcHBlbmQg Ii1EcGx1Z2luZGlyPSIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAoYXNzb2MtcmVmICVvdXRwdXRzICJvdXQiKQotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICIvbGliL3phdGh1cmEiKQotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICItRGxpbmstZXh0ZXJuYWw9dHJ1ZSIpCisgICAgIGAoIzp0ZXN0cz8gI2Yg ICAgICAgICAgICAgICAgICAgICAgOyBObyB0YXJnZXQKKyAgICAgICAjOmNvbmZpZ3VyZS1mbGFn cworICAgICAgIChsaXN0CisgICAgICAgIChzdHJpbmctYXBwZW5kICItRHBsdWdpbmRpcj0iCisg ICAgICAgICAgICAgICAgICAgICAgIChhc3NvYy1yZWYgJW91dHB1dHMgIm91dCIpICIvbGliL3ph dGh1cmEiKQorICAgICAgICAiLURsaW5rLWV4dGVybmFsPXRydWUiKSAgICAgICAgIDsgRm9yIE11 UERGIGV4dGVybmFsIGxpYnJhcmllcwogICAgICAgICM6cGhhc2VzCiAgICAgICAgKG1vZGlmeS1w aGFzZXMgJXN0YW5kYXJkLXBoYXNlcwogICAgICAgICAgKGFkZC1iZWZvcmUgJ2NvbmZpZ3VyZSAn YWRkLW11anMtdG8tZGVwZW5kZW5jaWVzCkBAIC0yODcsMTggKzI4OSwyNCBAQCB1c2luZyB0aGUg cG9wcGxlciByZW5kZXJpbmcgbGlicmFyeS4iKQogICAgICAgICAgICAgICAgIChzdHJpbmctYXBw ZW5kIHggIiAgbXVqcyA9IGNjLmZpbmRfbGlicmFyeSgnbXVqcycpXG4iKSkKICAgICAgICAgICAg ICAgICgoIl4gICAgbGlib3BlbmpwMiIpCiAgICAgICAgICAgICAgICAgIiAgICBsaWJvcGVuanAy LCBtdWpzIikpKSkpKSkKLSAgICAobmF0aXZlLWlucHV0cyBgKCgicGtnLWNvbmZpZyIgLHBrZy1j b25maWcpKSkKKyAgICAobmF0aXZlLWlucHV0cworICAgICBgKCgicGtnLWNvbmZpZyIgLHBrZy1j b25maWcpKSkKICAgICAoaW5wdXRzCi0gICAgIGAoKCJqYmlnMmRlYyIgLGpiaWcyZGVjKQorICAg ICBgKCgiY2Fpcm8iICxjYWlybykKKyAgICAgICAoImdpcmFyYSIgLGdpcmFyYSkKKyAgICAgICAo ImdsaWIiICxnbGliKQorICAgICAgICgiZ3RrKyIgLGd0ayspCisgICAgICAgKCJqYmlnMmRlYyIg LGpiaWcyZGVjKQorICAgICAgICgianNvbi1jIiAsanNvbi1jKSAgICAgICAgICAgICAgOyBUbyBn ZW5lcmF0ZSBjYXJncyBmb3IgemF0aHVyYQogICAgICAgICgibGlianBlZyIgLGxpYmpwZWcpCisg ICAgICAgKCJsaWJub3RpZnkiICxsaWJub3RpZnkpICAgICAgICA7IFRvIGdlbmVyYXRlIGNhcmdz IGZvciB6YXRodXJhCiAgICAgICAgKCJtdWpzIiAsbXVqcykKICAgICAgICAoIm11cGRmIiAsbXVw ZGYpCiAgICAgICAgKCJvcGVuanBlZyIgLG9wZW5qcGVnKQotICAgICAgICgib3BlbnNzbCIgLG9w ZW5zc2wpCiAgICAgICAgKCJ6YXRodXJhIiAsemF0aHVyYSkpKQotICAgIChzeW5vcHNpcyAiUERG IHN1cHBvcnQgZm9yIHphdGh1cmEgKG11cGRmIGJhY2tlbmQpIikKLSAgICAoZGVzY3JpcHRpb24g IlRoZSB6YXRodXJhLXBkZi1tdXBkZiBwbHVnaW4gYWRkcyBQREYgc3VwcG9ydCB0byB6YXRodXJh Ci1ieSB1c2luZyB0aGUgQGNvZGV7bXVwZGZ9IHJlbmRlcmluZyBsaWJyYXJ5LiIpCisgICAgKHN5 bm9wc2lzICJQREYgc3VwcG9ydCAobXVwZGYgYmFja2VuZCkgZm9yIHphdGh1cmEiKQorICAgIChk ZXNjcmlwdGlvbiAiVGhlIHphdGh1cmEtcGRmLW11cGRmIHBsdWdpbiBhZGRzIFBERiBzdXBwb3J0 IHRvIHphdGh1cmEgYnkKK3VzaW5nIHRoZSBtdXBkZiByZW5kZXJpbmcgbGlicmFyeS4iKQogICAg IChob21lLXBhZ2UgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1wZGYtbXVwZGYv IikKICAgICAobGljZW5zZSBsaWNlbnNlOnpsaWIpKSkKIAotLSAKMi4yNi4yCgo= --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0019-gnu-zathura-djvu-Rearrange-elements-of-package-defin.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0019-gnu-zathura-djvu-Rearrange-elements-of-package-defin.patch RnJvbSBjZWE2MTI0Yzk2NTJlMzczZWY4MTZjMzk4N2RmNGFhMzliNDc1Y2VlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMzowNzo0NCAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMTkvMjJdIGdudTogemF0aHVyYS1kanZ1OiBSZWFycmFuZ2UgZWxlbWVudHMgb2YgcGFj a2FnZQogZGVmaW5pdGlvbi4KCiogZ251L3BhY2thZ2VzL3B3bXQuc2NtICh6YXRodXJhLWRqdnUp OiBSZW9yZGVyIGZpZWxkcy4KLS0tCiBnbnUvcGFja2FnZXMvcHdtdC5zY20gfCAxMCArKysrKy0t LS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQoKZGlm ZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wd210LnNjbSBiL2dudS9wYWNrYWdlcy9wd210LnNjbQpp bmRleCBjYzVlODQ3NTllLi4zYmYzNjRjMDQzIDEwMDY0NAotLS0gYS9nbnUvcGFja2FnZXMvcHdt dC5zY20KKysrIGIvZ251L3BhY2thZ2VzL3B3bXQuc2NtCkBAIC0zMjIsMTAgKzMyMiw2IEBAIHVz aW5nIHRoZSBtdXBkZiByZW5kZXJpbmcgbGlicmFyeS4iKQogICAgICAgICAgICAgICAoc2hhMjU2 CiAgICAgICAgICAgICAgICAoYmFzZTMyCiAgICAgICAgICAgICAgICAgIjAwNjJuMjM2NDE0ZGI3 cTdwbm4zY2NnNTExMWdoeGozNDA3cG45cmkwOHNreHNrZ2lybG4iKSkpKQotICAgIChuYXRpdmUt aW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykpKQotICAgIChpbnB1dHMKLSAgICAg YCgoImRqdnVsaWJyZSIgLGRqdnVsaWJyZSkKLSAgICAgICAoInphdGh1cmEiICx6YXRodXJhKSkp CiAgICAgKGJ1aWxkLXN5c3RlbSBtZXNvbi1idWlsZC1zeXN0ZW0pCiAgICAgKGFyZ3VtZW50cwog ICAgICBgKCM6dGVzdHM/ICNmICAgICAgICAgICAgICAgICAgICAgIDsgcGFja2FnZSBkb2VzIG5v dCBjb250YWluIHRlc3RzCkBAIC0zNDAsMTAgKzMzNiwxNCBAQCB1c2luZyB0aGUgbXVwZGYgcmVu ZGVyaW5nIGxpYnJhcnkuIikKICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBrZXkKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiJyIgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQi KSAiL2xpYi96YXRodXJhJ1xuIikpKQogICAgICAgICAgICAgICN0KSkpKSkKLSAgICAoaG9tZS1w YWdlICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtZGp2dS8iKQorICAgIChuYXRp dmUtaW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykpKQorICAgIChpbnB1dHMKKyAg ICAgYCgoImRqdnVsaWJyZSIgLGRqdnVsaWJyZSkKKyAgICAgICAoInphdGh1cmEiICx6YXRodXJh KSkpCiAgICAgKHN5bm9wc2lzICJEalZ1IHN1cHBvcnQgZm9yIHphdGh1cmEgKERqVnVMaWJyZSBi YWNrZW5kKSIpCiAgICAgKGRlc2NyaXB0aW9uICJUaGUgemF0aHVyYS1kanZ1IHBsdWdpbiBhZGRz IERqVnUgc3VwcG9ydCB0byB6YXRodXJhCiB1c2luZyB0aGUgRGpWdUxpYnJlIGxpYnJhcnkuIikK KyAgICAoaG9tZS1wYWdlICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtZGp2dS8i KQogICAgIChsaWNlbnNlIGxpY2Vuc2U6emxpYikpKQogCiAoZGVmaW5lLXB1YmxpYyB6YXRodXJh LWNiCi0tIAoyLjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0020-gnu-zathura-djvu-Update-package-definition.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0020-gnu-zathura-djvu-Update-package-definition.patch RnJvbSAzZmZkMGFjY2U5YzE1OWRmMjcwMDRmMmE1YjA5NjZjMTI5NTVhNjUxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMzoxMjo0NiAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMjAvMjJdIGdudTogemF0aHVyYS1kanZ1OiBVcGRhdGUgcGFja2FnZSBkZWZpbml0aW9u LgoKKiBnbnUvcGFja2FnZXMvcHdtdC5zY20gKHphdGh1cmEtZGp2dSk6IE1ha2UgY2hhbmdlcyB0 byByZWZsZWN0IHBhcnRpY3VsYXJzCm9mIHJlY2VudCBwYWNrYWdlIGRlZmluaXRpb24uClthcmd1 bWVudHNdOiBSZW1vdmUgcGhhc2UgcGF0Y2gtcGx1Z2luLWRpcmVjdG9yeS4KW2FyZ3VtZW50c106 IEFkZCBwbHVnaW5kaXIgY29uZmlndXJlLWZsYWcuCltpbnB1dHNdOiBBZGQgY2Fpcm8sIGdpcmFy YSwgZ2xpYiwgZ3RrKywganNvbi1jIGFuZCBsaWJub3RpZnkuCltzeW5vcHNpc106IFVwZGF0ZWQu Ci0tLQogZ251L3BhY2thZ2VzL3B3bXQuc2NtIHwgNDcgKysrKysrKysrKysrKysrKysrKysrKy0t LS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDI0IGluc2VydGlvbnMoKyksIDIz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2dudS9wYWNrYWdlcy9wd210LnNjbSBiL2dudS9w YWNrYWdlcy9wd210LnNjbQppbmRleCAzYmYzNjRjMDQzLi5hMWY4OWQzODFhIDEwMDY0NAotLS0g YS9nbnUvcGFja2FnZXMvcHdtdC5zY20KKysrIGIvZ251L3BhY2thZ2VzL3B3bXQuc2NtCkBAIC0z MTQsMzMgKzMxNCwzNCBAQCB1c2luZyB0aGUgbXVwZGYgcmVuZGVyaW5nIGxpYnJhcnkuIikKICAg KHBhY2thZ2UKICAgICAobmFtZSAiemF0aHVyYS1kanZ1IikKICAgICAodmVyc2lvbiAiMC4yLjki KQotICAgIChzb3VyY2UgKG9yaWdpbgotICAgICAgICAgICAgICAobWV0aG9kIHVybC1mZXRjaCkK LSAgICAgICAgICAgICAgKHVyaQotICAgICAgICAgICAgICAgKHN0cmluZy1hcHBlbmQgImh0dHBz Oi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1kanZ1L2Rvd25sb2FkL3phdGh1cmEtZGp2dS0i Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICB2ZXJzaW9uICIudGFyLnh6IikpCi0gICAg ICAgICAgICAgIChzaGEyNTYKLSAgICAgICAgICAgICAgIChiYXNlMzIKLSAgICAgICAgICAgICAg ICAiMDA2Mm4yMzY0MTRkYjdxN3BubjNjY2c1MTExZ2h4ajM0MDdwbjlyaTA4c2t4c2tnaXJsbiIp KSkpCisgICAgKHNvdXJjZQorICAgICAob3JpZ2luCisgICAgICAgKG1ldGhvZCB1cmwtZmV0Y2gp CisgICAgICAgKHVyaQorICAgICAgICAoc3RyaW5nLWFwcGVuZCAiaHR0cHM6Ly9wd210Lm9yZy9w cm9qZWN0cy96YXRodXJhLWRqdnUvZG93bmxvYWQvIgorICAgICAgICAgICAgICAgICAgICAgICAi emF0aHVyYS1kanZ1LSIgdmVyc2lvbiAiLnRhci54eiIpKQorICAgICAgIChzaGEyNTYKKyAgICAg ICAgKGJhc2UzMgorICAgICAgICAgIjAwNjJuMjM2NDE0ZGI3cTdwbm4zY2NnNTExMWdoeGozNDA3 cG45cmkwOHNreHNrZ2lybG4iKSkpKQogICAgIChidWlsZC1zeXN0ZW0gbWVzb24tYnVpbGQtc3lz dGVtKQogICAgIChhcmd1bWVudHMKLSAgICAgYCgjOnRlc3RzPyAjZiAgICAgICAgICAgICAgICAg ICAgICA7IHBhY2thZ2UgZG9lcyBub3QgY29udGFpbiB0ZXN0cwotICAgICAgICM6cGhhc2VzCi0g ICAgICAgKG1vZGlmeS1waGFzZXMgJXN0YW5kYXJkLXBoYXNlcwotICAgICAgICAgKGFkZC1hZnRl ciAndW5wYWNrICdwYXRjaC1wbHVnaW4tZGlyZWN0b3J5Ci0gICAgICAgICAgIDs7IFNvbWV0aGlu ZyBvZiBhIHJlZ3Jlc3Npb24gaW4gMC4yLjg6IHRoZSBuZXcgTWVzb24gYnVpbGQgc3lzdGVtCi0g ICAgICAgICAgIDs7IG5vdyBoYXJkLWNvZGVzIGFuIGluY29ycmVjdCBwbHVnaW4gZGlyZWN0b3J5 LiAgRml4IGl0LgotICAgICAgICAgICAobGFtYmRhKiAoIzprZXkgb3V0cHV0cyAjOmFsbG93LW90 aGVyLWtleXMpCi0gICAgICAgICAgICAgKHN1YnN0aXR1dGUqICJtZXNvbi5idWlsZCIKLSAgICAg ICAgICAgICAgICgoIihpbnN0YWxsX2RpcjopLioiIF8ga2V5KQotICAgICAgICAgICAgICAgIChz dHJpbmctYXBwZW5kIGtleQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICInIiAoYXNz b2MtcmVmIG91dHB1dHMgIm91dCIpICIvbGliL3phdGh1cmEnXG4iKSkpCi0gICAgICAgICAgICAg I3QpKSkpKQotICAgIChuYXRpdmUtaW5wdXRzIGAoKCJwa2ctY29uZmlnIiAscGtnLWNvbmZpZykp KQorICAgICBgKCM6dGVzdHM/ICNmICAgICAgICAgICAgICAgICAgICAgIDsgTm8gdGFyZ2V0Cisg ICAgICAgIzpjb25maWd1cmUtZmxhZ3MKKyAgICAgICAobGlzdAorICAgICAgICAoc3RyaW5nLWFw cGVuZCAiLURwbHVnaW5kaXI9IgorICAgICAgICAgICAgICAgICAgICAgICAoYXNzb2MtcmVmICVv dXRwdXRzICJvdXQiKSAiL2xpYi96YXRodXJhIikpKSkKKyAgICAobmF0aXZlLWlucHV0cworICAg ICBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpKSkKICAgICAoaW5wdXRzCi0gICAgIGAoKCJk anZ1bGlicmUiICxkanZ1bGlicmUpCisgICAgIGAoKCJjYWlybyIgLGNhaXJvKQorICAgICAgICgi ZGp2dWxpYnJlIiAsZGp2dWxpYnJlKQorICAgICAgICgiZ2lyYXJhIiAsZ2lyYXJhKQorICAgICAg ICgiZ2xpYiIgLGdsaWIpCisgICAgICAgKCJndGsrIiAsZ3RrKykKKyAgICAgICAoImpzb24tYyIg LGpzb24tYykgICAgICAgICAgICAgIDsgVG8gZ2VuZXJhdGUgY2FyZ3MgZm9yIHphdGh1cmEKKyAg ICAgICAoImxpYm5vdGlmeSIgLGxpYm5vdGlmeSkgICAgICAgIDsgVG8gZ2VuZXJhdGUgY2FyZ3Mg Zm9yIHphdGh1cmEKICAgICAgICAoInphdGh1cmEiICx6YXRodXJhKSkpCi0gICAgKHN5bm9wc2lz ICJEalZ1IHN1cHBvcnQgZm9yIHphdGh1cmEgKERqVnVMaWJyZSBiYWNrZW5kKSIpCisgICAgKHN5 bm9wc2lzICJEalZ1IHN1cHBvcnQgZm9yIHphdGh1cmEiKQogICAgIChkZXNjcmlwdGlvbiAiVGhl IHphdGh1cmEtZGp2dSBwbHVnaW4gYWRkcyBEalZ1IHN1cHBvcnQgdG8gemF0aHVyYQogdXNpbmcg dGhlIERqVnVMaWJyZSBsaWJyYXJ5LiIpCiAgICAgKGhvbWUtcGFnZSAiaHR0cHM6Ly9wd210Lm9y Zy9wcm9qZWN0cy96YXRodXJhLWRqdnUvIikKLS0gCjIuMjYuMgoK --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0021-gnu-zathura-cb-Rearrange-elements-of-package-definit.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0021-gnu-zathura-cb-Rearrange-elements-of-package-definit.patch RnJvbSBmYjA1MjNmZmNjZGZiNDBhNWRlYWQwMmY1NjE3N2ZjMmExMzU3NTgzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMzoxNTo1NyAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMjEvMjJdIGdudTogemF0aHVyYS1jYjogUmVhcnJhbmdlIGVsZW1lbnRzIG9mIHBhY2th Z2UKIGRlZmluaXRpb24uCgoqIGdudS9wYWNrYWdlcy9wd210LnNjbSAoemF0aHVyYS1jYik6IFJl b3JkZXIgZmllbGRzLgotLS0KIGdudS9wYWNrYWdlcy9wd210LnNjbSB8IDEwICsrKysrLS0tLS0K IDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvZ251L3BhY2thZ2VzL3B3bXQuc2NtIGIvZ251L3BhY2thZ2VzL3B3bXQuc2NtCmluZGV4 IGExZjg5ZDM4MWEuLmMwOTBkZWFjOTEgMTAwNjQ0Ci0tLSBhL2dudS9wYWNrYWdlcy9wd210LnNj bQorKysgYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KQEAgLTM1OSwxMCArMzU5LDYgQEAgdXNpbmcg dGhlIERqVnVMaWJyZSBsaWJyYXJ5LiIpCiAgICAgICAgICAgICAgIChzaGEyNTYKICAgICAgICAg ICAgICAgIChiYXNlMzIKICAgICAgICAgICAgICAgICAiMWk2Y2YwdmtzNTAxY2dnd3Zmc2w2cWI3 bWRhZjNzc3pkeW1waGltZnZuc3B3ODEwZmFqNSIpKSkpCi0gICAgKG5hdGl2ZS1pbnB1dHMgYCgo InBrZy1jb25maWciICxwa2ctY29uZmlnKSkpCi0gICAgKGlucHV0cyBgKCgibGliYXJjaGl2ZSIg LGxpYmFyY2hpdmUpCi0gICAgICAgICAgICAgICgiemF0aHVyYSIgLHphdGh1cmEpKSkKLSAgICAo YnVpbGQtc3lzdGVtIG1lc29uLWJ1aWxkLXN5c3RlbSkKICAgICAoYXJndW1lbnRzCiAgICAgIGAo Izp0ZXN0cz8gI2YgICAgICAgICAgICAgICAgICAgICAgOyBwYWNrYWdlIGRvZXMgbm90IGNvbnRh aW4gdGVzdHMKICAgICAgICAjOnBoYXNlcwpAQCAtMzc2LDggKzM3MiwxMiBAQCB1c2luZyB0aGUg RGpWdUxpYnJlIGxpYnJhcnkuIikKICAgICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBrZXkK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiJyIgKGFzc29jLXJlZiBvdXRwdXRzICJv dXQiKSAiL2xpYi96YXRodXJhJ1xuIikpKQogICAgICAgICAgICAgICN0KSkpKSkKLSAgICAoaG9t ZS1wYWdlICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3phdGh1cmEtY2IvIikKKyAgICAobmF0 aXZlLWlucHV0cyBgKCgicGtnLWNvbmZpZyIgLHBrZy1jb25maWcpKSkKKyAgICAoaW5wdXRzIGAo KCJsaWJhcmNoaXZlIiAsbGliYXJjaGl2ZSkKKyAgICAgICAgICAgICAgKCJ6YXRodXJhIiAsemF0 aHVyYSkpKQorICAgIChidWlsZC1zeXN0ZW0gbWVzb24tYnVpbGQtc3lzdGVtKQogICAgIChzeW5v cHNpcyAiQ29taWMgYm9vayBzdXBwb3J0IGZvciB6YXRodXJhIChsaWJhcmNoaXZlIGJhY2tlbmQp IikKICAgICAoZGVzY3JpcHRpb24gIlRoZSB6YXRodXJhLWNiIHBsdWdpbiBhZGRzIGNvbWljIGJv b2sgc3VwcG9ydCB0byB6YXRodXJhCiB1c2luZyBsaWJhcmNoaXZlLiIpCisgICAgKGhvbWUtcGFn ZSAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy96YXRodXJhLWNiLyIpCiAgICAgKGxpY2Vuc2Ug bGljZW5zZTp6bGliKSkpCi0tIAoyLjI2LjIKCg== --MP_/4oqirp/MuC4MizmW62PmQWw Content-Type: application/octet-stream; name=0022-gnu-zathura-cb-Update-package-definition.patch Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename=0022-gnu-zathura-cb-Update-package-definition.patch RnJvbSAyZWRmZDRmOWNhZjNkMmNlYWY5YzM4MmI0MDBlNDIyZTc4ZjRlZDQ1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSYWdoYXYgR3VydXJhamFuIDxyYWdoYXZndXJ1cmFqYW5AZGlz cm9vdC5vcmc+CkRhdGU6IFRodSwgNyBNYXkgMjAyMCAyMzoyMDo0NyAtMDQwMApTdWJqZWN0OiBb UEFUQ0ggMjIvMjJdIGdudTogemF0aHVyYS1jYjogVXBkYXRlIHBhY2thZ2UgZGVmaW5pdGlvbi4K CiogZ251L3BhY2thZ2VzL3B3bXQuc2NtICh6YXRodXJhLWNiKTogTWFrZSBjaGFuZ2VzIHRvIHJl ZmxlY3QgcGFydGljdWxhcnMKb2YgcmVjZW50IHNvdXJjZSBjb2RlLgpbaW5wdXRzXTogQWRkIGNh aXJvLCBnaXJhcmEsIGdsaWIsIGd0ayssIGpzb24tYyBhbmQgbGlibm90aWZ5Lgpbc3lub3BzaXNd OiBVcGRhdGVkLgpbZGVzY3JpcHRpb25dOiBVcGRhdGVkLgotLS0KIGdudS9wYWNrYWdlcy9wd210 LnNjbSB8IDQ0ICsrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIDEg ZmlsZSBjaGFuZ2VkLCAyNiBpbnNlcnRpb25zKCspLCAxOCBkZWxldGlvbnMoLSkKCmRpZmYgLS1n aXQgYS9nbnUvcGFja2FnZXMvcHdtdC5zY20gYi9nbnUvcGFja2FnZXMvcHdtdC5zY20KaW5kZXgg YzA5MGRlYWM5MS4uNWE1MTMwOTI0YyAxMDA2NDQKLS0tIGEvZ251L3BhY2thZ2VzL3B3bXQuc2Nt CisrKyBiL2dudS9wYWNrYWdlcy9wd210LnNjbQpAQCAtMzUxLDMzICszNTEsNDEgQEAgdXNpbmcg dGhlIERqVnVMaWJyZSBsaWJyYXJ5LiIpCiAgIChwYWNrYWdlCiAgICAgKG5hbWUgInphdGh1cmEt Y2IiKQogICAgICh2ZXJzaW9uICIwLjEuOCIpCi0gICAgKHNvdXJjZSAob3JpZ2luCi0gICAgICAg ICAgICAgIChtZXRob2QgdXJsLWZldGNoKQotICAgICAgICAgICAgICAodXJpCi0gICAgICAgICAg ICAgICAoc3RyaW5nLWFwcGVuZCAiaHR0cHM6Ly9wd210Lm9yZy9wcm9qZWN0cy96YXRodXJhLWNi L2Rvd25sb2FkL3phdGh1cmEtY2ItIgotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdmVy c2lvbiAiLnRhci54eiIpKQotICAgICAgICAgICAgICAoc2hhMjU2Ci0gICAgICAgICAgICAgICAo YmFzZTMyCi0gICAgICAgICAgICAgICAgIjFpNmNmMHZrczUwMWNnZ3d2ZnNsNnFiN21kYWYzc3N6 ZHltcGhpbWZ2bnNwdzgxMGZhajUiKSkpKQorICAgIChzb3VyY2UKKyAgICAgKG9yaWdpbgorICAg ICAgIChtZXRob2QgdXJsLWZldGNoKQorICAgICAgICh1cmkKKyAgICAgICAgKHN0cmluZy1hcHBl bmQgImh0dHBzOi8vcHdtdC5vcmcvcHJvamVjdHMvemF0aHVyYS1jYi9kb3dubG9hZC96YXRodXJh LWNiLSIKKyAgICAgICAgICAgICAgICAgICAgICAgdmVyc2lvbiAiLnRhci54eiIpKQorICAgICAg IChzaGEyNTYKKyAgICAgICAgKGJhc2UzMgorICAgICAgICAgIjFpNmNmMHZrczUwMWNnZ3d2ZnNs NnFiN21kYWYzc3N6ZHltcGhpbWZ2bnNwdzgxMGZhajUiKSkpKQorICAgIChidWlsZC1zeXN0ZW0g bWVzb24tYnVpbGQtc3lzdGVtKQogICAgIChhcmd1bWVudHMKLSAgICAgYCgjOnRlc3RzPyAjZiAg ICAgICAgICAgICAgICAgICAgICA7IHBhY2thZ2UgZG9lcyBub3QgY29udGFpbiB0ZXN0cworICAg ICBgKCM6dGVzdHM/ICNmICAgICAgICAgICAgICAgICAgICAgIDsgTm8gdGFyZ2V0CiAgICAgICAg IzpwaGFzZXMKICAgICAgICAobW9kaWZ5LXBoYXNlcyAlc3RhbmRhcmQtcGhhc2VzCiAgICAgICAg ICAoYWRkLWFmdGVyICd1bnBhY2sgJ3BhdGNoLXBsdWdpbi1kaXJlY3RvcnkKLSAgICAgICAgICAg OzsgU29tZXRoaW5nIG9mIGEgcmVncmVzc2lvbiBpbiAwLjEuODogdGhlIG5ldyBNZXNvbiBidWls ZCBzeXN0ZW0KLSAgICAgICAgICAgOzsgbm93IGhhcmQtY29kZXMgYW4gaW5jb3JyZWN0IHBsdWdp biBkaXJlY3RvcnkuICBGaXggaXQuCisgICAgICAgICAgIDs7IFRoaXMgcGFja2FnZSB0cmllcyB0 byBpbnN0YWxsIGludG8gZGlyZWN0b3J5IG9mIFphdGh1cmEuCisgICAgICAgICAgIDs7IFRoYXQg Y2Fubm90IGJlIGFsbG93ZWQuIEZpeCBpdC4KICAgICAgICAgICAgKGxhbWJkYSogKCM6a2V5IG91 dHB1dHMgIzphbGxvdy1vdGhlci1rZXlzKQogICAgICAgICAgICAgIChzdWJzdGl0dXRlKiAibWVz b24uYnVpbGQiCiAgICAgICAgICAgICAgICAoKCIoaW5zdGFsbF9kaXI6KS4qIiBfIGtleSkKICAg ICAgICAgICAgICAgICAoc3RyaW5nLWFwcGVuZCBrZXkKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAiJyIgKGFzc29jLXJlZiBvdXRwdXRzICJvdXQiKSAiL2xpYi96YXRodXJhJ1xuIikp KQogICAgICAgICAgICAgICN0KSkpKSkKLSAgICAobmF0aXZlLWlucHV0cyBgKCgicGtnLWNvbmZp ZyIgLHBrZy1jb25maWcpKSkKLSAgICAoaW5wdXRzIGAoKCJsaWJhcmNoaXZlIiAsbGliYXJjaGl2 ZSkKLSAgICAgICAgICAgICAgKCJ6YXRodXJhIiAsemF0aHVyYSkpKQotICAgIChidWlsZC1zeXN0 ZW0gbWVzb24tYnVpbGQtc3lzdGVtKQotICAgIChzeW5vcHNpcyAiQ29taWMgYm9vayBzdXBwb3J0 IGZvciB6YXRodXJhIChsaWJhcmNoaXZlIGJhY2tlbmQpIikKLSAgICAoZGVzY3JpcHRpb24gIlRo ZSB6YXRodXJhLWNiIHBsdWdpbiBhZGRzIGNvbWljIGJvb2sgc3VwcG9ydCB0byB6YXRodXJhCi11 c2luZyBsaWJhcmNoaXZlLiIpCisgICAgKG5hdGl2ZS1pbnB1dHMKKyAgICAgYCgoInBrZy1jb25m aWciICxwa2ctY29uZmlnKSkpCisgICAgKGlucHV0cworICAgICBgKCgiY2Fpcm8iICxjYWlybykK KyAgICAgICAoImdpcmFyYSIgLGdpcmFyYSkKKyAgICAgICAoImdsaWIiICxnbGliKQorICAgICAg ICgiZ3RrKyIgLGd0ayspCisgICAgICAgKCJqc29uLWMiICxqc29uLWMpICAgICAgICAgICAgICA7 IFRvIGdlbmVyYXRlIGNhcmdzIGZvciB6YXRodXJhCisgICAgICAgKCJsaWJhcmNoaXZlIiAsbGli YXJjaGl2ZSkKKyAgICAgICAoImxpYm5vdGlmeSIgLGxpYm5vdGlmeSkgICAgICAgIDsgVG8gZ2Vu ZXJhdGUgY2FyZ3MgZm9yIHphdGh1cmEKKyAgICAgICAoInphdGh1cmEiICx6YXRodXJhKSkpCisg ICAgKHN5bm9wc2lzICJDb21pYyBib29rIHN1cHBvcnQgZm9yIHphdGh1cmEiKQorICAgIChkZXNj cmlwdGlvbiAiVGhlIHphdGh1cmEtY2IgcGx1Z2luIGFkZHMgY29taWMgYm9vayBzdXBwb3J0IHRv IHphdGh1cmEuIikKICAgICAoaG9tZS1wYWdlICJodHRwczovL3B3bXQub3JnL3Byb2plY3RzL3ph dGh1cmEtY2IvIikKICAgICAobGljZW5zZSBsaWNlbnNlOnpsaWIpKSkKLS0gCjIuMjYuMgoK --MP_/4oqirp/MuC4MizmW62PmQWw-- From debbugs-submit-bounces@debbugs.gnu.org Thu May 07 23:28:46 2020 Received: (at 40994) by debbugs.gnu.org; 8 May 2020 03:28:46 +0000 Received: from localhost ([127.0.0.1]:44336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWtgs-0000xh-Hq for submit@debbugs.gnu.org; Thu, 07 May 2020 23:28:46 -0400 Received: from knopi.disroot.org ([178.21.23.139]:34428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWtgq-0000xX-Uj for 40994@debbugs.gnu.org; Thu, 07 May 2020 23:28:45 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 4975535CA6; Fri, 8 May 2020 05:28:44 +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 t6TcDNpVWL9A; Fri, 8 May 2020 05:28:43 +0200 (CEST) Date: Thu, 7 May 2020 23:28:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588908523; bh=aeiUeWALqEe2w4XSBioM5WgT0qBj7VFw8hA83K7RwaI=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=WBK4vJnCfGKH1OTwnMrNGrDOB5jZdKVETk3vk5wDi6UzlWEn0aJM/jRZYChbGkKAC J3QBZlg5czQxcVR+/61FUd0qD7hhBo01wKPRXtwmeVojwhEc4X/S4gt54yNh5MfPge pqXsCrYWGDWiD0SYIic2AZwZoalrXJYIvDHFIsHHD2ZDt+eTvSkRgDI39O4rb6kgds aS7ya1Krh9qCBNfRPz3y2538yotAstj6B5NRBHp3+z5l4IQqFatRH9b8nvoMQu1Lwb PjPfe2MNy2skkFW3fJuH5RrNRyjEIHRKpAns5IPl8PgZf1O2gh5ZrqRn8En3eYZ9EP Hs7xNa2nhFhPQ== From: Raghav Gururajan To: Marius Bakke Subject: Re: [bug#40994] patch#40994 Programs With Movie Titles (PWMT) Message-ID: <20200507232817.0a98c27d.raghavgururajan@disroot.org> In-Reply-To: <87d07g50by.fsf@devup.no> References: <76c18088643dcab9d395a0f9760d3a74@waegenei.re> <20200502120901.36d80711.raghavgururajan@disroot.org> <87d07g50by.fsf@devup.no> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 Cc: 40994@debbugs.gnu.org, Brice Waegeneire 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: -1.0 (-) Hi Marius! > I'm not convinced that moving these packages are worth the effort, > though I'm not opposed to it either. What is the rationale? The idea is to put together the packages of PWMT project. The concept is similar to suckless.scm. > For each patch, please include the copyright information for that > package only. I don't think all of these people worked on girara. Yes, they have. I checked with git log. :-) > Likewise for modules: gnome, web, xorg and xdisorg seems unused for > girara. > > And (guix download). > > And gnu-build-system. > > Also make sure that the files end with a newline, like all other files > in Guix. I have made these changes and sent updated patch to the thread. Regards, RG. From debbugs-submit-bounces@debbugs.gnu.org Thu May 07 23:38:20 2020 Received: (at 40994) by debbugs.gnu.org; 8 May 2020 03:38:20 +0000 Received: from localhost ([127.0.0.1]:44342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWtq8-0001CY-E2 for submit@debbugs.gnu.org; Thu, 07 May 2020 23:38:20 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56048) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jWtq6-0001CP-Vo for 40994@debbugs.gnu.org; Thu, 07 May 2020 23:38:19 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 1853435CBD; Fri, 8 May 2020 05:38:17 +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 UOJxdLf5MUDu; Fri, 8 May 2020 05:38:16 +0200 (CEST) Date: Thu, 7 May 2020 23:37:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1588909096; bh=B8rK4vs3zbaiJSC5EcJ1NHx5uF/kPuPswYqz30rUKVk=; h=Date:From:To:Cc:Subject:In-Reply-To:References; b=V/NztbNQ13gk2/XD+pxbAQhBUwlhZbLF7c+dvzsDhsSpmVzclRbkGLIU7Q21lSJVH iD3cgL42r6n6yPsUSGpasc4pmpsSE8uPn+hX2JBDPTk84j4WJJjB6ZxarV+784lWvE sVjiCeC06nHoJPQi5R4SB4dRq/5dG++ZRoB8hNbZG0MZoiE4jDw/i4lptcDSjkdQnv 8WizNkfQ07mQ3NOUEZjCdhH2WPyLwkNh4bJOc9y+fLXE9MYfqGMUtf8nxwY4YxxlNu keXcbiMg7qWWwOZYy4v+CUmH+dUx3dTPJBJiIHIWksNQ7z7ZI0VRAAt8oFTcHKpHx1 4vv+fBY0ECaIA== From: Raghav Gururajan To: Marius Bakke Subject: Re: [bug#40994] patch#40994 Programs With Movie Titles (PWMT) Message-ID: <20200507233750.0dd05130.raghavgururajan@disroot.org> In-Reply-To: <87a72k4zd8.fsf@devup.no> References: <76c18088643dcab9d395a0f9760d3a74@waegenei.re> <20200502120901.36d80711.raghavgururajan@disroot.org> <20200503002240.3c2bf6a3.raghavgururajan@disroot.org> <87a72k4zd8.fsf@devup.no> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 40994 Cc: 40994@debbugs.gnu.org, Brice Waegeneire 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: -1.0 (-) Hi Marius! > I know it's a lot to ask, but it would be great if you could split this > up in multiple patches, one per logical change. I.e. this one patch > would be better as a series like: > > Raghav Gururajan (7): > gnu: girara: Download tarball instead of git source. > gnu: girara: Wrap with Glib variables. > gnu: girara: Add notification support. > gnu: girara: Build and install documentation. > gnu: girara: Do not propagate GTK+. > gnu: girara: Enable more features. > gnu: girara: Update synopsis & description. Oh yeah, this is lot and I cannot do at this time. But I have sent updated patch-set that splits some changes. :-) Anyway, this suggestion is very useful, so that I can use it moving forward. > I'm also skeptical about some of these (why is #:glib-or-gtk? necessary > for this library, why does GTK+ no longer need to be propagated, and > what are all those new inputs for?). By lumping everything together > it's difficult to reason about these changes. > > Same here, what do these inputs do? > > > [inputs] > libseccomp>: New inputs. > > And these? I have used comments in the package definition. :-) > Why does this plugin package need #:glib-or-gtk?. That was a mistake. I removed it in the new patch-set. > > [inputs]: New inputs. > > It's strange that all of these packages require almost the exact same > set of inputs. Perhaps they should be propagated somewhere? That's correct. cairo and girara are effect of removing propagation in zathura. I think it is better not to propagate things, unless it is absolutely necessary. Other inputs are simply required to generate 'cargs'. > I think you catch my drift here, can you send an updated series? I have sent an updated patch-set to the thread, with changes I could do at this time. :-) Regards, RG.