~ruther/guix-local: gnu: flyer-composer, flyer-composer-cli: Update to 1.0, switch build-system.

e910fde42af297637b8b8c7d6cca5e2c89f14f49 — Hartmut Goebel 8 months ago 89d8a25

gnu: flyer-composer, flyer-composer-cli: Update to 1.0, switch build-system.

* gnu/packages/pdf.scm (flyer-composer): Update to 1.0 and switch to
pyproject-build-system.
[build-system]: Use pyproject-build-system.
[phases]: Wrap gui executable after normal wrapping.
[inputs]: Remove python-pypdf2.
[propagated-inputs]: Add python-pypdf.
[native-inputs]: Add python-setuptools and python-wheel.
* gnu/packages/pdf.scm (flyer-composer-cli): Update to 1.0.
[inputs]: Remove python-pypdf2.

Change-Id: Ia794b0bba78b565e76251b2ea97a86ef9e617b9a
Signed-off-by: Andreas Enge <andreas@enge.fr>

patch browse .tar.gz

1 files changed, 9 insertions(+), 13 deletions(-)

M gnu/packages/pdf.scm

M gnu/packages/pdf.scm => gnu/packages/pdf.scm +9 -13

@@ 324,19 324,19 @@ information.")
 (define-public flyer-composer
   (package
     (name "flyer-composer")
-    (version "1.0rc2")
+    (version "1.0")
     (source
      (origin
        (method url-fetch)
-       (uri (pypi-uri "flyer-composer" version))
+       (uri (pypi-uri "flyer_composer" version))
        (sha256
-        (base32 "17igqb5dlcgcq4nimjw6cf9qgz6a728zdx1d0rr90r2z0llcchsv"))))
-    (build-system python-build-system)
+        (base32 "1874vmz606155w9xm3r4q9xziva1mai1kyqhjg5hnndpwl09xgv5"))))
+    (build-system pyproject-build-system)
     (arguments
      `(#:tests? #f ;; TODO
        #:phases
        (modify-phases %standard-phases
-         (add-after 'install 'wrap-executable
+         (add-after 'wrap 'wrap-gui
            (lambda* (#:key inputs outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (qtbase (assoc-ref inputs "qtbase"))


@@ 346,12 346,9 @@ information.")
                    (,(string-append qtbase "/lib/qt5/plugins")))
                  `("QT_QPA_PLATFORM_PLUGIN_PATH" ":" =
                    (,(string-append qtbase "/lib/qt5/plugins/platforms"))))))))))
-    (inputs
-     (list bash-minimal
-           python-poppler-qt5
-           python-pypdf2
-           python-pyqt
-           qtbase-5))
+    (native-inputs (list python-setuptools python-wheel))
+    (propagated-inputs (list python-pypdf))
+    (inputs (list bash-minimal python-poppler-qt5 python-pyqt qtbase-5))
     (home-page "http://crazy-compilers.com/flyer-composer")
     (synopsis "Rearrange PDF pages to print as flyers on one sheet")
     (description "@command{flyer-composer} can be used to prepare one- or


@@ 379,8 376,7 @@ This package contains both the command line tool and the gui too.")
              (substitute* "setup.cfg"
                (("^\\s+flyer-composer-gui\\s*=.*") ""))
              #t)))))
-    (inputs
-     `(("python-pypdf2" ,python-pypdf2)))
+    (inputs (list)) ; clear the gui inputs
     (description "@command{flyer-composer} can be used to prepare one- or
 two-sided flyers for printing on one sheet of paper.