[PATCH 0/4] Some smaller KDE changes.

Done

Details

2 participants

Efraim Flashner
Hartmut Goebel

Owner: unassigned

Submitted by: Hartmut Goebel

Severity: normal

Hartmut Goebel wrote on 25 Oct 2020 22:05

Recipients:(address . guix-patches@gnu.org)

Message-ID:cover.1603659776.git.h.goebel@crazy-compilers.com

Hartmut Goebel (4):
  gnu: plasma-framework: Fix build errors in dependent packages.
  gnu: kpackage: Fix build errors in dependent packages.
  gnu: Add kuserfeedback.
  gnu: kscreenlocker: Use qt-build-system.

 gnu/packages/kde-frameworks.scm               |  6 ++-
 gnu/packages/kde-plasma.scm                   |  7 ++-
 gnu/packages/kde.scm                          | 48 ++++++++++++++++++-
 .../kpackage-fix-KF5PackageMacros.cmake.patch | 25 ++++++++++
 ...-framework-fix-KF5PlasmaMacros.cmake.patch | 25 ++++++++++
 5 files changed, 104 insertions(+), 7 deletions(-)
 create mode 100644 gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch
 create mode 100644 gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch

-- 
2.21.3

Hartmut Goebel wrote on 25 Oct 2020 22:09

[PATCH 1/4] gnu: plasma-framework: Fix build errors in dependent packages.

Recipients:

Message-ID:bec802ee810d1bc3f9cdde958328a78f767390de.1603659776.git.h.goebel@crazy-compilers.com

Fix build errors in dependent packages if PREFIX is different from ECM's
PREFIX - which is the case in Guix.  See https://bugs.kde.org/424483 for
details.

* gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch: New
  file.
* packages/kde-frameworks.scm (plasma-framework)[source]: Use this patch.
---
 gnu/packages/kde-frameworks.scm               |  3 ++-
 ...-framework-fix-KF5PlasmaMacros.cmake.patch | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch

