* [bug#74061] [PATCH] gnu: commit: Use Qt6.
@ 2024-10-28 12:54 Sughosha via Guix-patches via
2024-10-31 7:44 ` Z572
0 siblings, 1 reply; 3+ messages in thread
From: Sughosha via Guix-patches via @ 2024-10-28 12:54 UTC (permalink / raw)
To: 74061; +Cc: Sughosha
* gnu/packages/kde.scm (kommit): Use Qt6.
[arguments]<qtbase>: New argument.
<configure-flags>: New argument.
[native-inputs]: Replace kdoctools-5 with kdoctools.
[inputs]: Replace kconfigwidgets-5 with kconfigwidgets, kcoreaddons-5 with
kcoreaddons, kcrash-5 with kcrash, kdbusaddons-5 with kdbusaddons, ki18n-5 with
ki18n, kxmlgui-5 with kxmlgui, kio-5 with kio, ktextwidgets-5 with
ktextwidgets, ktexteditor-5 with ktexteditor, ksyntaxhighlighting-5 with
ksyntaxhighlighting. Add dolphin.
Change-Id: I04ad9f42a74b3a21625f85ae8e47df4f5553b6f2
---
gnu/packages/kde.scm | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index 2226230aab..95b44d80d3 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -83,6 +83,8 @@ (define-module (gnu packages kde)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages kde-pim)
#:use-module (gnu packages kde-plasma)
+ ;; Including this module breaks the build.
+ ;#:use-module ((gnu packages kde-systemtools) #:select (dolphin))
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages llvm)
@@ -1065,7 +1067,10 @@ (define-public kommit
"09ahnizl5mqdrg583lxkwwnsq8ci95fk49wx9733ah4c39gync5c"))))
(build-system qt-build-system)
(arguments
- (list #:phases
+ (list #:qtbase qtbase
+ #:configure-flags
+ #~(list "-DQT_MAJOR_VERSION=6")
+ #:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
@@ -1076,18 +1081,23 @@ (define-public kommit
branchestest|configtest|stashtest|filetest|overlaytest|remotetest|clonetest|\
submoduletest)")))))))
(native-inputs
- (list extra-cmake-modules kdoctools-5 pkg-config))
+ (list extra-cmake-modules kdoctools pkg-config))
(inputs
- (list kconfigwidgets-5
- kcoreaddons-5
- kcrash-5
- kdbusaddons-5
- ki18n-5
- kxmlgui-5
- kio-5
- ktextwidgets-5
- ktexteditor-5
- ksyntaxhighlighting-5
+ (list ;; module cyclic referencing
+ (module-ref
+ (resolve-interface
+ '(gnu packages kde-systemtools))
+ 'dolphin) ;for dolphin plugin
+ kconfigwidgets
+ kcoreaddons
+ kcrash
+ kdbusaddons
+ ki18n
+ kxmlgui
+ kio
+ ktextwidgets
+ ktexteditor
+ ksyntaxhighlighting
libgit2-1.8))
(home-page "https://apps.kde.org/kommit/")
(synopsis "Git client for KDE")
base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9
--
2.46.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* [bug#74061] [PATCH] gnu: commit: Use Qt6.
2024-10-28 12:54 [bug#74061] [PATCH] gnu: commit: Use Qt6 Sughosha via Guix-patches via
@ 2024-10-31 7:44 ` Z572
2024-11-01 7:34 ` bug#74061: " Z572
0 siblings, 1 reply; 3+ messages in thread
From: Z572 @ 2024-10-31 7:44 UTC (permalink / raw)
To: 74061; +Cc: sughosha
[-- Attachment #1: Type: text/plain, Size: 3043 bytes --]
Sughosha via Guix-patches via <guix-patches@gnu.org> writes:
> * gnu/packages/kde.scm (kommit): Use Qt6.
> [arguments]<qtbase>: New argument.
> <configure-flags>: New argument.
> [native-inputs]: Replace kdoctools-5 with kdoctools.
> [inputs]: Replace kconfigwidgets-5 with kconfigwidgets, kcoreaddons-5 with
> kcoreaddons, kcrash-5 with kcrash, kdbusaddons-5 with kdbusaddons, ki18n-5 with
> ki18n, kxmlgui-5 with kxmlgui, kio-5 with kio, ktextwidgets-5 with
> ktextwidgets, ktexteditor-5 with ktexteditor, ksyntaxhighlighting-5 with
> ksyntaxhighlighting. Add dolphin.
>
> Change-Id: I04ad9f42a74b3a21625f85ae8e47df4f5553b6f2
> ---
> gnu/packages/kde.scm | 34 ++++++++++++++++++++++------------
> 1 file changed, 22 insertions(+), 12 deletions(-)
>
> diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
> index 2226230aab..95b44d80d3 100644
> --- a/gnu/packages/kde.scm
> +++ b/gnu/packages/kde.scm
> @@ -83,6 +83,8 @@ (define-module (gnu packages kde)
> #:use-module (gnu packages kde-frameworks)
> #:use-module (gnu packages kde-pim)
> #:use-module (gnu packages kde-plasma)
> + ;; Including this module breaks the build.
> + ;#:use-module ((gnu packages kde-systemtools) #:select (dolphin))
> #:use-module (gnu packages libusb)
> #:use-module (gnu packages linux)
> #:use-module (gnu packages llvm)
> @@ -1065,7 +1067,10 @@ (define-public kommit
> "09ahnizl5mqdrg583lxkwwnsq8ci95fk49wx9733ah4c39gync5c"))))
> (build-system qt-build-system)
> (arguments
> - (list #:phases
> + (list #:qtbase qtbase
> + #:configure-flags
> + #~(list "-DQT_MAJOR_VERSION=6")
> + #:phases
> #~(modify-phases %standard-phases
> (replace 'check
> (lambda* (#:key tests? #:allow-other-keys)
> @@ -1076,18 +1081,23 @@ (define-public kommit
> branchestest|configtest|stashtest|filetest|overlaytest|remotetest|clonetest|\
> submoduletest)")))))))
> (native-inputs
> - (list extra-cmake-modules kdoctools-5 pkg-config))
> + (list extra-cmake-modules kdoctools pkg-config))
> (inputs
> - (list kconfigwidgets-5
> - kcoreaddons-5
> - kcrash-5
> - kdbusaddons-5
> - ki18n-5
> - kxmlgui-5
> - kio-5
> - ktextwidgets-5
> - ktexteditor-5
> - ksyntaxhighlighting-5
> + (list ;; module cyclic referencing
> + (module-ref
> + (resolve-interface
> + '(gnu packages kde-systemtools))
> + 'dolphin) ;for dolphin plugin
> + kconfigwidgets
> + kcoreaddons
> + kcrash
> + kdbusaddons
> + ki18n
> + kxmlgui
> + kio
> + ktextwidgets
> + ktexteditor
> + ksyntaxhighlighting
> libgit2-1.8))
> (home-page "https://apps.kde.org/kommit/")
> (synopsis "Git client for KDE")
>
> base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9
push, and fix typo.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#74061: [PATCH] gnu: commit: Use Qt6.
2024-10-31 7:44 ` Z572
@ 2024-11-01 7:34 ` Z572
0 siblings, 0 replies; 3+ messages in thread
From: Z572 @ 2024-11-01 7:34 UTC (permalink / raw)
To: Sughosha via Guix-patches via; +Cc: 74061-done, Sughosha
[-- Attachment #1: Type: text/plain, Size: 3174 bytes --]
Z572 <zhengjunjie@iscas.ac.cn> writes:
> Sughosha via Guix-patches via <guix-patches@gnu.org> writes:
>
>> * gnu/packages/kde.scm (kommit): Use Qt6.
>> [arguments]<qtbase>: New argument.
>> <configure-flags>: New argument.
>> [native-inputs]: Replace kdoctools-5 with kdoctools.
>> [inputs]: Replace kconfigwidgets-5 with kconfigwidgets, kcoreaddons-5 with
>> kcoreaddons, kcrash-5 with kcrash, kdbusaddons-5 with kdbusaddons, ki18n-5 with
>> ki18n, kxmlgui-5 with kxmlgui, kio-5 with kio, ktextwidgets-5 with
>> ktextwidgets, ktexteditor-5 with ktexteditor, ksyntaxhighlighting-5 with
>> ksyntaxhighlighting. Add dolphin.
>>
>> Change-Id: I04ad9f42a74b3a21625f85ae8e47df4f5553b6f2
>> ---
>> gnu/packages/kde.scm | 34 ++++++++++++++++++++++------------
>> 1 file changed, 22 insertions(+), 12 deletions(-)
>>
>> diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
>> index 2226230aab..95b44d80d3 100644
>> --- a/gnu/packages/kde.scm
>> +++ b/gnu/packages/kde.scm
>> @@ -83,6 +83,8 @@ (define-module (gnu packages kde)
>> #:use-module (gnu packages kde-frameworks)
>> #:use-module (gnu packages kde-pim)
>> #:use-module (gnu packages kde-plasma)
>> + ;; Including this module breaks the build.
>> + ;#:use-module ((gnu packages kde-systemtools) #:select (dolphin))
>> #:use-module (gnu packages libusb)
>> #:use-module (gnu packages linux)
>> #:use-module (gnu packages llvm)
>> @@ -1065,7 +1067,10 @@ (define-public kommit
>> "09ahnizl5mqdrg583lxkwwnsq8ci95fk49wx9733ah4c39gync5c"))))
>> (build-system qt-build-system)
>> (arguments
>> - (list #:phases
>> + (list #:qtbase qtbase
>> + #:configure-flags
>> + #~(list "-DQT_MAJOR_VERSION=6")
>> + #:phases
>> #~(modify-phases %standard-phases
>> (replace 'check
>> (lambda* (#:key tests? #:allow-other-keys)
>> @@ -1076,18 +1081,23 @@ (define-public kommit
>> branchestest|configtest|stashtest|filetest|overlaytest|remotetest|clonetest|\
>> submoduletest)")))))))
>> (native-inputs
>> - (list extra-cmake-modules kdoctools-5 pkg-config))
>> + (list extra-cmake-modules kdoctools pkg-config))
>> (inputs
>> - (list kconfigwidgets-5
>> - kcoreaddons-5
>> - kcrash-5
>> - kdbusaddons-5
>> - ki18n-5
>> - kxmlgui-5
>> - kio-5
>> - ktextwidgets-5
>> - ktexteditor-5
>> - ksyntaxhighlighting-5
>> + (list ;; module cyclic referencing
>> + (module-ref
>> + (resolve-interface
>> + '(gnu packages kde-systemtools))
>> + 'dolphin) ;for dolphin plugin
>> + kconfigwidgets
>> + kcoreaddons
>> + kcrash
>> + kdbusaddons
>> + ki18n
>> + kxmlgui
>> + kio
>> + ktextwidgets
>> + ktexteditor
>> + ksyntaxhighlighting
>> libgit2-1.8))
>> (home-page "https://apps.kde.org/kommit/")
>> (synopsis "Git client for KDE")
>>
>> base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9
>
> push, and fix typo.
close.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-11-01 7:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-28 12:54 [bug#74061] [PATCH] gnu: commit: Use Qt6 Sughosha via Guix-patches via
2024-10-31 7:44 ` Z572
2024-11-01 7:34 ` bug#74061: " Z572
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).