* [bug#44215] [PATCH 1/4] gnu: plasma-framework: Fix build errors in dependent packages.
2020-10-25 21:05 [bug#44215] [PATCH 0/4] Some smaller KDE changes Hartmut Goebel
@ 2020-10-25 21:09 ` Hartmut Goebel
2020-10-27 8:53 ` Efraim Flashner
2020-10-25 21:09 ` [bug#44215] [PATCH 2/4] gnu: kpackage: " Hartmut Goebel
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Hartmut Goebel @ 2020-10-25 21:09 UTC (permalink / raw)
To: 44215
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
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
^ permalink raw reply related [flat|nested] 10+ messages in thread* [bug#44215] [PATCH 2/4] gnu: kpackage: Fix build errors in dependent packages.
2020-10-25 21:05 [bug#44215] [PATCH 0/4] Some smaller KDE changes Hartmut Goebel
2020-10-25 21:09 ` [bug#44215] [PATCH 1/4] gnu: plasma-framework: Fix build errors in dependent packages Hartmut Goebel
@ 2020-10-25 21:09 ` Hartmut Goebel
2020-10-27 8:54 ` Efraim Flashner
2020-10-25 21:09 ` [bug#44215] [PATCH 3/4] gnu: Add kuserfeedback Hartmut Goebel
2020-10-25 21:09 ` [bug#44215] [PATCH 4/4] gnu: kscreenlocker: Use qt-build-system Hartmut Goebel
3 siblings, 1 reply; 10+ messages in thread
From: Hartmut Goebel @ 2020-10-25 21:09 UTC (permalink / raw)
To: 44215
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
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
^ permalink raw reply related [flat|nested] 10+ messages in thread* [bug#44215] [PATCH 3/4] gnu: Add kuserfeedback.
2020-10-25 21:05 [bug#44215] [PATCH 0/4] Some smaller KDE changes Hartmut Goebel
2020-10-25 21:09 ` [bug#44215] [PATCH 1/4] gnu: plasma-framework: Fix build errors in dependent packages Hartmut Goebel
2020-10-25 21:09 ` [bug#44215] [PATCH 2/4] gnu: kpackage: " Hartmut Goebel
@ 2020-10-25 21:09 ` Hartmut Goebel
2020-10-25 21:09 ` [bug#44215] [PATCH 4/4] gnu: kscreenlocker: Use qt-build-system Hartmut Goebel
3 siblings, 0 replies; 10+ messages in thread
From: Hartmut Goebel @ 2020-10-25 21:09 UTC (permalink / raw)
To: 44215
* gnu/packages/kde.scm (kuserfeedback): New variable.
---
gnu/packages/kde.scm | 48 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 47 insertions(+), 1 deletion(-)
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
^ permalink raw reply related [flat|nested] 10+ messages in thread* [bug#44215] [PATCH 4/4] gnu: kscreenlocker: Use qt-build-system.
2020-10-25 21:05 [bug#44215] [PATCH 0/4] Some smaller KDE changes Hartmut Goebel
` (2 preceding siblings ...)
2020-10-25 21:09 ` [bug#44215] [PATCH 3/4] gnu: Add kuserfeedback Hartmut Goebel
@ 2020-10-25 21:09 ` Hartmut Goebel
2020-10-27 8:57 ` Efraim Flashner
3 siblings, 1 reply; 10+ messages in thread
From: Hartmut Goebel @ 2020-10-25 21:09 UTC (permalink / raw)
To: 44215
* 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
(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
^ permalink raw reply related [flat|nested] 10+ messages in thread* [bug#44215] [PATCH 4/4] gnu: kscreenlocker: Use qt-build-system.
2020-10-25 21:09 ` [bug#44215] [PATCH 4/4] gnu: kscreenlocker: Use qt-build-system Hartmut Goebel
@ 2020-10-27 8:57 ` Efraim Flashner
2020-10-27 19:17 ` bug#44215: " Hartmut Goebel
0 siblings, 1 reply; 10+ messages in thread
From: Efraim Flashner @ 2020-10-27 8:57 UTC (permalink / raw)
To: Hartmut Goebel; +Cc: 44215
[-- Attachment #1: Type: text/plain, Size: 2123 bytes --]
How about gating the tests behind the tests? flag?
On Sun, Oct 25, 2020 at 10:09:22PM +0100, Hartmut Goebel wrote:
> * 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
> (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))
> (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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 10+ messages in thread