andreas pushed a commit to branch qt-team
in repository guix.
commit 265ef36f3a6b05ff429f62610e046268ad2879ce
Author: 宋文武 <iyzs...@member.fsf.org>
AuthorDate: Sat Feb 8 12:57:41 2025 +0800
gnu: qtxmlpatterns: Rename to qtxmlpatterns-5.
* gnu/packages/qt.scm (qtxmlpatterns): Rename to qtxmlpatterns-5.
(qtspeech-5) [native-inputs]: Adjust accordingly.
(python-pyqt) [inputs]: Likewise.
(python-shiboken-2) [inputs]: Likewise.
(python-pyside-2) [inputs]: Likewise.
* gnu/packages/animation.scm (pencil2d) [inputs]: Likewise.
* gnu/packages/education.scm (openboard) [inputs]: Likewise.
(ktouch) [inputs]: Likewise.
* gnu/packages/engineering.scm (freecad) [inputs]: Likewise.
* gnu/packages/finance.scm (monero-gui) [inputs]: Likewise.
* gnu/packages/geo.scm (gplates) [inputs]: Likewise.
* gnu/packages/image-processing.scm (paraview) [inputs]: Likewise.
* gnu/packages/kde-frameworks.scm (ktexteditor-5) [inputs]: Likewise.
(ksyntaxhighlighting-5) [native-inputs]: Likewise.
* gnu/packages/messaging.scm (kaidan) [inputs]: Likewise.
* gnu/packages/music.scm (hydrogen) [inputs]: Likewise.
(musescore) [inputs]: Likewise.
* gnu/packages/simulation.scm (openfoam-org) [inputs]: Likewise.
Change-Id: Ic260988913600dee261bd138efc6a830bc45d057
---
gnu/packages/animation.scm | 2 +-
gnu/packages/education.scm | 4 ++--
gnu/packages/engineering.scm | 2 +-
gnu/packages/finance.scm | 2 +-
gnu/packages/geo.scm | 2 +-
gnu/packages/image-processing.scm | 2 +-
gnu/packages/kde-frameworks.scm | 4 ++--
gnu/packages/messaging.scm | 2 +-
gnu/packages/music.scm | 2 +-
gnu/packages/qt.scm | 10 +++++-----
gnu/packages/simulation.scm | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index a877260f6f..afe8b0b60b 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -359,7 +359,7 @@ waveform until they line up with the proper sounds.")
"0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
(build-system gnu-build-system)
(inputs
- (list bash-minimal qtbase-5 qtxmlpatterns qtmultimedia-5 qtsvg-5))
+ (list bash-minimal qtbase-5 qtxmlpatterns-5 qtmultimedia-5 qtsvg-5))
(arguments
(list
#:phases
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 65fd536811..33d5215f2f 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -599,7 +599,7 @@ specialized device.")
qtsvg-5
qtwebchannel-5
qtwebengine-5
- qtxmlpatterns
+ qtxmlpatterns-5
quazip-0
sdl
zlib))
@@ -733,7 +733,7 @@ charts.")
qtgraphicaleffects
qtquickcontrols2-5
qtx11extras
- qtxmlpatterns))
+ qtxmlpatterns-5))
(home-page "https://edu.kde.org/ktouch/";)
(synopsis "Touch typing tutor")
(description
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f37b0e3844..426cb5b022 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3369,7 +3369,7 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly
workbench.")
qtwebengine-5
qtwayland-5
qtx11extras
- qtxmlpatterns
+ qtxmlpatterns-5
sqlite
tbb-2020 ; Same version as opencascade-occt
vtk
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 8a231cef33..217c7bf610 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -830,7 +830,7 @@ the Monero command line client and daemon.")
qtquickcontrols2-5
qtsvg-5
qtwayland-5
- qtxmlpatterns)))
+ qtxmlpatterns-5)))
(arguments
(list #:tests? #f ; No tests
#:configure-flags
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 6b0d44bf36..97e1dcc91b 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -3915,7 +3915,7 @@ latitude and longitude.")
python-numpy
qtbase-5
qtsvg-5
- qtxmlpatterns
+ qtxmlpatterns-5
qwt
zlib))
(home-page "https://www.gplates.org";)
diff --git a/gnu/packages/image-processing.scm
b/gnu/packages/image-processing.scm
index 03efb66680..a80b83089a 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -1238,7 +1238,7 @@ recalculates.")
qtwebchannel-5
qtwebengine-5
qtx11extras
- qtxmlpatterns
+ qtxmlpatterns-5
sdl2
sqlite
tbb
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 76987e56bd..9bf529ff8b 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1519,7 +1519,7 @@ integration with a custom editor as well as a ready-to-use
(native-inputs
(list extra-cmake-modules perl qttools-5
;; Optional, for compile-time validation of syntax definition files:
- qtxmlpatterns))
+ qtxmlpatterns-5))
(inputs
(list qtbase-5))))
@@ -4728,7 +4728,7 @@ library.")
qtbase-5
qtdeclarative-5
qtscript-5
- qtxmlpatterns
+ qtxmlpatterns-5
solid-5
sonnet-5))
(arguments
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 26db072b4a..47b3ede22b 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1497,7 +1497,7 @@ default.")
qtquickcontrols2-5
qtsvg-5
qtmultimedia-5
- qtxmlpatterns
+ qtxmlpatterns-5
qqc2-desktop-style
qxmpp
sonnet
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 93a8f35e06..9425fe316d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1042,8 +1042,8 @@ settings (aliasing, linear interpolation and cubic
interpolation).")
pulseaudio
qtbase-5
qtsvg-5
- qtxmlpatterns
qtwayland-5
+ qtxmlpatterns-5
zlib))
(home-page "http://hydrogen-music.org/";)
(synopsis "Drum machine")
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 08b510628d..4d98d64465 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1528,7 +1528,7 @@ XLSX document format.")
(list qtbase-5))
(synopsis "Qt5 build for the qxlsx library")))
-(define-public qtxmlpatterns
+(define-public qtxmlpatterns-5
(package (inherit qtsvg-5)
(name "qtxmlpatterns")
(version "5.15.16")
@@ -3007,7 +3007,7 @@ processes or computers.")
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs (list qtbase-5))
- (native-inputs (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns))
+ (native-inputs (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns-5))
(synopsis "Qt Speech module")
(description "The Qt Speech module enables a Qt application to support
accessibility features such as text-to-speech, which is useful for end-users
@@ -4196,7 +4196,7 @@ module provides support functions to the automatically
generated code.")
("qtwebchannel-5" ,qtwebchannel-5)
("qtwebsockets-5" ,qtwebsockets-5)
("qtx11extras" ,qtx11extras)
- ("qtxmlpatterns" ,qtxmlpatterns)))
+ ("qtxmlpatterns" ,qtxmlpatterns-5)))
(arguments
(list
#:tests? #f ; No tests.
@@ -5205,7 +5205,7 @@ color-related widgets.")
libxslt
python-wrapper
qtbase-5
- qtxmlpatterns))
+ qtxmlpatterns-5))
(arguments
(list
#:tests? #f
@@ -5315,7 +5315,7 @@ color-related widgets.")
qtwebengine-5
qtwebsockets-5
qtx11extras
- qtxmlpatterns))
+ qtxmlpatterns-5))
(propagated-inputs
(list python-shiboken-2))
(native-inputs
diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm
index ebfe477265..bfa3c5f0b1 100644
--- a/gnu/packages/simulation.scm
+++ b/gnu/packages/simulation.scm
@@ -188,7 +188,7 @@
qtsvg-5
qttools-5
qtwebengine-5
- qtxmlpatterns
+ qtxmlpatterns-5
utfcpp
vtk
xz))
