diff mbox series

[bug#78360,v2,4/7] gnu: cvassistant: Update quazip dependency.

Message ID dc5689a062e5c6b0b37b76dca4ef7fec69dfa0ca.1747054118.git.sarg@sarg.org.ru
State New
Headers
Series [bug#78360,v2,1/7] gnu: Switch quazip to qt6. |

Commit Message

Sergey Trofimov May 12, 2025, 12:50 p.m. UTC 
  * gnu/packages/cvassistant.scm (cvassistant)
[phases]: Adjust quazip patches.
[inputs]: Replace quazip-0 with quazip-5.

Change-Id: Ic27d28bd8429592a095b8f2f5c308c1063985b87
---
 gnu/packages/cvassistant.scm | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)
diff mbox series

Patch

diff --git a/gnu/packages/cvassistant.scm b/gnu/packages/cvassistant.scm
index 9af5c7976f..66f66a48f0 100644
--- a/gnu/packages/cvassistant.scm
+++ b/gnu/packages/cvassistant.scm
@@ -45,31 +45,25 @@  (define-public cvassistant
            ;; the INSTALL file.
            (lambda _
              (substitute* "controllers/mainwindow.cpp"
-               (("//(#define NO_DONATION_PROMPT)" _ line) line))
-             #t))
-         (add-after 'unpack 'fix-quazip-directory
-           (lambda _
-             (substitute* "models/resumedocument.h"
-               (("quazip(/quazipfile\\.h)" _ suffix)
-                (string-append "quazip5" suffix)))
-             #t))
-         (add-after 'fix-quazip-directory 'fix-quazip-link
-           (lambda _
-             (substitute* "CVAssistant.pro"
-               (("lquazip-qt5")
-                "lquazip5"))
-             #t))
-         (add-after 'fix-quazip-directory 'fix-install-root
+               (("//(#define NO_DONATION_PROMPT)" _ line) line))))
+         (add-after 'unpack 'fix-quazip
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let ((quazip
+                    (search-input-directory inputs "/include/QuaZip-Qt5-1.4")))
+
+               (substitute* "CVAssistant.pro"
+                 (("-lquazip-qt5")
+                  (format #f "-lquazip1-qt5~%INCLUDEPATH += ~a~%" quazip))))))
+         (add-after 'fix-quazip 'fix-install-root
            (lambda* (#:key outputs #:allow-other-keys)
              (let ((out (assoc-ref outputs "out")))
                (substitute* "CVAssistant.pro"
                  (("/usr/(bin|share/)" _ suffix)
-                  (string-append out "/" suffix)))
-               #t)))
+                  (string-append out "/" suffix))))))
          (replace 'configure
            (lambda _ (invoke "qmake"))))))
     (inputs
-     (list qtbase-5 quazip-0 zlib))
+     (list qtbase-5 quazip-5 zlib))
     (home-page "https://cvassistant.sourceforge.io/")
     (synopsis "Job application organizer")
     (description "Whether you're looking for a job or trying to help