Toggle diff (47 lines)diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index c4479de995..cbcb8ff076 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3449,7 +3449,8 @@ setUrl, setUserAgent and call.")
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "06cxajsxj62g3c37ssrrcaxb9a12zbyp2kvrjqym329k5vd89272"))))
+                "06cxajsxj62g3c37ssrrcaxb9a12zbyp2kvrjqym329k5vd89272"))
+              (patches (search-patches "plasma-framework-fix-KF5PlasmaMacros.cmake.patch"))))
     (build-system cmake-build-system)
     (propagated-inputs
      `(("kpackage" ,kpackage)
diff --git a/gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch b/gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch
new file mode 100644
index 0000000000..bd55d512cf
--- /dev/null
+++ b/gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch
@@ -0,0 +1,25 @@
+From ff5ed26f21d304e867ab57781878069567deb23d Mon Sep 17 00:00:00 2001
+From: Hartmut Goebel <h.goebel@crazy-compilers.com>
+Date: Mon, 3 Aug 2020 19:49:58 +0000
+Subject: [PATCH] Fix build errors if PREFIX is different from ECM's PREFIX.
+
+See <https://bugs.kde.org/424483> for details
+---
+ KF5PlasmaMacros.cmake | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/KF5PlasmaMacros.cmake b/KF5PlasmaMacros.cmake
+index 494b42d56..80b3fd8dd 100644
+--- a/KF5PlasmaMacros.cmake
++++ b/KF5PlasmaMacros.cmake
+@@ -1,6 +1,5 @@
+ 
+-find_package(ECM 1.6.0 CONFIG REQUIRED)
+-include(${ECM_KDE_MODULE_DIR}/KDEInstallDirs.cmake)
++include(KDEInstallDirs)
+ 
+ set(PLASMA_RELATIVE_DATA_INSTALL_DIR "plasma")
+ set(PLASMA_DATA_INSTALL_DIR "${KDE_INSTALL_DATADIR}/${PLASMA_RELATIVE_DATA_INSTALL_DIR}")
+-- 
+GitLab
+
-- 
2.21.3

Hartmut Goebel wrote on 25 Oct 2020 22:09

[PATCH 2/4] gnu: kpackage: Fix build errors in dependent packages.

Recipients:

Message-ID:fd79da3b13cab20660f8a2bdeb7265d6d31ec139.1603659776.git.h.goebel@crazy-compilers.com

Fix build errors in dependent packages if PREFIX is different from ECM's
PREFIX - which is the case in Guix.  See https://bugs.kde.org/424483 for
details.

* gnu/packages/patches/plasma-framework-fix-KF5PackageMacros.cmake.patch: New
  file.
* packages/kde-frameworks.scm (package)[source]: Use this patch.
---
 gnu/packages/kde-frameworks.scm               |  3 ++-
 .../kpackage-fix-KF5PackageMacros.cmake.patch | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch

Toggle diff (47 lines)diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index cbcb8ff076..febdb1f4f0 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1963,7 +1963,8 @@ covers feedback and persistent events.")
                 "03rp7p7i8ihz5wg58gjs638jk7xbszknfiy2j3r979snc57g95mv"))
               ;; Default to: external paths/symlinks can be followed by a
               ;; package
-              (patches (search-patches "kpackage-allow-external-paths.patch"))))
+              (patches (search-patches "kpackage-allow-external-paths.patch"
+                                       "kpackage-fix-KF5PackageMacros.cmake.patch"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)))
diff --git a/gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch b/gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch
new file mode 100644
index 0000000000..d677f19a70
--- /dev/null
+++ b/gnu/packages/patches/kpackage-fix-KF5PackageMacros.cmake.patch
@@ -0,0 +1,25 @@
+From 668010ebc9fd84d9dc60f90b9a4ebf3c7054977f Mon Sep 17 00:00:00 2001
+From: Hartmut Goebel <h.goebel@crazy-compilers.com>
+Date: Sun, 25 Oct 2020 20:11:13 +0000
+Subject: [PATCH] Fix build errors if PREFIX is different from ECM's PREFIX.
+
+See <https://bugs.kde.org/424483> for details.
+---
+ KF5PackageMacros.cmake | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/KF5PackageMacros.cmake b/KF5PackageMacros.cmake
+index f4c1d1d..acd3798 100644
+--- a/KF5PackageMacros.cmake
++++ b/KF5PackageMacros.cmake
+@@ -1,6 +1,5 @@
+ 
+-find_package(ECM 1.6.0 CONFIG REQUIRED)
+-include(${ECM_KDE_MODULE_DIR}/KDEInstallDirs.cmake)
++include(KDEInstallDirs)
+ 
+ set(KPACKAGE_RELATIVE_DATA_INSTALL_DIR "kpackage")
+ 
+-- 
+GitLab
+
-- 
2.21.3

Hartmut Goebel wrote on 25 Oct 2020 22:09

[PATCH 3/4] gnu: Add kuserfeedback.

Recipients:

Message-ID:bd2dda8b5d512d2c6653ea0329a6ba5663e7659d.1603659776.git.h.goebel@crazy-compilers.com

* gnu/packages/kde.scm (kuserfeedback): New variable.

---

gnu/packages/kde.scm | 48 +++++++++++++++++++++++++++++++++++++++++++-

1 file changed, 47 insertions(+), 1 deletion(-)

Toggle diff (78 lines)diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index f38f64253b..2751e6d04d 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Gábor Boskovits <boskovits@gmail.com>
 ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
-;;; Copyright © 2018, 2019 Hartmut Goebel <h.goebel@crazy-compilers.com>
+;;; Copyright © 2018, 2019, 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2019, 2020 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2020 Marius Bakke <marius@gnu.org>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
@@ -40,12 +40,14 @@
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages apr)
   #:use-module (gnu packages audio)
+  #:use-module (gnu packages bison)
   #:use-module (gnu packages boost)
   #:use-module (gnu packages code)
   #:use-module (gnu packages cpp)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages flex)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages gl)
@@ -790,3 +792,47 @@ services such as printers which advertise themselves with DNSSD (called Avahi
 or Bonjour by other projects).")
     (license ;; GPL for programs, LGPL for libraries, FDL for documentation
      (list license:gpl2+ license:lgpl2.0+ license:fdl1.2+))))
+
+
+(define-public kuserfeedback
+  ;; FIXME: Try to reduce data collection and ensure transmission i disabled by default.
+  ;; FIXME: Check https://www.reddit.com/r/kde/comments/f7ojg9 for insights
+  (package
+    (name "kuserfeedback")
+    (version "1.0.0")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://kde/stable/kuserfeedback/"
+                           "/kuserfeedback-" version ".tar.xz"))
+       (sha256
+        (base32 "1dwx9fscnfp3zsxdir774skn8xvad2dvscnaaw3ji6mrnkmm6bss"))))
+    (build-system qt-build-system)
+    (native-inputs
+     `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("qttools" ,qttools)
+       ;; For optional component "Survey target expression parser"
+       ("bison" ,bison)
+       ("flex" ,flex)
+       ;; For syntax checking and unit tests of PHP server code
+       ;;("php" ,php)
+       ;;("phpunit" ,phpunit)
+       ))
+    (inputs
+     `(("qtbase" ,qtbase)
+       ("qtcharts" ,qtcharts)
+       ("qtdeclarative" ,qtdeclarative)
+       ("qtsvg" ,qtsvg)))
+    (arguments
+     `(#:tests? #f))  ;; 4/17 fail
+    (home-page "https://api.kde.org/frameworks/kuserfeedback/html/")
+    (synopsis "Framework for collecting feedback from application users via
+telemetry and targeted surveys")
+    (description "This framework consists of the following components:
+@itermize
+@item Libraries for use in applications.
+@item QML bindings for the above.
+@item A server application.
+@item A management and analytics application.
+@end itemize")
+    (license license:expat)))
-- 
2.21.3

Hartmut Goebel wrote on 25 Oct 2020 22:09

[PATCH 4/4] gnu: kscreenlocker: Use qt-build-system.

Recipients:

Message-ID:24b476c4814e1bd8271451010f11df3c3b08c505.1603659776.git.h.goebel@crazy-compilers.com

* gnu/packages/kde-plasma.scm (kscreeenlocker)[buoild-system]: Change to
  qt-build-system. [arguments]{phases}<check> Remove unsued code; Actually
  disable running the tests.
---
 gnu/packages/kde-plasma.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Toggle diff (30 lines)diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index ce6abb3a65..6e6213161c 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -70,7 +70,7 @@ manager which re-parents a Client window to a window decoration frame.")
               (sha256
                (base32
                 "1lhq9rxafbbxwpwzq8m25xi9hgcdfdfwl8hafqhygzp14z89q9ml"))))
