From: phodina via Guix-patches via <guix-patches@gnu.org>
To: "48627@debbugs.gnu.org" <48627@debbugs.gnu.org>
Cc: "ecbrown@ericcbrown.com" <ecbrown@ericcbrown.com>
Subject: [bug#48627] First rebased patches
Date: Wed, 29 Jun 2022 06:27:45 +0000 [thread overview]
Message-ID: <c6ZQ27hmrlghMkeradmVGGk3Ei-SUwubtqY4pglATstteZwWRYPmL6FHsYbtyc0NIdmTUevbOAH0tTFwRvwKsuNWqKJmiqicJWAq_kW_GzE=@protonmail.com> (raw)
In-Reply-To: <70eee02a-3a43-4f20-983a-483db302f167@www.fastmail.com>
[-- Attachment #1.1: Type: text/plain, Size: 359 bytes --]
Hi,
thanks for the work. I've started rebasing the patches and unfortunately there are many conflicts due to removing input labels.
However, here's first few patches. More will follow. The link to the branch is on my github repo [1]
Btw Eric are you still interested in upstreaming this?
[1] https://github.com/phodina/guix/tree/patch/qt6-updates----
Petr
[-- Attachment #1.2: Type: text/html, Size: 612 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-qtsvg-Update-to-6.1.0.patch --]
[-- Type: text/x-patch; name=0001-gnu-qtsvg-Update-to-6.1.0.patch, Size: 64881 bytes --]
From 3e0bbfa1cf27d74c4ee080c1c40275d6e47ffe48 Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 15:15:34 -0500
Subject: [PATCH 1/3] gnu: qtsvg: Update to 6.1.0
* gnu/packages/qt.scm (qtsvg): Update to 6.1.0.
* gnu/packages/qt.scm (qtsvg-5): New variable.
wpa-supplicant-gui pencil2d supercollider bandage qbittorrent sddm gcompris-qt pulseview librecad fritzing librepcb cutter freecad electron-cash monero-gui tiled cockatrice the-butterfly-effect flightgear q5go ktuberling picmi libkmahjongg kmahjongg kajongg konquest kbounce kblocks ksudoku kfourinline kblackbox granatier ksirk palapeli kigo kubrick lskat kapman kspaceduel bovo ksnakeduel kreversi kjumpingcube chessx qgis drawpile scantailor-advanced luminance-hdr qview nomacs flameshot quassel jami kgraphviewer kirigami kiconthemes plasma-framework kdelibs4support kjsembed elisa juk kmplayer yakuake kdenlive kdiagram krita massif-visualizer labplot labplot libkdegames okular kuserfeedback linphone-desktop libqtxdg liblxqt lxqt-about lxqt-admin lxqt-config lxqt-globalkeys lxqt-notificationd lxqt-openssh-askpass lxqt-panel lxqt-policykit lxqt-powermanagement lxqt-qtplugin lxqt-runner lxqt-session lxqt-sudo lximage-qt screengrab lxqt-connman-applet lxqt veusz psi qtox nheko quaternion psi-plus cantata drumstick vmpk musescore muse-sequencer fmit wireshark orange keepassxc qtpass qpdfview robocut qt5ct qtbase qtsvg qtsvg qtimageformats qtimageformats qtx11extras qtx11extras qtxmlpatterns qtxmlpatterns qtdeclarative qtdeclarative qtdeclarative qtconnectivity qtwebsockets qtwebsockets qtsensors qtsensors qtsensors qtmultimedia qtmultimedia qtwayland qtwayland qtserialport qtserialport qtserialbus qtserialbus qtwebchannel qtwebglplugin qtwebglplugin qtwebview qtlocation qtlocation qtscript qtquickcontrols qtquickcontrols qtquickcontrols2 qtquickcontrols2 qtgraphicaleffects qtgraphicaleffects qtgamepad qtscxml qtpurchasing qtcharts qtcharts qtdatavis3d qtdatavis3d qtnetworkauth qtnetworkauth qtremoteobjects qtremoteobjects qtspeech qtspell python-pyqt python-pyqtwebengine qwt python-pyside-2 gqrx dream aseba nextcloud-client mumble lyx ghostwriter manuskript texmacs vlc mlt obs openshot kristall copyq
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 17b7b38a15..e6ee213a64 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2129,7 +2129,7 @@ (define-public wpa-supplicant-gui
(inherit wpa-supplicant)
(name "wpa-supplicant-gui")
(inputs (modify-inputs (package-inputs wpa-supplicant)
- (prepend qtbase-5 qtsvg)))
+ (prepend qtbase-5 qtsvg-5)))
(native-inputs
;; For icons.
(modify-inputs (package-native-inputs wpa-supplicant)
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index c281772563..89079ceb6e 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -474,7 +474,7 @@ (define-public pencil2d
"0b1nwiwyg01087q318vymg4si76dw41ykxbn2zwd6dqbxzbpr1dh"))))
(build-system gnu-build-system)
(inputs
- (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg))
+ (list qtbase-5 qtxmlpatterns qtmultimedia qtsvg-5))
(arguments
`(#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 70b0f1181c..ff70a8a3cf 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -3108,7 +3108,7 @@ (define-public supercollider
yaml-cpp
qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
qtwebchannel
qtwebsockets))
(propagated-inputs ;to get native-search-path
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 75973b0dd8..30d2ff4a61 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -11166,7 +11166,7 @@ (define-public bandage
(install-file "Bandage" (string-append out "/bin"))
#t))))))
(inputs
- (list qtbase-5 qtsvg))
+ (list qtbase-5 qtsvg-5))
(native-inputs
(list imagemagick))
(home-page "https://rrwick.github.io/Bandage/")
diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index bc0364d87c..cf64540100 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -477,7 +477,7 @@ (define-public qbittorrent
("openssl" ,openssl)
("python" ,python-wrapper)
("qtbase" ,qtbase-5)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("zlib" ,zlib)))
(home-page "https://www.qbittorrent.org/")
(synopsis "Graphical BitTorrent client")
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 64375b8cfc..71d8fae7f1 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -93,7 +93,7 @@ (define-public sddm
qtgraphicaleffects
qtquickcontrols
qtquickcontrols2
- qtsvg
+ qtsvg-5
shadow
wayland))
(arguments
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 9e5a17a6ae..571bd78cda 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -185,7 +185,7 @@ (define-public gcompris-qt
qtmultimedia
qtquickcontrols
qtsensors
- qtsvg
+ qtsvg-5
qtxmlpatterns))
(home-page "https://gcompris.net/index-en.html")
(synopsis "Educational games for small children")
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 6e303f3fdc..4a9c1097c0 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -381,7 +381,7 @@ (define-public pulseview
libsigrok
libsigrokdecode
qtbase-5
- qtsvg))
+ qtsvg-5))
(home-page "https://www.sigrok.org/wiki/PulseView")
(synopsis "Qt based logic analyzer, oscilloscope and MSO GUI for sigrok")
(description "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index fe8ab13298..30889b6963 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -211,7 +211,7 @@ (define-public librecad
(copy-recursively "unix/resources" share))
#t)))))
(inputs
- (list boost muparser freetype qtbase-5 qtsvg))
+ (list boost muparser freetype qtbase-5 qtsvg-5))
(native-inputs
(list pkg-config which))
(home-page "https://librecad.org/")
@@ -708,7 +708,7 @@ (define-public fritzing
(inputs
`(("qtbase" ,qtbase-5)
("qtserialport" ,qtserialport)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("libgit2" ,libgit2)
("boost" ,boost)
("zlib" ,zlib)
@@ -2114,7 +2114,7 @@ (define-public librepcb
(base32 "0smp1p7wnrj0vh4rmz1cr2krfawc2lzx0pbzmgyay7xdp6jxympr"))))
(build-system gnu-build-system)
(inputs
- (list qtbase-5 qtsvg zlib))
+ (list qtbase-5 qtsvg-5 zlib))
(native-inputs
(list qttools ; for lrelease
unzip))
@@ -2274,7 +2274,7 @@ (define-public cutter
(list pkg-config))
(inputs
(list qtbase-5
- qtsvg
+ qtsvg-5
openssl
;; Depends on radare2 4.5.1 officially, builds and works fine with
;; radare2 5.0.0 but fails to build with radare2 5.1.1.
@@ -2487,7 +2487,7 @@ (define-public freecad
python-wrapper
qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
qtwebchannel
qtwebengine
qtx11extras
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 96dfc34075..78a2de9a92 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -649,7 +649,7 @@ (define-public electron-cash
python-requests
python-stem
python-trezor
- qtsvg
+ qtsvg-5
zlib))
(home-page "https://electroncash.org/")
(synopsis "Bitcoin Cash wallet")
@@ -805,7 +805,7 @@ (define-public monero-gui
("qtgraphicaleffects" ,qtgraphicaleffects)
("qtquickcontrols" ,qtquickcontrols)
("qtquickcontrols2",qtquickcontrols2)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("qtxmlpatterns" ,qtxmlpatterns)))
(arguments
`(#:tests? #f ; No tests
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 04f2b061fc..794f92125c 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -520,7 +520,7 @@ (define-public tiled
"05gczsywkk45bh0z1vv8l6cmrlncc2qj8agavj5ryxpnxkzy69r1"))))
(build-system gnu-build-system)
(inputs
- (list qtbase-5 qtdeclarative qtsvg zlib))
+ (list qtbase-5 qtdeclarative qtsvg-5 zlib))
(native-inputs
(list qttools))
(arguments
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 8e6ab03530..6709c9845b 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -993,7 +993,7 @@ (define-public cockatrice
(list protobuf
qtbase-5
qtmultimedia
- qtsvg
+ qtsvg-5
qttools
qtwebsockets
xz
@@ -7238,7 +7238,7 @@ (define-public the-butterfly-effect
;; with multiple "QPainter:: ... Painter not active" warnings.
#:tests? #f))
(inputs
- (list qtbase-5 qtsvg))
+ (list qtbase-5 qtsvg-5))
(native-inputs
`(("cmake" ,cmake-minimal)
("gettext-minimal" ,gettext-minimal)
@@ -9308,7 +9308,7 @@ (define-public flightgear
plib
qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
simgear
speexdsp
sqlite
@@ -10190,7 +10190,7 @@ (define-public q5go
(native-inputs
(list pkg-config))
(inputs
- (list qtbase-5 qtmultimedia qtsvg))
+ (list qtbase-5 qtmultimedia qtsvg-5))
(arguments
'(#:phases
(modify-phases %standard-phases
@@ -10286,7 +10286,7 @@ (define-public ktuberling
qtbase-5
qtmultimedia
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Stamp drawing toy")
(description "KTuberling is a drawing toy intended for small children and
@@ -10332,7 +10332,7 @@ (define-public picmi
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Number logic game")
(description "Picmi is a number logic game in which cells in a grid have
@@ -10413,7 +10413,7 @@ (define-public libkmahjongg
ki18n
kwidgetsaddons
qtbase-5
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Shared library for kmahjongg and kshisen")
(description "Shared library and common files for kmahjongg, kshisen and
@@ -10446,7 +10446,7 @@ (define-public kmahjongg
libkmahjongg
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Tile laying patience")
(description "In KMahjongg the tiles are scrambled and staked on top of
@@ -10543,7 +10543,7 @@ (define-public kajongg
python-pyqt
python-zope-interface
qtbase-5
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Classical Mah Jongg game for 4 players")
(description "Kajongg is the ancient Chinese board game for 4 players.
@@ -10660,7 +10660,7 @@ (define-public konquest
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Simple turn-based strategy game")
(description "Konquest is the KDE version of Gnu-Lactic Konquest. Players
@@ -10699,7 +10699,7 @@ (define-public kbounce
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Jezzball arcade game")
(description "KBounce is a single player arcade game with the elements of
@@ -10737,7 +10737,7 @@ (define-public kblocks
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Single player falling blocks puzzle game")
(description "KBlocks is the classic Tetris-like falling blocks game.
@@ -10780,7 +10780,7 @@ (define-public ksudoku
glu
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Sudoku puzzle game and solver")
(description "KSudoku is a Sudoku game and solver, supporting a range of
@@ -10957,7 +10957,7 @@ (define-public kfourinline
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Place 4 pieces in a row")
(description "KFourInLine is a board game for two players based on the
@@ -10996,7 +10996,7 @@ (define-public kblackbox
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Find atoms in a grid by shooting electrons")
(description "KBlackbox is a game of hide and seek played on a grid of
@@ -11119,7 +11119,7 @@ (define-public granatier
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Bomberman clone")
(description "Granatier is a clone of the classic Bomberman game,
@@ -11155,7 +11155,7 @@ (define-public ksirk
qca
qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
zlib))
(home-page "https://games.kde.org/")
(synopsis "Computerized version of the well known strategy board game
@@ -11216,7 +11216,7 @@ (define-public palapeli
libkdegames
qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
shared-mime-info))
(home-page "https://games.kde.org/")
(synopsis "Jigsaw puzzle game")
@@ -11296,7 +11296,7 @@ (define-public kigo
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Go board game")
(description "Kigo is an open-source implementation of the popular Go
@@ -11341,7 +11341,7 @@ (define-public kubrick
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Game based on Rubik's Cube")
(description "Kubrick is a game based on the Rubik's Cube puzzle.
@@ -11381,7 +11381,7 @@ (define-public lskat
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Lieutnant Skat card game")
(description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and
@@ -11419,7 +11419,7 @@ (define-public kapman
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Pac-Man clone")
(description "Kapman is a clone of the well known game Pac-Man.
@@ -11458,7 +11458,7 @@ (define-public kspaceduel
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Two player game with shooting spaceships flying around a sun")
(description "KSpaceduel is a space battle game for one or two players,
@@ -11491,7 +11491,7 @@ (define-public bovo
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Classic pen and paper game: five in a line")
(description "Bovo is a Gomoku (from Japanese 五目並べ - lit. \"five
@@ -11571,7 +11571,7 @@ (define-public ksnakeduel
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Snake race played against the computer")
(description "KSnakeDuel is a fast action game where you steer a snake
@@ -11687,7 +11687,7 @@ (define-public kreversi
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Old reversi board game, also known as othello")
(description "KReversi is a simple one player strategy game played
@@ -11764,7 +11764,7 @@ (define-public kjumpingcube
libkdegames
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Simple tactical game for number-crunchers")
(description "KJumpingcube is a simple tactical game for one or two
@@ -11922,7 +11922,7 @@ (define-public chessx
(native-inputs
(list qttools))
(inputs
- (list qtbase-5 qtmultimedia qtspeech qtsvg zlib))
+ (list qtbase-5 qtmultimedia qtspeech qtsvg-5 zlib))
(arguments
`(#:tests? #f
#:phases
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 2e737373a8..138b286cd6 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2604,7 +2604,7 @@ (define-public qgis
qtkeychain
qtlocation
qtserialport
- qtsvg
+ qtsvg-5
qwt
;;("saga" ,saga)
sqlite))
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index c193be1efb..915d9d79e1 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1966,7 +1966,7 @@ (define-public drawpile
qtbase-5
qtkeychain
qtmultimedia
- qtsvg
+ qtsvg-5
qtx11extras))
(home-page "https://drawpile.net")
(synopsis "Collaborative drawing program")
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 0c25b41dad..e16dbd04b3 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -1233,7 +1233,7 @@ (define-public scantailor-advanced
("libpng" ,libpng)
("libtiff" ,libtiff)
("qtbase" ,qtbase-5)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("zlib" ,zlib)))
(arguments
`(#:phases
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 1db169535e..7afb9893b5 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -517,7 +517,7 @@ (define-public luminance-hdr
(inputs
(list qtbase-5
qtdeclarative
- qtsvg
+ qtsvg-5
boost
eigen
;; gtest
@@ -670,7 +670,7 @@ (define-public qview
(native-inputs
(list qttools))
(inputs
- (list qtbase-5 qtimageformats qtsvg))
+ (list qtbase-5 qtimageformats qtsvg-5))
(home-page "https://interversehq.com/qview/")
(synopsis "Convenient and minimal image viewer")
(description "qView is a Qt image viewer designed with visually
@@ -918,7 +918,7 @@ (define-public nomacs
("python" ,python-wrapper)
("quazip" ,quazip-0)
("qtbase" ,qtbase-5)
- ("qtsvg" ,qtsvg)))
+ ("qtsvg" ,qtsvg-5)))
(native-inputs
`(("pkg-config" ,pkg-config)
("qtlinguist" ,qttools)))
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index a09e27088b..dfa0254593 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -1842,7 +1842,7 @@ (define-public flameshot
(native-inputs
(list qttools))
(inputs
- (list qtbase-5 qtsvg))
+ (list qtbase-5 qtsvg-5))
(arguments
`(#:tests? #f)) ;no tests
(home-page "https://github.com/flameshot-org/flameshot")
diff --git a/gnu/packages/irc.scm b/gnu/packages/irc.scm
index 8c484efb2d..c859eef817 100644
--- a/gnu/packages/irc.scm
+++ b/gnu/packages/irc.scm
@@ -136,7 +136,7 @@ (define-public quassel
qtbase-5
qtmultimedia
qtscript
- qtsvg
+ qtsvg-5
snorenotify
sonnet
zlib))
diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 160d0f560b..d78f241a3a 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -604,7 +604,7 @@ (define-public jami
libnotify
network-manager
qrencode
- qtsvg
+ qtsvg-5
qtwebengine
qtwebchannel
qtmultimedia
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 9f957692cb..2f19e8e16e 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -712,7 +712,7 @@ (define-public kgraphviewer
graphviz
kiconthemes
kparts
- qtsvg))
+ qtsvg-5))
(native-inputs
(list pkg-config extra-cmake-modules kdoctools))
(home-page "https://apps.kde.org/en/kgraphviewer")
@@ -877,7 +877,7 @@ (define-public kirigami
qtbase-5
qtdeclarative
qtquickcontrols2
- qtsvg
+ qtsvg-5
;; Run-time dependency
qtgraphicaleffects))
(home-page "https://community.kde.org/Frameworks")
@@ -2546,7 +2546,7 @@ (define-public kiconthemes
kitemviews
kwidgetsaddons
qtbase-5
- qtsvg))
+ qtsvg-5))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -3339,7 +3339,7 @@ (define-public plasma-framework
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtquickcontrols2" ,qtquickcontrols2)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("qtx11extras" ,qtx11extras)
("solid" ,solid)))
(arguments
@@ -3548,7 +3548,7 @@ (define-public kdelibs4support
libsm
networkmanager-qt
openssl
- qtsvg
+ qtsvg-5
qttools
qtx11extras))
;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and
@@ -3700,7 +3700,7 @@ (define-public kjsembed
(native-inputs
(list extra-cmake-modules kdoctools qttools))
(inputs
- (list ki18n kjs qtbase-5 qtsvg))
+ (list ki18n kjs qtbase-5 qtsvg-5))
(home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Frameworks 5 embedded Javascript engine for Qt")
(description "KJSEmbed provides a method of binding Javascript objects to
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index 752f6b499c..d383549df1 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -176,7 +176,7 @@ (define-public elisa
qtmultimedia
qtquickcontrols
qtquickcontrols2
- qtsvg
+ qtsvg-5
qtx11extras
;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt
vlc))
@@ -268,7 +268,7 @@ (define-public juk
phonon
phonon-backend-gstreamer
qtbase-5
- qtsvg
+ qtsvg-5
taglib))
(home-page "https://kde.org/applications/multimedia/org.kde.juk")
(synopsis "Music jukebox / music player")
@@ -612,7 +612,7 @@ (define-public kmplayer
phonon
qtbase-5
cairo
- qtsvg
+ qtsvg-5
qtx11extras
xcb-util
xcb-util-cursor
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 3fab9089f3..4e6cd1d6e1 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -346,7 +346,7 @@ (define-public yakuake
kwidgetsaddons
kwindowsystem
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras))
(home-page "https://www.kde.org/applications/system/yakuake/")
(synopsis "Quad-style terminal emulator for KDE")
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index b56b63e784..ed1eca83a8 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -292,12 +292,11 @@ (define-public kdenlive
qtquickcontrols
qtquickcontrols2
qtscript
- qtsvg
+ qtsvg-5
shared-mime-info))
(home-page "https://kdenlive.org")
(synopsis "Non-linear video editor")
(description "Kdenlive is an acronym for KDE Non-Linear Video Editor.
-
Non-linear video editing is much more powerful than beginner's (linear)
editors, hence it requires a bit more organization before starting. However,
it is not reserved to specialists and can be used for small personal
@@ -438,7 +437,7 @@ (define-public kdiagram
(native-inputs
(list extra-cmake-modules qttools))
(inputs
- (list qtbase-5 qtsvg))
+ (list qtbase-5 qtsvg-5))
(home-page "https://invent.kde.org/graphics/kdiagram")
(synopsis "Libraries for creating business diagrams")
(description "This package provides libraries for integrating business
@@ -541,7 +540,7 @@ (define-public krita
qtbase-5
qtdeclarative
qtmultimedia
- qtsvg
+ qtsvg-5
qtx11extras
quazip-0
zlib))
@@ -577,7 +576,7 @@ (define-public massif-visualizer
kio
ki18n
qtbase-5
- qtsvg
+ qtsvg-5
qtxmlpatterns))
(home-page "https://apps.kde.org/en/massif-visualizer")
(synopsis "Visualize massif data generated by Valgrind")
@@ -828,7 +827,7 @@ (define-public labplot
kwidgetsaddons
kxmlgui
qtbase-5
- qtsvg
+ qtsvg-5
shared-mime-info
;; Optional.
cfitsio
@@ -978,7 +977,7 @@ (define-public libkdegames
openal
qtbase-5
qtdeclarative
- qtsvg))
+ qtsvg-5))
(home-page "https://games.kde.org/")
(synopsis "Runtime library for kdegames")
(description "Runtime library for kdegames")
@@ -1095,7 +1094,7 @@ (define-public okular
poppler-qt5
qca
qtdeclarative
- qtsvg
+ qtsvg-5
threadweaver
kcrash
kjs))
@@ -1225,7 +1224,7 @@ (define-public kuserfeedback
;;("phpunit" ,phpunit)
))
(inputs
- (list qtbase-5 qtcharts qtdeclarative qtsvg))
+ (list qtbase-5 qtcharts qtdeclarative qtsvg-5))
(arguments
`(#:tests? #f)) ;; 4/17 fail
(home-page "https://api.kde.org/frameworks/kuserfeedback/html/")
diff --git a/gnu/packages/linphone.scm b/gnu/packages/linphone.scm
index 504b494563..0beac88d32 100644
--- a/gnu/packages/linphone.scm
+++ b/gnu/packages/linphone.scm
@@ -856,7 +856,7 @@ (define-public linphone-desktop
qtgraphicaleffects
qtquickcontrols
qtquickcontrols2
- qtsvg))
+ qtsvg-5))
(synopsis "Desktop client for the Linphone SIP softphone")
(description "Linphone is a SIP softphone for voice and video over IP calling
(VoIP) and instant messaging. Amongst its features are:
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index a0a3a0f15b..6c1242ebc5 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -187,7 +187,7 @@ (define-public libqtxdg
#t)))))
(propagated-inputs
;; required by Qt5XdgIconLoader.pc
- (list glib qtbase-5 qtsvg))
+ (list glib qtbase-5 qtsvg-5))
(native-inputs
(list lxqt-build-tools pkg-config))
(home-page "https://github.com/lxqt/libqtxdg")
@@ -231,7 +231,7 @@ (define-public liblxqt
libqtxdg
libxscrnsaver
polkit-qt
- qtsvg
+ qtsvg-5
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools))
@@ -284,7 +284,7 @@ (define-public lxqt-about
liblxqt
libqtxdg
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools))
@@ -326,7 +326,7 @@ (define-public lxqt-admin
liblxqt
libqtxdg
polkit-qt
- qtsvg
+ qtsvg-5
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools))
@@ -375,7 +375,7 @@ (define-public lxqt-config
libxcursor
libxi
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras
solid
xf86-input-libinput
@@ -443,7 +443,7 @@ (define-public lxqt-globalkeys
liblxqt
libqtxdg
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras))
(native-inputs
(list pkg-config qttools lxqt-build-tools))
@@ -489,7 +489,7 @@ (define-public lxqt-notificationd
liblxqt
libqtxdg
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools))
@@ -534,7 +534,7 @@ (define-public lxqt-openssh-askpass
liblxqt
libqtxdg
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools))
@@ -584,7 +584,7 @@ (define-public lxqt-panel
pcre
pulseaudio
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras
solid
xcb-util
@@ -646,7 +646,7 @@ (define-public lxqt-policykit
pcre
polkit-qt
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras))
(native-inputs
(list pkg-config polkit lxqt-build-tools qttools))
@@ -692,7 +692,7 @@ (define-public lxqt-powermanagement
libqtxdg
lxqt-globalkeys
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras
solid))
(native-inputs
@@ -739,7 +739,7 @@ (define-public lxqt-qtplugin
libfm-qt
libqtxdg
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras))
(native-inputs
(list lxqt-build-tools qttools))
@@ -779,7 +779,7 @@ (define-public lxqt-runner
muparser
pcre
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras))
(native-inputs
(list pkg-config qttools lxqt-build-tools))
@@ -825,7 +825,7 @@ (define-public lxqt-session
libqtxdg
procps
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras
xdg-user-dirs))
(native-inputs
@@ -893,7 +893,7 @@ (define-public lxqt-sudo
liblxqt
libqtxdg
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras
sudo))
(native-inputs
@@ -1068,7 +1068,7 @@ (define-public lximage-qt
(base32 "0g6hs41xfw2ghhwpj0rqr2ciri0x9v984689yrnmnvah88zlya1f"))))
(build-system cmake-build-system)
(inputs
- (list libexif libfm-qt qtbase-5 qtsvg qtx11extras))
+ (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras))
(native-inputs
(list pkg-config lxqt-build-tools qttools))
(arguments
@@ -1225,7 +1225,7 @@ (define-public screengrab
(base32 "0cilzw7rz5m2klzpax7rrs5rr6whfda2svwzsn2jvmrirmh5by7r"))))
(build-system cmake-build-system)
(inputs
- (list kwindowsystem libqtxdg qtbase-5 qtsvg qtx11extras))
+ (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras))
(native-inputs
(list pkg-config perl qttools))
(arguments
@@ -1283,7 +1283,7 @@ (define-public lxqt-connman-applet
(inputs
(list kwindowsystem
qtbase-5
- qtsvg
+ qtsvg-5
liblxqt
qtx11extras
libqtxdg))
@@ -1334,7 +1334,7 @@ (define-public lxqt
;; Base
;; TODO: qtsvg is needed for lxqt apps to display icons. Maybe it
;; should be added to their propagated-inputs?
- qtsvg
+ qtsvg-5
;; Core
lxqt-about
lxqt-admin
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 5e8fd7ae2d..42b6e355b5 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3052,7 +3052,7 @@ (define-public veusz
python-h5py ;optional, for HDF5 data
python-pyqt
qtbase-5
- qtsvg))
+ qtsvg-5))
(propagated-inputs
(list python-numpy))
(home-page "https://veusz.github.io/")
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index f1c5e0796c..229f409caa 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -232,7 +232,7 @@ (define-public psi
("qca" ,qca)
("qtbase" ,qtbase-5)
("qtmultimedia" ,qtmultimedia)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("qtwebkit" ,qtwebkit)
("qtx11extras" ,qtx11extras)
("x11" ,libx11)
@@ -1759,7 +1759,7 @@ (define-public qtox
openal
qrencode
qtbase-5
- qtsvg
+ qtsvg-5
sqlcipher))
(home-page "https://qtox.github.io/")
(synopsis "Tox chat client using Qt")
@@ -2396,7 +2396,7 @@ (define-public nheko
qtgraphicaleffects
qtmultimedia
qtquickcontrols2
- qtsvg
+ qtsvg-5
spdlog
single-application-qt5
xcb-util-wm
@@ -2435,7 +2435,7 @@ (define-public quaternion
qtmultimedia
qtquickcontrols
qtquickcontrols2
- qtsvg
+ qtsvg-5
qttools
xdg-utils))
(arguments
@@ -2974,7 +2974,7 @@ (define-public psi-plus
("qtbase" ,qtbase-5)
("qtkeychain" ,qtkeychain)
("qtmultimedia" ,qtmultimedia)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("qtx11extras" ,qtx11extras)
("usrsctp" ,usrsctp)
("x11" ,libx11)
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 541326d5d3..67dd34b6fd 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -464,7 +464,7 @@ (define-public cantata
mpg123
qtbase-5
qtmultimedia
- qtsvg
+ qtsvg-5
taglib
zlib))
(synopsis "Graphical MPD Client")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index ce0fb2d500..dea4dc6cd0 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2927,7 +2927,7 @@ (define-public drumstick
"/manpages/docbook.xsl")))
#t)))))
(inputs
- (list qtbase-5 qtsvg qttools alsa-lib))
+ (list qtbase-5 qtsvg-5 qttools alsa-lib))
(native-inputs
(list pkg-config
libxslt ; for xsltproc
@@ -2971,7 +2971,7 @@ (define-public vmpk
"/manpages/docbook.xsl")))
#t)))))
(inputs
- (list drumstick qtbase-5 qtsvg qtx11extras))
+ (list drumstick qtbase-5 qtsvg-5 qtx11extras))
(native-inputs
(list libxslt ;for xsltproc
docbook-xsl qttools pkg-config))
@@ -4759,7 +4759,7 @@ (define-public musescore
qtgraphicaleffects
qtquickcontrols2
qtscript
- qtsvg
+ qtsvg-5
qtxmlpatterns))
(native-inputs
(list pkg-config qttools))
@@ -4826,7 +4826,7 @@ (define-public muse-sequencer
pcre
pulseaudio ; required by rtaudio
qtbase-5
- qtsvg
+ qtsvg-5
rtaudio
rubberband
sord))
@@ -5497,7 +5497,7 @@ (define-public fmit
portaudio
qtbase-5
qtmultimedia
- qtsvg))
+ qtsvg-5))
(native-inputs
`(("gettext" ,gettext-minimal)
("hicolor-icon-theme" ,hicolor-icon-theme)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b4c50bc783..4ca0fa02fd 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -1657,7 +1657,7 @@ (define-public wireshark
minizip
qtbase-5
qtmultimedia
- qtsvg
+ qtsvg-5
sbc
snappy
zlib
diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm
index d579442902..0b8a642014 100644
--- a/gnu/packages/orange.scm
+++ b/gnu/packages/orange.scm
@@ -172,7 +172,7 @@ (define-public orange
python-xlrd
python-xlsxwriter
qtbase-5
- qtsvg
+ qtsvg-5
xdg-utils))
(home-page "https://orangedatamining.com/")
(synopsis "Component-based data mining framework")
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index da140b29ad..7db592549d 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -179,7 +179,7 @@ (define-public keepassxc
pcsc-lite
qrencode
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras
quazip-0 ; XC_KEESHARE
readline
@@ -699,7 +699,7 @@ (define-public qtpass
(native-inputs
(list qttools))
(inputs
- (list qtbase-5 qtsvg))
+ (list qtbase-5 qtsvg-5))
(home-page "https://qtpass.org")
(synopsis "GUI for password manager password-store")
(description
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index a0c4b4dc15..1b22b61227 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -870,7 +870,7 @@ (define-public qpdfview
libspectre
poppler-qt5
qtbase-5
- qtsvg))
+ qtsvg-5))
(arguments
`(#:tests? #f ; no tests
#:phases
diff --git a/gnu/packages/printers.scm b/gnu/packages/printers.scm
index f78923966c..4411060f94 100644
--- a/gnu/packages/printers.scm
+++ b/gnu/packages/printers.scm
@@ -58,7 +58,7 @@ (define-public robocut
(inputs
`(("libusb" ,libusb)
("qt" ,qtbase-5)
- ("qtsvg" ,qtsvg)))
+ ("qtsvg" ,qtsvg-5)))
(native-inputs
`(("pkg-config" ,pkg-config)
("qmake" ,qtbase-5)))
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 9593009ae3..09cc11bdf3 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -185,7 +185,7 @@ (define-public qt5ct
(native-inputs
(list qttools))
(inputs
- (list qtbase-5 qtsvg))
+ (list qtbase-5 qtsvg-5))
(synopsis "Qt5 Configuration Tool")
(description "Qt5CT is a program that allows users to configure Qt5
settings (such as icons, themes, and fonts) in desktop environments or
@@ -697,10 +697,34 @@ (define-public qtbase
(define-public qtsvg
(package (inherit qtbase-5)
(name "qtsvg")
+ (version "6.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls name version))
+ (sha256
+ (base32
+ "06dpr0xlmk21416fl6gxqwwzkla8i76avgmm39x3n1wkikwsxlsx"))))
+ (propagated-inputs `())
+ (native-inputs `(("perl" ,perl)))
+ (inputs
+ `(("libxkbcommon" ,libxkbcommon)
+ ("mesa" ,mesa)
+ ("qtbase" ,qtbase)
+ ("zlib" ,zlib)))
+ (build-system cmake-build-system)
+ (home-page "https://www.qt.io")
+ (synopsis "Qt module for displaying SVGs")
+ (description "The QtSvg module provides classes for displaying the
+ contents of SVG files.")
+ (license (list license:lgpl2.1 license:lgpl3))))
+
+(define-public qtsvg-5
+ (package (inherit qtbase-5)
+ (name "qtsvg-5")
(version "5.15.2")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt5-urls "qtsvg" version))
(sha256
(base32
"0pjqrdmd1991x9h4rl8sf81pkd89hfd5h1a2gp3fjw96pk0w5hwb"))))
@@ -714,7 +738,7 @@ (define-public qtsvg
(add-before 'configure 'configure-qmake
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (qtbase (assoc-ref inputs "qtbase"))
+ (qtbase (assoc-ref inputs "qtbase-5"))
(tmpdir (string-append (getenv "TMPDIR")))
(qmake (string-append tmpdir "/qmake"))
(qt.conf (string-append tmpdir "/qt.conf")))
@@ -765,7 +789,7 @@ (define-public qtsvg
contents of SVG files.")))
(define-public qtimageformats
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtimageformats")
(version "5.15.2")
(source (origin
@@ -780,7 +804,7 @@ (define-public qtimageformats
(delete-file-recursively "src/3rdparty")
#t))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'fix-build
@@ -803,7 +827,7 @@ (define-public qtimageformats
support for MNG, TGA, TIFF and WBMP image formats.")))
(define-public qtx11extras
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtx11extras")
(version "5.15.2")
(source (origin
@@ -813,7 +837,7 @@ (define-public qtx11extras
(base32
"0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs (list perl))
(inputs
@@ -823,7 +847,7 @@ (define-public qtx11extras
from within Qt 5.")))
(define-public qtxmlpatterns
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtxmlpatterns")
(version "5.15.2")
(source (origin
@@ -833,7 +857,7 @@ (define-public qtxmlpatterns
(base32
"1ypj5jpa31rlx8yfw3y9jia212lfnxvnqkvygs6ihjf3lxi23skn"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ; TODO: Enable the tests
((#:phases phases)
`(modify-phases ,phases
@@ -850,7 +874,7 @@ (define-public qtxmlpatterns
xmlpatternsvalidator.")))
(define-public qtdeclarative
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtdeclarative")
(version "5.15.2")
(source (origin
@@ -860,7 +884,7 @@ (define-public qtdeclarative
(base32
"0lancdn7y0lrlmyn5cbdm0izd5yprvd5n77nhkb7a3wl2sbx0066"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ;TODO: Enable the tests
((#:phases phases)
`(modify-phases ,phases
@@ -878,7 +902,7 @@ (define-public qtdeclarative
pkg-config
python
python-wrapper
- qtsvg
+ qtsvg-5
vulkan-headers))
(inputs
(list mesa qtbase-5))
@@ -890,7 +914,7 @@ (define-public qtdeclarative
with JavaScript and C++.")))
(define-public qtconnectivity
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtconnectivity")
(version "5.15.2")
(source (origin
@@ -908,7 +932,7 @@ (define-public qtconnectivity
with Bluetooth and NFC.")))
(define-public qtwebsockets
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtwebsockets")
(version "5.15.2")
(source (origin
@@ -918,7 +942,7 @@ (define-public qtwebsockets
(base32
"0gr399fn5n8j3m9d3vv01vcbr1cb7pw043j04cnnxzrlvn2jvd50"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs
(list perl qtdeclarative))
@@ -931,7 +955,7 @@ (define-public qtwebsockets
consume data received from the server, or both.")))
(define-public qtsensors
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtsensors")
(version "5.15.2")
(source (origin
@@ -941,15 +965,14 @@ (define-public qtsensors
(base32
"0fa81r7bn1mf9ynwsx524a55dx1q0jb4vda6j48ssb4lx7wi201z"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:parallel-tests? _ #f) #f) ; can lead to race condition
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'fix-tests
(lambda _
(substitute* "tests/auto/qsensorgestures_gestures/tst_sensorgestures_gestures.cpp"
- (("2000") "5000") ;lengthen test timeout
- (("QTest::newRow(\"twist\") << \"twist\"") "")) ;failing test
+ (("2000") "5000")) ;lengthen test timeout
#t))))))
(native-inputs
(list perl qtdeclarative))
@@ -960,7 +983,7 @@ (define-public qtsensors
recognition API for devices.")))
(define-public qtmultimedia
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtmultimedia")
(version "5.15.2")
(source (origin
@@ -979,7 +1002,7 @@ (define-public qtmultimedia
(("spectrum") "#"))
#t))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(replace 'configure
@@ -1005,7 +1028,7 @@ (define-public qtmultimedia
set of plugins for interacting with pulseaudio and GStreamer.")))
(define-public qtwayland
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtwayland")
(version "5.15.2")
(source (origin
@@ -1015,7 +1038,7 @@ (define-public qtwayland
(base32
"1ddfx4nak16xx0zh1kl836zxvpbixmmjyplsmfmg65pqkwi34dqr"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-failing-tests
@@ -1054,7 +1077,7 @@ (define-public qtwayland
compositor libraries.")))
(define-public qtserialport
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtserialport")
(version "5.15.2")
(source (origin
@@ -1067,7 +1090,7 @@ (define-public qtserialport
(inputs
(list qtbase-5 eudev))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-dlopen-paths
@@ -1084,7 +1107,7 @@ (define-public qtserialport
interacting with serial ports from within Qt.")))
(define-public qtserialbus
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtserialbus")
(version "5.15.2")
(source (origin
@@ -1094,7 +1117,7 @@ (define-public qtserialbus
(base32
"125x6756fjpldqy6wbw6cg7ngjh2016aiq92bchh719z1mf7xsxf"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases '%standard-phases)
`(modify-phases ,phases
(add-after 'unpack 'patch-libsocketcan-reference
@@ -1114,7 +1137,7 @@ (define-public qtserialbus
and others.")))
(define-public qtwebchannel
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtwebchannel")
(version "5.15.2")
(source (origin
@@ -1133,7 +1156,7 @@ (define-public qtwebchannel
popular web engines, Qt WebKit 2 and Qt WebEngine.")))
(define-public qtwebglplugin
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtwebglplugin")
(version "5.15.2")
(source (origin
@@ -1143,7 +1166,7 @@ (define-public qtwebglplugin
(base32
"0ihlnhv8ldkqz82v3j7j22lrhk17b6ghra8sx85y2agd2ysq5rw1"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'disable-network-tests
@@ -1162,7 +1185,7 @@ (define-public qtwebglplugin
OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
(define-public qtwebview
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtwebview")
(version "5.15.2")
(source (origin
@@ -1181,7 +1204,7 @@ (define-public qtwebview
native APIs where it makes sense.")))
(define-public qtlocation
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtlocation")
(version "5.15.2")
(source (origin
@@ -1194,7 +1217,7 @@ (define-public qtlocation
(base32
"184jychnlfhplpwc5cdcsapwljgwvzk5qpf3val4kpq8w44wnkwq"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs
(list perl qtdeclarative qtquickcontrols qtserialport))
@@ -1205,7 +1228,7 @@ (define-public qtlocation
positioning and geolocation plugins.")))
(define-public qttools
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qttools")
(version "5.15.2")
(source (origin
@@ -1215,7 +1238,7 @@ (define-public qttools
(base32
"1k618f7v6jaj0ygy8d7jvgb8zjr47sn55kiskbdkkizp3z7d12f1"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs
(list perl qtdeclarative vulkan-headers))
@@ -1227,7 +1250,7 @@ (define-public qttools
that helps in Qt development.")))
(define-public qtscript
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtscript")
(version "5.15.2")
(source (origin
@@ -1247,7 +1270,7 @@ (define-public qtscript
ECMAScript and Qt.")))
(define-public qtquickcontrols
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtquickcontrols")
(version "5.15.2")
(source (origin
@@ -1257,7 +1280,7 @@ (define-public qtquickcontrols
(base32
"1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5 qtdeclarative))
@@ -1267,7 +1290,7 @@ (define-public qtquickcontrols
can be used to build complete interfaces in Qt Quick.")))
(define-public qtquickcontrols2
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtquickcontrols2")
(version "5.15.2")
(source (origin
@@ -1277,7 +1300,7 @@ (define-public qtquickcontrols2
(base32
"06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5 qtdeclarative))
@@ -1288,7 +1311,7 @@ (define-public qtquickcontrols2
not available.")))
(define-public qtgraphicaleffects
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtgraphicaleffects")
(version "5.15.2")
(source (origin
@@ -1298,7 +1321,7 @@ (define-public qtgraphicaleffects
(base32
"1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5 qtdeclarative))
@@ -1311,7 +1334,7 @@ (define-public qtgraphicaleffects
coloring, and many more.")))
(define-public qtgamepad
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtgamepad")
(version "5.15.2")
(source (origin
@@ -1337,7 +1360,7 @@ (define-public qtgamepad
and mobile applications targeting TV-like form factors.")))
(define-public qtscxml
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtscxml")
(version "5.15.2")
(source (origin
@@ -1364,7 +1387,7 @@ (define-public qtscxml
also contains functionality to support data models and executable content.")))
(define-public qtpurchasing
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtpurchasing")
(version "5.15.2")
(source (origin
@@ -1380,7 +1403,7 @@ (define-public qtpurchasing
purchasing goods and services.")))
(define-public qtcharts
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtcharts")
(version "5.15.2")
(source (origin
@@ -1390,7 +1413,7 @@ (define-public qtcharts
(base32
"049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5 qtdeclarative))
@@ -1403,7 +1426,7 @@ (define-public qtcharts
(license license:gpl3)))
(define-public qtdatavis3d
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtdatavis3d")
(version "5.15.2")
(source (origin
@@ -1413,7 +1436,7 @@ (define-public qtdatavis3d
(base32
"1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5 qtdeclarative))
@@ -1426,7 +1449,7 @@ (define-public qtdatavis3d
(license license:gpl3)))
(define-public qtnetworkauth
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtnetworkauth")
(version "5.15.2")
(source (origin
@@ -1436,7 +1459,7 @@ (define-public qtnetworkauth
(base32
"11fdgacv4syr8bff2vdw7rb0dg1gcqpdf37hm3pn31d6z91frhpw"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'remove-failing-test
@@ -1452,7 +1475,7 @@ (define-public qtnetworkauth
implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
(define-public qtremoteobjects
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtremoteobjects")
(version "5.15.2")
(source (origin
@@ -1462,7 +1485,7 @@ (define-public qtremoteobjects
(base32
"1hngbp0vkr35rpsrac7b9vx6f360v8v2g0fffzm590l8j2ybd0b7"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases)
`(modify-phases ,phases
(add-after 'unpack 'remove-failing-test
@@ -1485,7 +1508,7 @@ (define-public qtremoteobjects
processes or computers.")))
(define-public qtspeech
- (package (inherit qtsvg)
+ (package (inherit qtsvg-5)
(name "qtspeech")
(version "5.15.2")
(source (origin
@@ -1496,7 +1519,7 @@ (define-public qtspeech
"1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468"))))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs
(list qtbase-5))
@@ -1541,7 +1564,7 @@ (define-public qtspell
(define-public qtwebengine
(package
- (inherit qtsvg)
+ (inherit qtsvg-5)
(name "qtwebengine")
(version (package-version qtbase-5))
(source
@@ -1835,7 +1858,7 @@ (define (delete-unwanted-files child stat flag base level)
vulkan-headers
xcb-util))
(arguments
- (substitute-keyword-arguments (package-arguments qtsvg)
+ (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:modules modules '())
`((guix build gnu-build-system)
(guix build utils)
@@ -2068,7 +2091,7 @@ (define-public python-pyqt
("qtmultimedia" ,qtmultimedia)
("qtsensors" ,qtsensors)
("qtserialport" ,qtserialport)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("qttools" ,qttools)
("qtwebchannel" ,qtwebchannel)
("qtwebkit" ,qtwebkit)
@@ -2172,7 +2195,7 @@ (define-public python-pyqtwebengine
("python-sip" ,python-sip)
("python-pyqt" ,python-pyqt-without-qtwebkit)
("qtbase" ,qtbase-5)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)))
@@ -2558,7 +2581,7 @@ (define-public qwt
(base32 "0hf0mpca248xlqn7xnzkfj8drf19gdyg5syzklvq8pibxiixwxj0"))))
(build-system gnu-build-system)
(inputs
- (list qtbase-5 qtsvg qttools))
+ (list qtbase-5 qtsvg-5 qttools))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -2884,7 +2907,7 @@ (define-public python-pyside-2
qtscxml
qtsensors
qtspeech
- qtsvg
+ qtsvg-5
qtwebchannel
qtwebengine
qtwebsockets
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index c25cdbc20c..cf6f3c4618 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -920,7 +920,7 @@ (define-public gqrx
portaudio
pulseaudio
qtbase-5
- qtsvg
+ qtsvg-5
volk))
(arguments
`(#:tests? #f)) ; no tests
@@ -1854,7 +1854,7 @@ (define-public dream
opus
pulseaudio
qtbase-5
- qtsvg
+ qtsvg-5
qtwebkit
qwt
speexdsp
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index aedc8b8c5f..7266aa81f3 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -118,7 +118,7 @@ (define-public aseba
enki
protobuf-3.5 ;for logging
qtbase-5
- qtsvg
+ qtsvg-5
qttools ;for libQt5Help, needed by "studio"
qtwebkit
qtx11extras
diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm
index 3dfaf40796..ff38928846 100644
--- a/gnu/packages/sync.scm
+++ b/gnu/packages/sync.scm
@@ -194,7 +194,7 @@ (define-public nextcloud-client
qtkeychain
qtquickcontrols2
qtsolutions
- qtsvg
+ qtsvg-5
qtwebchannel
qtwebsockets
sqlite
diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm
index e3071d9b75..82f2b2717b 100644
--- a/gnu/packages/telephony.scm
+++ b/gnu/packages/telephony.scm
@@ -646,7 +646,7 @@ (define-public mumble
protobuf
pulseaudio
qtbase-5
- qtsvg
+ qtsvg-5
speech-dispatcher
speex ; avoid bundled
speexdsp ; avoid bundled
diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm
index de0a6d347c..7503aa9632 100644
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@ -8099,7 +8099,7 @@ (define-public lyx
mythes
python
qtbase-5
- qtsvg
+ qtsvg-5
zlib))
(propagated-inputs
`(("texlive" ,(texlive-updmap.cfg (list texlive-fonts-ec)))))
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 02ce008491..8228eb6310 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -675,7 +675,7 @@ (define-public ghostwriter
qtdeclarative
qtmultimedia
qtquickcontrols
- qtsvg
+ qtsvg-5
qtwebchannel))
(propagated-inputs ; To get native-search-path
(list qtwebengine))
@@ -775,7 +775,7 @@ (define-public manuskript
#:categories "Office;WordProcessor;"))
#t))))))
(inputs
- (list pandoc python-lxml python-markdown python-pyqt qtsvg))
+ (list pandoc python-lxml python-markdown python-pyqt qtsvg-5))
(home-page "http://www.theologeek.ch/manuskript/")
(synopsis "Tool for writers")
(description "Manuskript provides a rich environment to help
@@ -875,7 +875,7 @@ (define-public texmacs
perl
python-wrapper
qtbase-5
- qtsvg
+ qtsvg-5
sqlite))
(arguments
`(#:tests? #f ; no check target
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index e88c3071a3..608aa02ba5 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1963,7 +1963,7 @@ (define-public vlc
("protobuf" ,protobuf)
("python" ,python-wrapper)
("qtbase" ,qtbase-5)
- ("qtsvg" ,qtsvg)
+ ("qtsvg" ,qtsvg-5)
("qtx11extras" ,qtx11extras)
("samba" ,samba)
("sdl" ,sdl)
@@ -3187,7 +3187,7 @@ (define-public mlt
libsamplerate
pulseaudio
qtbase-5
- qtsvg
+ qtsvg-5
rtaudio
sdl2
sdl2-image
@@ -3355,7 +3355,7 @@ (define-public obs
pipewire-0.3
pulseaudio
qtbase-5
- qtsvg
+ qtsvg-5
qtx11extras
qtwayland
speexdsp
@@ -4733,7 +4733,7 @@ (define-public openshot
python-pyqt
python-pyzmq
python-requests
- qtsvg))
+ qtsvg-5))
(arguments
`(#:modules ((guix build python-build-system)
(guix build qt-utils)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index b327338cd5..1c308ffbdf 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -454,7 +454,7 @@ (define-public kristall
openssl
qtbase-5
qtmultimedia
- qtsvg))
+ qtsvg-5))
(home-page "https://kristall.random-projects.net")
(synopsis "Small-internet graphical client")
(description "Graphical small-internet client with with many features
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d345bc461d..8a10dc0a22 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -328,7 +328,7 @@ (define-public copyq
`(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release")
#:tests? #f)) ; Test suite is a rather manual process.
(inputs
- (list qtbase-5 qtscript qtsvg qtx11extras))
+ (list qtbase-5 qtscript qtsvg-5 qtx11extras))
(synopsis "Clipboard manager with advanced features")
(description "CopyQ is clipboard manager with editing and scripting
features. CopyQ monitors system clipboard and saves its content in customized
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-qtimageformat-Update-to-6.1.0.patch --]
[-- Type: text/x-patch; name=0002-gnu-qtimageformat-Update-to-6.1.0.patch, Size: 3419 bytes --]
From 3ad87ce0cbf1bdf8820a5cf054c80bb2611faef9 Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 15:50:56 -0500
Subject: [PATCH 2/3] gnu: qtimageformat: Update to 6.1.0
* gnu/packages/qt.scm (qtimageformat): Update to 6.1.0.
* gnu/packages/qt.scm (qtimageformat-5): New variable.
diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm
index 7afb9893b5..b4008b4255 100644
--- a/gnu/packages/image-viewers.scm
+++ b/gnu/packages/image-viewers.scm
@@ -670,7 +670,7 @@ (define-public qview
(native-inputs
(list qttools))
(inputs
- (list qtbase-5 qtimageformats qtsvg-5))
+ (list qtbase-5 qtimageformats-5 qtsvg-5))
(home-page "https://interversehq.com/qview/")
(synopsis "Convenient and minimal image viewer")
(description "qView is a Qt image viewer designed with visually
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 09cc11bdf3..627f0d6df6 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -789,12 +789,51 @@ (define-public qtsvg-5
contents of SVG files.")))
(define-public qtimageformats
- (package (inherit qtsvg-5)
+ (package (inherit qtsvg)
(name "qtimageformats")
+ (version "6.1.0")
+ (source (origin
+ (method url-fetch)
+ (uri (qt5-urls "qtimageformats" version))
+ (sha256
+ (base32
+ "0njp526ixn7xzbqc5a289qj57yrf00qpvcx42g65s30xsf33gril"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ (delete-file-recursively "src/3rdparty")
+ #t))))
+ (build-system cmake-build-system)
+ (arguments
+ (substitute-keyword-arguments (package-arguments qtsvg)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'fix-build
+ (lambda _
+ (substitute* "src/plugins/imageformats/jp2/qjp2handler.cpp"
+ (("^#include <jasper/jasper.h>")
+ "#include <jasper/jasper.h>\n#include <QtCore/qmath.h>"))
+ #t))))))
+ (native-inputs `())
+ (inputs
+ `(("jasper" ,jasper)
+ ("libmng" ,libmng)
+ ("libtiff" ,libtiff)
+ ("libwebp" ,libwebp)
+ ("mesa" ,mesa)
+ ("qtbase" ,qtbase)
+ ("zlib" ,zlib)))
+ (synopsis "Additional Image Format plugins for Qt")
+ (description "The QtImageFormats module contains plugins for adding
+support for MNG, TGA, TIFF and WBMP image formats.")))
+
+(define-public qtimageformats-5
+ (package (inherit qtsvg-5)
+ (name "qtimageformats-5")
(version "5.15.2")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt5-urls "qtimageformats" version))
(sha256
(base32
"1msk8a0z8rr16hkp2fnv668vf6wayiydqgc2mcklaa04rv3qb0mz"))
diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm
index 6c5efc50b9..7c344c09da 100644
--- a/gnu/packages/telegram.scm
+++ b/gnu/packages/telegram.scm
@@ -568,7 +568,7 @@ (define-public telegram-desktop
("qt" ,qtbase-5)
("qtsvg" ,qtsvg)
("qt5ct" ,qt5ct)
- ("qtimageformats" ,qtimageformats)
+ ("qtimageformats" ,qtimageformats-5)
("qtwayland" ,qtwayland)
("range-v3" ,range-v3)
("rlottie" ,rlottie-for-telegram-desktop)
--
2.36.1
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-qtx11extras-Remove-variable.patch --]
[-- Type: text/x-patch; name=0003-gnu-qtx11extras-Remove-variable.patch, Size: 28293 bytes --]
From 372db7ce31761744bf78e5fa933d701c8b6f23af Mon Sep 17 00:00:00 2001
From: Eric Brown <ecbrown@ericcbrown.com>
Date: Fri, 21 May 2021 16:07:50 -0500
Subject: [PATCH 3/3] gnu: qtx11extras: Remove variable.
* gnu/packages/qt.scm (qtx11extras): Remove variable.
* gnu/packages/qt.scm (qtx11extras-5): New variable.
diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm
index 5482261a59..63cb8d0f35 100644
--- a/gnu/packages/aidc.scm
+++ b/gnu/packages/aidc.scm
@@ -208,7 +208,7 @@ (define-public zbar
("libjpeg" ,libjpeg-turbo)
("perl" ,perl)
("python" ,python)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("v4l-utils" ,v4l-utils)))
(propagated-inputs
;; These are in 'requires' field of .pc files.
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index ff70a8a3cf..2defe8dbb9 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2970,7 +2970,7 @@ (define-public qjackctl
(arguments
'(#:tests? #f)) ; no check target
(inputs
- (list jack-1 alsa-lib portaudio qtbase-5 qtx11extras))
+ (list jack-1 alsa-lib portaudio qtbase-5 qtx11extras-5))
(native-inputs
(list pkg-config qttools))
(home-page "https://qjackctl.sourceforge.io/")
@@ -3780,7 +3780,7 @@ (define-public qsynth
(native-inputs
(list qttools pkg-config))
(inputs
- (list fluidsynth qtbase-5 qtx11extras))
+ (list fluidsynth qtbase-5 qtx11extras-5))
(home-page "https://qsynth.sourceforge.io")
(synopsis "Graphical user interface for FluidSynth")
(description
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm
index 9f87e67043..7968b7010a 100644
--- a/gnu/packages/documentation.scm
+++ b/gnu/packages/documentation.scm
@@ -386,7 +386,7 @@ (define-public zeal
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)
("qtquickcontrols" ,qtquickcontrols)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("xcb-util-keyms" ,xcb-util-keysyms)))
(home-page "https://zealdocs.org/")
(synopsis "Offline documentation browser inspired by Dash")
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 571bd78cda..ff42b5395c 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -675,7 +675,7 @@ (define-public ktouch
qtdeclarative
qtgraphicaleffects
qtquickcontrols2
- qtx11extras
+ qtx11extras-5
qtxmlpatterns))
(home-page "https://edu.kde.org/ktouch/")
(synopsis "Touch typing tutor")
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 30889b6963..e8da89bfed 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2490,7 +2490,7 @@ (define-public freecad
qtsvg-5
qtwebchannel
qtwebengine
- qtx11extras
+ qtx11extras-5
qtxmlpatterns
sqlite
tbb-2020 ; Same version as opencascade-occt
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index ca2d8f6827..0e230e6a55 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -440,7 +440,7 @@ (define-public fcitx5-configtool
`(("fcitx5" ,fcitx5)
("fcitx5-qt" ,fcitx5-qt)
("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("kitemviews" ,kitemviews)
("kwidgetsaddons" ,kwidgetsaddons)
("libx11" ,libx11)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 915d9d79e1..b0573c6cc0 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -1967,7 +1967,7 @@ (define-public drawpile
qtkeychain
qtmultimedia
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(home-page "https://drawpile.net")
(synopsis "Collaborative drawing program")
(description "Drawpile is a drawing program that allows share the canvas
diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 2f19e8e16e..e75f749053 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -227,7 +227,7 @@ (define-public phonon-backend-gstreamer
(list qtbase-5
phonon
qtbase-5
- qtx11extras
+ qtx11extras-5
gstreamer
gst-plugins-base
libxml2))
@@ -643,7 +643,7 @@ (define-public kdbusaddons
(native-inputs
(list extra-cmake-modules dbus qttools))
(inputs
- (list qtbase-5 qtx11extras kinit-bootstrap)) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
+ (list qtbase-5 qtx11extras-5 kinit-bootstrap)) ;; kinit-bootstrap: kinit package which does not depend on kdbusaddons.
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -742,7 +742,7 @@ (define-public kguiaddons
(native-inputs
(list extra-cmake-modules pkg-config))
(inputs
- (list qtbase-5 qtx11extras))
+ (list qtbase-5 qtx11extras-5))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Utilities for graphical user interfaces")
(description "The KDE GUI addons provide utilities for graphical user
@@ -841,7 +841,7 @@ (define-public kidletime
(list extra-cmake-modules pkg-config))
(inputs
(list libxscrnsaver ; X-Screensaver based poller, fallback mode
- qtbase-5 qtx11extras))
+ qtbase-5 qtx11extras-5))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Reporting of idle time of user and system")
(description "KIdleTime is a singleton reporting information on idle time.
@@ -1132,7 +1132,7 @@ (define-public kwindowsystem
(inputs
`(("libxrender" ,libxrender)
("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("xcb-utils-keysyms" ,xcb-util-keysyms)
("xcb-util-wm" ,xcb-util-wm)))
(arguments
@@ -1614,7 +1614,7 @@ (define-public kcrash
(native-inputs
(list extra-cmake-modules))
(inputs
- (list kcoreaddons kwindowsystem qtbase-5 qtx11extras))
+ (list kcoreaddons kwindowsystem qtbase-5 qtx11extras-5))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Graceful handling of application crashes")
(description "KCrash provides support for intercepting and handling
@@ -1802,7 +1802,7 @@ (define-public kjobwidgets
(native-inputs
(list extra-cmake-modules qttools))
(inputs
- (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras))
+ (list kcoreaddons kwidgetsaddons qtbase-5 qtx11extras-5))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Widgets for showing progress of asynchronous jobs")
(description "KJobWIdgets provides widgets for showing progress of
@@ -1835,7 +1835,7 @@ (define-public knotifications
qtspeech
;; TODO: Think about adding dbusmenu-qt5 from
;; https://launchpad.net/libdbusmenu-qt
- qtx11extras))
+ qtx11extras-5))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -2510,7 +2510,7 @@ (define-public kglobalaccel
kwindowsystem
libxcb
qtbase-5
- qtx11extras
+ qtx11extras-5
xcb-util-keysyms))
(home-page "https://community.kde.org/Frameworks")
(synopsis "Global desktop keyboard shortcuts")
@@ -2682,7 +2682,7 @@ (define-public kio
("libxslt" ,libxslt)
("qtbase" ,qtbase-5)
("qtscript" ,qtscript)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("sonnet" ,sonnet)))
(arguments
`(#:tests? #f ; FIXME: 41/50 tests fail.
@@ -3340,7 +3340,7 @@ (define-public plasma-framework
("qtdeclarative" ,qtdeclarative)
("qtquickcontrols2" ,qtquickcontrols2)
("qtsvg" ,qtsvg-5)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("solid" ,solid)))
(arguments
`(#:tests? #f ; FIXME: 9/15 tests fail.
@@ -3461,7 +3461,7 @@ (define-public kde-frameworkintegration
("kpackage" ,kpackage)
("kwidgetsaddons" ,kwidgetsaddons)
("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)))
+ ("qtx11extras" ,qtx11extras-5)))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -3550,7 +3550,7 @@ (define-public kdelibs4support
openssl
qtsvg-5
qttools
- qtx11extras))
+ qtx11extras-5))
;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and
;; share/kf5/kssl/ca-bundle.crt
;; TODO: NixOS has nix-kde-include-dir.patch to change std-dir "include"
@@ -3642,7 +3642,7 @@ (define-public khtml
openssl
phonon
qtbase-5
- qtx11extras
+ qtx11extras-5
sonnet))
(home-page "https://community.kde.org/Frameworks")
(synopsis "KDE Frameworks 5 HTML widget and component")
diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm
index d383549df1..f3ee264a5b 100644
--- a/gnu/packages/kde-multimedia.scm
+++ b/gnu/packages/kde-multimedia.scm
@@ -177,7 +177,7 @@ (define-public elisa
qtquickcontrols
qtquickcontrols2
qtsvg-5
- qtx11extras
+ qtx11extras-5
;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt
vlc))
(arguments
@@ -462,7 +462,7 @@ (define-public kaffeine
libxscrnsaver
oxygen-icons ; default icon set
qtbase-5
- qtx11extras
+ qtx11extras-5
solid
v4l-utils ; libdvbv5
vlc))
@@ -520,7 +520,7 @@ (define-public kamoso
qtgraphicaleffects
qtquickcontrols
qtquickcontrols2 ; not listed as dependency
- qtx11extras))
+ qtx11extras-5))
(arguments
(list #:tests? #f ; test program gets built, but is not found
#:configure-flags
diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm
index a5acbb0da8..dd3b83146c 100644
--- a/gnu/packages/kde-pim.scm
+++ b/gnu/packages/kde-pim.scm
@@ -1439,7 +1439,7 @@ (define-public knotes
libkdepim
oxygen-icons ; default icon set, required for tests
qtbase-5
- qtx11extras))
+ qtx11extras-5))
(home-page "https://kontact.kde.org/components/knotes.html")
(synopsis "Note-taking utility")
(description "KNotes lets you write the computer equivalent of sticky
diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm
index 5621d8ea35..7d1c020229 100644
--- a/gnu/packages/kde-plasma.scm
+++ b/gnu/packages/kde-plasma.scm
@@ -76,7 +76,7 @@ (define-public breeze
kwindowsystem
qtbase-5
qtdeclarative ; optional
- qtx11extras))
+ qtx11extras-5))
(home-page "https://invent.kde.org/plasma/breeze")
(synopsis "Default KDE Plasma theme")
(description "Artwork, styles and assets for the Breeze visual style for
@@ -183,7 +183,7 @@ (define-public kscreenlocker
("logind" ,elogind) ;optional loginctl support
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("solid" ,solid)
("wayland" ,wayland)
("xcb-util-keysyms" ,xcb-util-keysyms)))
@@ -210,7 +210,7 @@ (define-public libkscreen
;; For testing.
dbus))
(inputs
- (list kwayland libxrandr qtbase-5 qtx11extras))
+ (list kwayland libxrandr qtbase-5 qtx11extras-5))
(arguments
'(#:tests? #f)) ; FIXME: 55% tests passed, 5 tests failed out of 11
(home-page "https://community.kde.org/Solid/Projects/ScreenManagement")
@@ -252,7 +252,7 @@ (define-public libksysguard
("qtdeclarative" ,qtdeclarative)
("qtscript" ,qtscript)
("qtwebkit" ,qtwebkit)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("plasma" ,plasma-framework)
("zlib" ,zlib)))
(build-system qt-build-system)
diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm
index 4e6cd1d6e1..074bc7f82e 100644
--- a/gnu/packages/kde-systemtools.scm
+++ b/gnu/packages/kde-systemtools.scm
@@ -256,7 +256,7 @@ (define-public krfb
oxygen-icons ;; default icon set
pipewire-0.3
qtbase-5
- qtx11extras
+ qtx11extras-5
xcb-util-image
zlib))
(home-page "https://kde.org/applications/internet/org.kde.krfb")
@@ -347,7 +347,7 @@ (define-public yakuake
kwindowsystem
qtbase-5
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(home-page "https://www.kde.org/applications/system/yakuake/")
(synopsis "Quad-style terminal emulator for KDE")
(description "Yakuake is a drop-down terminal emulator based on KDE Konsole
diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm
index 2b3a0dd15e..58a2961a1f 100644
--- a/gnu/packages/kde-utils.scm
+++ b/gnu/packages/kde-utils.scm
@@ -385,7 +385,7 @@ (define-public kxstitch
(native-inputs
(list extra-cmake-modules kdoctools pkg-config))
(inputs
- (list ktexteditor imagemagick qtbase-5 qtx11extras))
+ (list ktexteditor imagemagick qtbase-5 qtx11extras-5))
(home-page "https://kde.org/applications/en/graphics/org.kde.kxstitch")
(synopsis "Create and print cross stitch patterns")
(description
diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm
index ed1eca83a8..031207dad4 100644
--- a/gnu/packages/kde.scm
+++ b/gnu/packages/kde.scm
@@ -541,7 +541,7 @@ (define-public krita
qtdeclarative
qtmultimedia
qtsvg-5
- qtx11extras
+ qtx11extras-5
quazip-0
zlib))
(home-page "https://krita.org")
@@ -749,7 +749,7 @@ (define-public kdeconnect
qtmultimedia
qtquickcontrols
qtquickcontrols2
- qtx11extras))
+ qtx11extras-5))
(home-page "https://community.kde.org/KDEConnect")
(synopsis "Enable your devices to communicate with each other")
(description "KDE Connect is a project that enables all your devices to
diff --git a/gnu/packages/lxqt.scm b/gnu/packages/lxqt.scm
index 6c1242ebc5..871dff30c0 100644
--- a/gnu/packages/lxqt.scm
+++ b/gnu/packages/lxqt.scm
@@ -232,7 +232,7 @@ (define-public liblxqt
libxscrnsaver
polkit-qt
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list lxqt-build-tools qttools))
(home-page "https://lxqt-project.org")
@@ -285,7 +285,7 @@ (define-public lxqt-about
libqtxdg
qtbase-5
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list lxqt-build-tools qttools))
(arguments
@@ -327,7 +327,7 @@ (define-public lxqt-admin
libqtxdg
polkit-qt
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list lxqt-build-tools qttools))
(arguments
@@ -376,7 +376,7 @@ (define-public lxqt-config
libxi
qtbase-5
qtsvg-5
- qtx11extras
+ qtx11extras-5
solid
xf86-input-libinput
xkeyboard-config
@@ -444,7 +444,7 @@ (define-public lxqt-globalkeys
libqtxdg
qtbase-5
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list pkg-config qttools lxqt-build-tools))
(arguments
@@ -490,7 +490,7 @@ (define-public lxqt-notificationd
libqtxdg
qtbase-5
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list lxqt-build-tools qttools))
(arguments
@@ -535,7 +535,7 @@ (define-public lxqt-openssh-askpass
libqtxdg
qtbase-5
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list lxqt-build-tools qttools))
(arguments
@@ -585,7 +585,7 @@ (define-public lxqt-panel
pulseaudio
qtbase-5
qtsvg-5
- qtx11extras
+ qtx11extras-5
solid
xcb-util
xkeyboard-config))
@@ -647,7 +647,7 @@ (define-public lxqt-policykit
polkit-qt
qtbase-5
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list pkg-config polkit lxqt-build-tools qttools))
(arguments
@@ -693,7 +693,7 @@ (define-public lxqt-powermanagement
lxqt-globalkeys
qtbase-5
qtsvg-5
- qtx11extras
+ qtx11extras-5
solid))
(native-inputs
(list lxqt-build-tools qttools))
@@ -740,7 +740,7 @@ (define-public lxqt-qtplugin
libqtxdg
qtbase-5
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list lxqt-build-tools qttools))
(arguments
@@ -780,7 +780,7 @@ (define-public lxqt-runner
pcre
qtbase-5
qtsvg-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list pkg-config qttools lxqt-build-tools))
(arguments
@@ -826,7 +826,7 @@ (define-public lxqt-session
procps
qtbase-5
qtsvg-5
- qtx11extras
+ qtx11extras-5
xdg-user-dirs))
(native-inputs
(list pkg-config lxqt-build-tools qttools))
@@ -896,6 +896,15 @@ (define-public lxqt-sudo
qtsvg-5
qtx11extras
sudo))
+=======
+ `(("kwindowsystem" ,kwindowsystem)
+ ("liblxqt" ,liblxqt)
+ ("libqtxdg" ,libqtxdg)
+ ("qtbase" ,qtbase-5)
+ ("qtsvg" ,qtsvg-5)
+ ("qtx11extras" ,qtx11extras-5)
+ ("sudo" ,sudo)))
+>>>>>>> dcc84737d6 (gnu: qtx11extras: Remove variable.)
(native-inputs
(list pkg-config qttools lxqt-build-tools))
(arguments
@@ -976,7 +985,7 @@ (define-public libfm-qt
menu-cache
pcre
qtbase-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list pkg-config lxqt-build-tools qttools))
(home-page "https://lxqt-project.org")
@@ -998,7 +1007,7 @@ (define-public pcmanfm-qt
(base32 "1axs7dnh2z08ygy28iipfbgfck15k2i2pwlf0v8d8axjrmavzb3l"))))
(build-system cmake-build-system)
(inputs
- (list libfm-qt qtbase-5 qtx11extras))
+ (list libfm-qt qtbase-5 qtx11extras-5))
(native-inputs
(list pkg-config qttools lxqt-build-tools))
(arguments
@@ -1068,7 +1077,7 @@ (define-public lximage-qt
(base32 "0g6hs41xfw2ghhwpj0rqr2ciri0x9v984689yrnmnvah88zlya1f"))))
(build-system cmake-build-system)
(inputs
- (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras))
+ (list libexif libfm-qt qtbase-5 qtsvg-5 qtx11extras-5))
(native-inputs
(list pkg-config lxqt-build-tools qttools))
(arguments
@@ -1101,7 +1110,7 @@ (define-public obconf-qt
pango
pcre
qtbase-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list lxqt-build-tools pkg-config qttools))
(arguments
@@ -1125,7 +1134,7 @@ (define-public pavucontrol-qt
(base32 "0w51dpjayav78lmhw966fz3gvypkmv64xgsd7x5rqs8am39lq9vc"))))
(build-system cmake-build-system)
(inputs
- (list glib pcre pulseaudio qtbase-5 qtx11extras))
+ (list glib pcre pulseaudio qtbase-5 qtx11extras-5))
(native-inputs
(list pkg-config lxqt-build-tools qttools))
(arguments
@@ -1154,7 +1163,7 @@ (define-public qps
liblxqt
libqtxdg
qtbase-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs
(list lxqt-build-tools qttools))
(arguments
@@ -1201,7 +1210,7 @@ (define-public qterminal
(base32 "0rfv7a6ncm8fs8aicinh9l29w4636gxzcqz735jmch2r41v9i1d9"))))
(build-system cmake-build-system)
(inputs
- (list qtbase-5 qtx11extras qtermwidget))
+ (list qtbase-5 qtx11extras-5 qtermwidget))
(native-inputs
(list lxqt-build-tools qttools))
(arguments
@@ -1225,7 +1234,7 @@ (define-public screengrab
(base32 "0cilzw7rz5m2klzpax7rrs5rr6whfda2svwzsn2jvmrirmh5by7r"))))
(build-system cmake-build-system)
(inputs
- (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras))
+ (list kwindowsystem libqtxdg qtbase-5 qtsvg-5 qtx11extras-5))
(native-inputs
(list pkg-config perl qttools))
(arguments
@@ -1250,7 +1259,7 @@ (define-public lxqt-archiver
(base32 "0fzgq7cyr7hx8qmq84xfgbsdx04mc1r7vzq5mz79j7bp2ysh134z"))))
(build-system cmake-build-system)
(inputs
- (list glib json-glib libfm-qt qtbase-5 qtx11extras))
+ (list glib json-glib libfm-qt qtbase-5 qtx11extras-5))
(native-inputs
(list pkg-config lxqt-build-tools qttools))
(arguments
@@ -1285,7 +1294,7 @@ (define-public lxqt-connman-applet
qtbase-5
qtsvg-5
liblxqt
- qtx11extras
+ qtx11extras-5
libqtxdg))
(native-inputs
`(("lxqt-build-tools" ,lxqt-build-tools)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 229f409caa..7e5140e5f2 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -234,7 +234,7 @@ (define-public psi
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg-5)
("qtwebkit" ,qtwebkit)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("x11" ,libx11)
("xext" ,libxext)
("xcb" ,libxcb)
@@ -2975,7 +2975,7 @@ (define-public psi-plus
("qtkeychain" ,qtkeychain)
("qtmultimedia" ,qtmultimedia)
("qtsvg" ,qtsvg-5)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("usrsctp" ,usrsctp)
("x11" ,libx11)
("xext" ,libxext)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index dea4dc6cd0..32d50ab1f3 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -453,7 +453,7 @@ (define-public clementine
protobuf
pulseaudio
qtbase-5
- qtx11extras
+ qtx11extras-5
sqlite
sparsehash
taglib))
@@ -546,7 +546,7 @@ (define-public strawberry
protobuf
pulseaudio
qtbase-5
- qtx11extras
+ qtx11extras-5
sqlite
taglib))
(home-page "https://www.strawberrymusicplayer.org/")
@@ -2971,7 +2971,7 @@ (define-public vmpk
"/manpages/docbook.xsl")))
#t)))))
(inputs
- (list drumstick qtbase-5 qtsvg-5 qtx11extras))
+ (list drumstick qtbase-5 qtsvg-5 qtx11extras-5))
(native-inputs
(list libxslt ;for xsltproc
docbook-xsl qttools pkg-config))
@@ -3299,7 +3299,7 @@ (define-public qtractor
`(#:tests? #f)) ; no "check" target
(inputs
`(("qt" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("alsa-lib" ,alsa-lib)
("jack" ,jack-1)
("libsndfile" ,libsndfile)
@@ -4608,7 +4608,7 @@ (define-public lmms
(inputs
`(("sdl" ,sdl)
("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("fltk" ,fltk)
("libogg" ,libogg)
("libsamplerate" ,libsamplerate)
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 7db592549d..d09abefa29 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -180,7 +180,7 @@ (define-public keepassxc
qrencode
qtbase-5
qtsvg-5
- qtx11extras
+ qtx11extras-5
quazip-0 ; XC_KEESHARE
readline
yubikey-personalization ; XC_YUBIKEY
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 627f0d6df6..34b60a6f7c 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -865,13 +865,13 @@ (define-public qtimageformats-5
(description "The QtImageFormats module contains plugins for adding
support for MNG, TGA, TIFF and WBMP image formats.")))
-(define-public qtx11extras
+(define-public qtx11extras-5
(package (inherit qtsvg-5)
- (name "qtx11extras")
+ (name "qtx11extras-5")
(version "5.15.2")
(source (origin
(method url-fetch)
- (uri (qt5-urls name version))
+ (uri (qt5-urls "qtx11extras" version))
(sha256
(base32
"0gkfzj195v9flwljnqpdz3a532618yn4h2577nlsai56x4p7053h"))))
@@ -2135,7 +2135,7 @@ (define-public python-pyqt
("qtwebchannel" ,qtwebchannel)
("qtwebkit" ,qtwebkit)
("qtwebsockets" ,qtwebsockets)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("qtxmlpatterns" ,qtxmlpatterns)))
(arguments
`(#:modules ((srfi srfi-1)
@@ -2950,7 +2950,7 @@ (define-public python-pyside-2
qtwebchannel
qtwebengine
qtwebsockets
- qtx11extras
+ qtx11extras-5
qtxmlpatterns))
(propagated-inputs
(list python-shiboken-2))
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index 7266aa81f3..a17d33765b 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -121,7 +121,7 @@ (define-public aseba
qtsvg-5
qttools ;for libQt5Help, needed by "studio"
qtwebkit
- qtx11extras
+ qtx11extras-5
eudev
libxml2
sdl2
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 608aa02ba5..427ac13465 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1964,7 +1964,7 @@ (define-public vlc
("python" ,python-wrapper)
("qtbase" ,qtbase-5)
("qtsvg" ,qtsvg-5)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
("samba" ,samba)
("sdl" ,sdl)
("sdl-image" ,sdl-image)
@@ -3356,7 +3356,7 @@ (define-public obs
pulseaudio
qtbase-5
qtsvg-5
- qtx11extras
+ qtx11extras-5
qtwayland
speexdsp
v4l-utils
@@ -3615,7 +3615,7 @@ (define-public simplescreenrecorder
libxinerama
pulseaudio
qtbase-5
- qtx11extras))
+ qtx11extras-5))
(native-inputs (list pkg-config))
(arguments
`(#:configure-flags
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 8a10dc0a22..a3ed1339c8 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -328,7 +328,7 @@ (define-public copyq
`(#:configure-flags '("-DCMAKE_BUILD_TYPE=Release")
#:tests? #f)) ; Test suite is a rather manual process.
(inputs
- (list qtbase-5 qtscript qtsvg-5 qtx11extras))
+ (list qtbase-5 qtscript qtsvg-5 qtx11extras-5))
(synopsis "Clipboard manager with advanced features")
(description "CopyQ is clipboard manager with editing and scripting
features. CopyQ monitors system clipboard and saves its content in customized
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index 4ad8f07c09..b81fe5e59b 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -6553,7 +6553,7 @@ (define-public uim-qt
(name "uim-qt")
(inputs
`(("qt" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
+ ("qtx11extras" ,qtx11extras-5)
,@(package-inputs uim)))
(arguments
(substitute-keyword-arguments (package-arguments uim)
--
2.36.1
next prev parent reply other threads:[~2022-06-29 6:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 15:44 [bug#48627] Qt6 Base and Module Updates Eric Brown
2021-05-24 15:48 ` Eric Brown
2021-05-24 16:29 ` Eric Brown
2022-06-29 6:27 ` phodina via Guix-patches via [this message]
2022-07-31 11:41 ` [bug#48627] First rebased patches Eric Brown
2022-08-01 4:17 ` bug#48627: Qt6 Base and Module Updates Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='c6ZQ27hmrlghMkeradmVGGk3Ei-SUwubtqY4pglATstteZwWRYPmL6FHsYbtyc0NIdmTUevbOAH0tTFwRvwKsuNWqKJmiqicJWAq_kW_GzE=@protonmail.com' \
--to=guix-patches@gnu.org \
--cc=48627@debbugs.gnu.org \
--cc=ecbrown@ericcbrown.com \
--cc=phodina@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).