Subject: bug#74061: closed (Re: [bug#74061] [PATCH] gnu: commit: Use Qt6.)

From: [email-masked] (GNU bug Tracking System)
Date: Fri, 01 Nov 2024 07:35:02 +0000

Your bug report

#74061: gnu: kommit: Use Qt6.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
74061: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=74061
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#74061] [PATCH] gnu: commit: Use Qt6.
From: Z572 <[email-masked]>
To: Sughosha via Guix-patches via <[email-masked]>
Cc: [email-masked], Sughosha <[email-masked]>
Date: Fri, 01 Nov 2024 15:34:33 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Z572 <[email-masked]> writes:

> Sughosha via Guix-patches via <[email-masked]> 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.

Subject: [PATCH] gnu: commit: Use Qt6.
From: Sughosha <[email-masked]>
To: [email-masked]
Cc: Sughosha <[email-masked]>
Date: Mon, 28 Oct 2024 18:24:56 +0530
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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