-    (build-system cmake-build-system)
+    (build-system qt-build-system)
     (arguments
      `(#:phases
        (modify-phases %standard-phases
@@ -84,12 +84,11 @@ manager which re-parents a Client window to a window decoration frame.")
          ;; Tests use the installed library and require a DBus session.
          (add-after 'install 'check
            (lambda _
-             (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
-             (invoke "dbus-launch" "ctest" "."))))))
+             ;;(invoke "dbus-launch" "ctest" ".") ;; FIXME: try to make this pass
+             #t)))))
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
-
        ;; For tests.
        ("dbus" ,dbus)
        ("xorg-server" ,xorg-server-for-tests)))
-- 
2.21.3

Efraim Flashner wrote on 27 Oct 2020 09:53

Re: [bug#44215] [PATCH 1/4] gnu: plasma-framework: Fix build errors in dependent packages.

Recipients:(name . Hartmut Goebel)(address . h.goebel@crazy-compilers.com)(address . 44215@debbugs.gnu.org)

Message-ID:20201027085337.GH10124@E5400

On Sun, Oct 25, 2020 at 10:09:19PM +0100, Hartmut Goebel wrote:

Toggle quote (13 lines)> Fix build errors in dependent packages if PREFIX is different from ECM's
> PREFIX - which is the case in Guix.  See <https://bugs.kde.org/424483> for
> details.
> 
> * gnu/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch: New
>   file.
> * packages/kde-frameworks.scm (plasma-framework)[source]: Use this patch.
> ---
>  gnu/packages/kde-frameworks.scm               |  3 ++-
>  ...-framework-fix-KF5PlasmaMacros.cmake.patch | 25 +++++++++++++++++++
>  2 files changed, 27 insertions(+), 1 deletion(-)
> 

Don't forget to register the patch in gnu/local.mk

-- 
Efraim Flashner   <efraim@flashner.co.il>   ????? ?????
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Efraim Flashner wrote on 27 Oct 2020 09:54

Re: [bug#44215] [PATCH 2/4] gnu: kpackage: Fix build errors in dependent packages.

Recipients:(name . Hartmut Goebel)(address . h.goebel@crazy-compilers.com)(address . 44215@debbugs.gnu.org)

Message-ID:20201027085440.GI10124@E5400

Same here about registering the patch

Efraim Flashner <efraim@flashner.co.il> ????? ?????

GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351

Confidentiality cannot be guaranteed on emails sent or received unencrypted

Efraim Flashner wrote on 27 Oct 2020 09:57

Re: [bug#44215] [PATCH 4/4] gnu: kscreenlocker: Use qt-build-system.

Recipients:(name . Hartmut Goebel)(address . h.goebel@crazy-compilers.com)(address . 44215@debbugs.gnu.org)

Message-ID:20201027085758.GJ10124@E5400

How about gating the tests behind the tests? flag?

On Sun, Oct 25, 2020 at 10:09:22PM +0100, Hartmut Goebel wrote:

Toggle quote (20 lines)> * gnu/packages/kde-plasma.scm (kscreeenlocker)[buoild-system]: Change to
>   qt-build-system. [arguments]{phases}<check> Remove unsued code; Actually
>   disable running the tests.
> ---
>  gnu/packages/kde-plasma.scm | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
> 
> diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
> index ce6abb3a65..6e6213161c 100644
> --- a/gnu/packages/kde-plasma.scm
> +++ b/gnu/packages/kde-plasma.scm
> @@ -70,7 +70,7 @@ manager which re-parents a Client window to a window decoration frame.")
>                (sha256
>                 (base32
>                  "1lhq9rxafbbxwpwzq8m25xi9hgcdfdfwl8hafqhygzp14z89q9ml"))))
> -    (build-system cmake-build-system)
> +    (build-system qt-build-system)
>      (arguments
>       `(#:phases

`(#:tests? #f

#:phases

Toggle quote (10 lines)>         (modify-phases %standard-phases
> @@ -84,12 +84,11 @@ manager which re-parents a Client window to a window decoration frame.")
>           ;; Tests use the installed library and require a DBus session.
>           (add-after 'install 'check
>             (lambda _
> -             (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
> -             (invoke "dbus-launch" "ctest" "."))))))
> +             ;;(invoke "dbus-launch" "ctest" ".") ;; FIXME: try to make this pass
> +             #t)))))

(lambda* (#:key tests? #:allow-other-keys)

(setenv "CTEST_OUTPUT_ON_FAILURE" "1")

(if tests?

(invoke "dbus-launch" "ctest" ".")

#t))

Toggle quote (14 lines)>      (native-inputs
>       `(("extra-cmake-modules" ,extra-cmake-modules)
>         ("pkg-config" ,pkg-config)
> -
>         ;; For tests.
>         ("dbus" ,dbus)
>         ("xorg-server" ,xorg-server-for-tests)))
> -- 
> 2.21.3
> 
> 
> 
> 

-- 
Efraim Flashner   <efraim@flashner.co.il>   ????? ?????
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Hartmut Goebel wrote on 27 Oct 2020 20:17

Recipients:(name . Efraim Flashner)(address . efraim@flashner.co.il)(address . 44215-close@debbugs.gnu.org)

Message-ID:9bdab97f-7e4f-9e83-a27f-88c586044438@crazy-compilers.com

Thanks for the quick response. I fixed the issues and pushed as

0f4c320c2c831aa1ce38fc908c86a8dc79316811

Regards

Hartmut Goebel

| Hartmut Goebel | h.goebel@crazy-compilers.com |

| www.crazy-compilers.com | compilers which you thought are impossible |

Efraim Flashner wrote on 28 Oct 2020 07:41

Recipients:(name . Hartmut Goebel)(address . h.goebel@crazy-compilers.com)(address . 44215-close@debbugs.gnu.org)

Message-ID:20201028064150.GX10124@E5400

On Tue, Oct 27, 2020 at 08:17:11PM +0100, Hartmut Goebel wrote:

Toggle quote (4 lines)

> Thanks for the quick response. I fixed the issues and pushed as

> 0f4c320c2c831aa1ce38fc908c86a8dc79316811

You actually have a one-armed if statement now. Invoke will return #t if
it works, else it returns undefined and the phase returns true. It still
works though :).

-- 
Efraim Flashner   <efraim@flashner.co.il>   ????? ?????
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

Your comment

This issue is archived.

To comment on this conversation send an email to 44215@debbugs.gnu.org

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date