From 83da3a13bfb107e7274a91766efa9f41c9e692b3 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Wed, 13 Mar 2024 16:58:14 +0800 Subject: [PATCH] gnu: qtsensors: Rename package to qtsensors-5. * gnu/packages/qt.scm (qtsensors): Rename to qtsensors-5 * gnu/packages/qt.scm (python-pyqt, python-pyside-2) * gnu/packages/geo.scm (openorienteering-mapper) * gnu/packages/kde-plasma.scm (kscreen) * gnu/packages/education.scm (gcompris-qt) Adjust inputs. Change-Id: Ie18fdf82881e508ecc25c535088672d1a89f19ba Signed-off-by: Maxim Cournoyer --- gnu/packages/education.scm | 2 +- gnu/packages/geo.scm | 2 +- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/qt.scm | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f67e83aa9f..d9d5c45cf9 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -192,7 +192,7 @@ (define-public gcompris-qt qtgraphicaleffects qtmultimedia-5 qtquickcontrols2-5 - qtsensors + qtsensors-5 qtsvg-5)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 8117b496df..506180461d 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2574,7 +2574,7 @@ (define-public openorienteering-mapper qtbase-5 qtimageformats-5 qtlocation - qtsensors + qtsensors-5 zlib)) (native-inputs (list doxygen diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index cf45fa59f7..1d41d35a56 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -793,7 +793,7 @@ (define-public kscreen libkscreen libxi plasma-wayland-protocols - qtsensors + qtsensors-5 qtbase-5 qtx11extras xcb-util)) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 74dadf5c64..191c319f35 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -1728,10 +1728,10 @@ (define-public qtwebsockets (home-page (package-home-page qtbase)) (license (package-license qtbase)))) -(define-public qtsensors +(define-public qtsensors-5 (package (inherit qtsvg-5) - (name "qtsensors") + (name "qtsensors-5") (version "5.15.10") (source (origin (method url-fetch) @@ -3835,7 +3835,7 @@ (define-public python-pyqt ("qtdeclarative-5" ,qtdeclarative-5) ("qtlocation" ,qtlocation) ("qtmultimedia-5" ,qtmultimedia-5) - ("qtsensors" ,qtsensors) + ("qtsensors-5" ,qtsensors-5) ("qtserialport" ,qtserialport) ("qtsvg-5" ,qtsvg-5) ("qttools-5" ,qttools-5) @@ -4650,7 +4650,7 @@ (define-public python-pyside-2 qtquickcontrols2-5 qtscript qtscxml-5 - qtsensors + qtsensors-5 qtspeech qtsvg-5 qttools-5 @@ -4700,7 +4700,7 @@ (define-public python-pyside-2 "qtquickcontrols2" "qtscript" "qtscxml" - "qtsensors" + "qtsensors-5" "qtspeech" "qtsvg" "qttools"