[bug#61761] [PATCH 0/2] Update qpdfview

[bug#61761] [PATCH 0/2] Update qpdfview

[Timotej Lazar]

Timotej Lazar (2):
  gnu: qpdfview: Update to 0.5.0.
  gnu: qpdfview: Use new package style.

 gnu/local.mk                                  |  1 -
 .../patches/qpdfview-qt515-compat.patch       | 17 --------------
 gnu/packages/pdf.scm                          | 23 +++++++++----------
 3 files changed, 11 insertions(+), 30 deletions(-)
 delete mode 100644 gnu/packages/patches/qpdfview-qt515-compat.patch

-- 
2.39.1

[bug#61761] [PATCH 1/2] gnu: qpdfview: Update to 0.5.0.

[Timotej Lazar]

* gnu/packages/pdf.scm (qpdfview): Update to 0.5.0.
* gnu/packages/patches/qpdfview-qt515-compat.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/local.mk                                    |  1 -
 .../patches/qpdfview-qt515-compat.patch         | 17 -----------------
 gnu/packages/pdf.scm                            |  7 +++----
 3 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 gnu/packages/patches/qpdfview-qt515-compat.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 0838f66618..9ae37a9bb4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1770,7 +1770,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/qemu-glibc-2.27.patch 			\
   %D%/packages/patches/qemu-glibc-2.30.patch 			\
   %D%/packages/patches/qemu-fix-agent-paths.patch 		\
-  %D%/packages/patches/qpdfview-qt515-compat.patch		\
   %D%/packages/patches/qrcodegen-cpp-make-install.patch		\
   %D%/packages/patches/qtbase-absolute-runpath.patch		\
   %D%/packages/patches/qtbase-moc-ignore-gcc-macro.patch	\
diff --git a/gnu/packages/patches/qpdfview-qt515-compat.patch b/gnu/packages/patches/qpdfview-qt515-compat.patch
deleted file mode 100644
index 1fbf5ec3f1..0000000000
--- a/gnu/packages/patches/qpdfview-qt515-compat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fix compatibility with Qt 5.15.
-
-Patch copied from upstream source repository:
-
-https://bazaar.launchpad.net/~adamreichold/qpdfview/trunk/revision/2104
-
---- a/sources/model.h	2017-04-19 21:01:25 +0000
-+++ b/sources/model.h	2020-06-09 06:24:11 +0000
-@@ -24,6 +24,7 @@
- #define DOCUMENTMODEL_H
- 
- #include <QList>
-+#include <QPainterPath>
- #include <QtPlugin>
- #include <QWidget>
- #include <QVector>
-
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index c040afcae7..9926739973 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -888,16 +888,15 @@ (define-public qpdf
 (define-public qpdfview
   (package
     (name "qpdfview")
-    (version "0.4.18")
+    (version "0.5.0")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://launchpad.net/qpdfview/"
                            "trunk/" version "/+download/"
-                           "qpdfview-" version ".tar.gz"))
+                           "qpdfview-" (version-major+minor version) ".tar.gz"))
        (sha256
-        (base32 "0v1rl126hvblajnph2hkansgi0s8vjdc5yxrm4y3faa0lxzjwr6c"))
-       (patches (search-patches "qpdfview-qt515-compat.patch"))))
+        (base32 "16dy341927r2s1dza7g8ci1jyypfc4a6yfcvg9sxvjv1li0c9vs4"))))
     (build-system qt-build-system)
     (native-inputs
      (list pkg-config))
-- 
2.39.1

[bug#61761] [PATCH 2/2] gnu: qpdfview: Use new package style.

[Timotej Lazar]

* gnu/packages/pdf.scm (qpdfview)[arguments]: Use gexps.
---
 gnu/packages/pdf.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 9926739973..6eee460740 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -908,14 +908,14 @@ (define-public qpdfview
            qtbase-5
            qtsvg-5))
     (arguments
-     `(#:tests? #f ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (substitute* "qpdfview.pri"
-               (("/usr") (assoc-ref outputs "out")))
-             (invoke "qmake" "qpdfview.pro"))))))
+     (list #:tests? #f ; no tests
+           #:phases
+           #~(modify-phases %standard-phases
+               (replace 'configure
+                 (lambda _
+                   (substitute* "qpdfview.pri"
+                     (("/usr") #$output))
+                   (invoke "qmake" "qpdfview.pro"))))))
     (home-page "https://launchpad.net/qpdfview")
     (synopsis "Tabbed document viewer")
     (description "@command{qpdfview} is a document viewer for PDF, PS and DJVU
-- 
2.39.1

bug#61761: [PATCH 0/2] Update qpdfview

[Leo Famulari]

On Fri, Feb 24, 2023 at 05:32:41PM +0100, Timotej Lazar wrote:
> Timotej Lazar (2):
>   gnu: qpdfview: Update to 0.5.0.
>   gnu: qpdfview: Use new package style.

Thanks! Pushed as 5609d7dab9b606247b65bd303ffdaa2b24d58f82