bug#56901: closed ([PATCH] gnu: qt5ct: Fix build)

[GNU bug Tracking System]

Your message dated Wed, 03 Aug 2022 11:14:04 +0800
with message-id <87h72uqarn.fsf@envs.net>
and subject line Re: bug#56901: [PATCH] gnu: qt5ct: Fix build
has caused the debbugs.gnu.org bug report #56901,
regarding [PATCH] gnu: qt5ct: Fix build
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
56901: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=56901
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] gnu: qt5ct: Fix build
>
>
>
>
> Date: 
>
> Tue,  2 Aug 2022 22:00:02 -0400
>
>
>
>
> From: Morgan Smith <Morgan.J.Smith@outlook.com>
>
> * gnu/packages/qt.scm (qt5ct)
> [build-system]: Change to qt-build-system
> [phases]: Replace
> [inputs]: Remove qtbase-5
> [modules]: Removed
> [impoorted-modules]: Removed
> ---
>  gnu/packages/qt.scm | 39 ++++++++++++---------------------------
>  1 file changed, 12 insertions(+), 27 deletions(-)
>
> diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
> index f74f84f2ac..86f5d11714 100644
> --- a/gnu/packages/qt.scm
> +++ b/gnu/packages/qt.scm
> @@ -159,37 +159,22 @@ (define-public qt5ct
>          (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2"))
>         (sha256
>          (base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn"))))
> -    (build-system gnu-build-system)
> +    (build-system qt-build-system)
>      (arguments
> -     `(#:tests? #f                      ; No target
> -       #:imported-modules
> -       (,@%qt-build-system-modules)
> -       #:modules
> -       ((guix build gnu-build-system)
> -        ((guix build qt-build-system)
> -         #:prefix qt:)
> -        (guix build utils))
> -       #:phases
> -       (modify-phases %standard-phases
> -         (add-after 'unpack 'patch
> -           (lambda* (#:key inputs #:allow-other-keys)
> -             (substitute* "qt5ct.pro"
> -               (("\\$\\$\\[QT_INSTALL_BINS\\]/lrelease")
> -                (search-input-file inputs "/bin/lrelease")))))
> -         (replace 'configure
> -           (lambda* (#:key outputs #:allow-other-keys)
> -             (let* ((out (assoc-ref outputs "out")))
> -               (invoke "qmake"
> -                       (string-append "PREFIX=" out)
> -                       (string-append "BINDIR=" out "/bin")
> -                       (string-append "DATADIR=" out "/share")
> -                       (string-append "PLUGINDIR=" out "/lib/qt5/plugins")))))
> -         (add-after 'install 'qt-wrap
> -           (assoc-ref qt:%standard-phases 'qt-wrap)))))
> +     (list
> +      #:tests? #f                      ; No target
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (add-after 'unpack 'patch
> +            (lambda _
> +              (substitute* '("src/qt5ct-qtplugin/CMakeLists.txt"
> +                             "src/qt5ct-style/CMakeLists.txt")
> +                (("\\$\\{PLUGINDIR\\}")
> +                 (string-append #$output "/lib/qt5/plugins"))))))))
>      (native-inputs
>       (list qttools-5))
>      (inputs
> -     (list qtbase-5 qtsvg-5))
> +     (list qtsvg-5))
>      (synopsis "Qt5 Configuration Tool")
>      (description "Qt5CT is a program that allows users to configure Qt5
>  settings (such as icons, themes, and fonts) in desktop environments or
> -- 
> 2.37.1
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#56901: [PATCH] gnu: qt5ct: Fix build
>
>
>
>
> Date: 
>
> Wed, 03 Aug 2022 11:14:04 +0800
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/28.1 (gnu/linux)
>
>
>
>
> Morgan.J.Smith@outlook.com writes:
>
> > From: Morgan Smith <Morgan.J.Smith@outlook.com>
> >
> > * gnu/packages/qt.scm (qt5ct)
> > [build-system]: Change to qt-build-system
>
> Applied with some simplify for commit message, thank you!
>
>
> --- End Message ---