From 9ff7fdf1c47018674a1974f0cec66856d63d7a62 Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Fri, 21 May 2021 15:15:34 -0500 Subject: [PATCH 04/37] 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. --- gnu/packages/admin.scm | 2 +- gnu/packages/animation.scm | 2 +- gnu/packages/audio.scm | 2 +- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/bittorrent.scm | 2 +- gnu/packages/display-managers.scm | 2 +- gnu/packages/education.scm | 2 +- gnu/packages/electronics.scm | 2 +- gnu/packages/engineering.scm | 10 +-- gnu/packages/finance.scm | 4 +- gnu/packages/game-development.scm | 2 +- gnu/packages/games.scm | 56 ++++++------ gnu/packages/geo.scm | 2 +- gnu/packages/graphics.scm | 2 +- gnu/packages/image-processing.scm | 2 +- gnu/packages/image-viewers.scm | 6 +- gnu/packages/image.scm | 2 +- gnu/packages/irc.scm | 2 +- gnu/packages/jami.scm | 2 +- gnu/packages/kde-frameworks.scm | 12 +-- gnu/packages/kde-multimedia.scm | 6 +- gnu/packages/kde-systemtools.scm | 2 +- gnu/packages/kde.scm | 16 ++-- gnu/packages/linphone.scm | 2 +- gnu/packages/lxqt.scm | 38 ++++---- gnu/packages/maths.scm | 2 +- gnu/packages/messaging.scm | 10 +-- gnu/packages/mpd.scm | 2 +- gnu/packages/music.scm | 10 +-- gnu/packages/networking.scm | 2 +- gnu/packages/orange.scm | 2 +- gnu/packages/password-utils.scm | 4 +- gnu/packages/pdf.scm | 2 +- gnu/packages/printers.scm | 2 +- gnu/packages/qt.scm | 144 +++++++++++++++++------------- gnu/packages/radio.scm | 4 +- gnu/packages/robotics.scm | 2 +- gnu/packages/sync.scm | 2 +- gnu/packages/telephony.scm | 2 +- gnu/packages/tex.scm | 2 +- gnu/packages/text-editors.scm | 6 +- gnu/packages/video.scm | 8 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/xdisorg.scm | 2 +- 44 files changed, 208 insertions(+), 184 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 78964ac77e..833a22a7cf 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1867,7 +1867,7 @@ command.") (inherit wpa-supplicant) (name "wpa-supplicant-gui") (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ,@(package-inputs wpa-supplicant))) (native-inputs ;; For icons. diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index 2eafc4d083..272becc140 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -407,7 +407,7 @@ waveform until they line up with the proper sounds.") `(("qtbase" ,qtbase-5) ("qtxmlpatterns" ,qtxmlpatterns) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index ebebd4eec8..7b83d4f162 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -2882,7 +2882,7 @@ link REQUIRED)")) ("yaml-cpp" ,yaml-cpp) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebchannel" ,qtwebchannel) ("qtwebsockets" ,qtwebsockets))) (propagated-inputs ;to get native-search-path diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 659d61c639..9c5b430519 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -12387,7 +12387,7 @@ Thus the per-base error rate is similar to the raw input reads.") #t)))))) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (native-inputs `(("imagemagick" ,imagemagick))) (home-page "https://rrwick.github.io/Bandage/") diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index 5d6a780aab..5c27a698a2 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -460,7 +460,7 @@ desktops.") ("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 8a0342d7c5..8f9f0da605 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -89,7 +89,7 @@ ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("shadow" ,shadow) ("wayland" ,wayland))) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index f31dbca733..1fe0fb40d0 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -196,7 +196,7 @@ of categories with some of the activities available in that category. ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) ("qtsensors" ,qtsensors) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtxmlpatterns" ,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 0e985c9750..470c29f99a 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -278,7 +278,7 @@ format support.") ("libsigrok" ,libsigrok) ("libsigrokdecode" ,libsigrokdecode) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("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 fae85b6f2c..4d6a2aa432 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -202,7 +202,7 @@ ("muparser" ,muparser) ("freetype" ,freetype) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) ("which" ,which))) @@ -703,7 +703,7 @@ multipole-accelerated algorithm.") (inputs `(("qtbase" ,qtbase-5) ("qtserialport" ,qtserialport) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("libgit2" ,libgit2) ("boost" ,boost) ("zlib" ,zlib) @@ -2048,7 +2048,7 @@ parallel computing platforms. It also supports serial execution.") (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("zlib" ,zlib))) (native-inputs `(("qttools" ,qttools) ; for lrelease @@ -2210,7 +2210,7 @@ simulation.") `(("pkg-config" ,pkg-config))) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("openssl" ,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. @@ -2421,7 +2421,7 @@ comments."))) ("python-shiboken-2" ,python-shiboken-2) ("python-wrapper" ,python-wrapper) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) ("qtxmlpatterns" ,qtxmlpatterns) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 09f265afce..461e8e173d 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -595,7 +595,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") ("python-requests" ,python-requests) ("python-stem" ,python-stem) ("python-trezor" ,python-trezor) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("zlib" ,zlib))) (arguments `(#:tests? #f ; no tests @@ -778,7 +778,7 @@ the Monero command line client and daemon.") ("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 dfc236546d..05687d2ae3 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -462,7 +462,7 @@ support.") (inputs `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("zlib" ,zlib))) (native-inputs `(("qttools" ,qttools))) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index cb6e7e9ed5..4fbdd08455 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -929,7 +929,7 @@ want what you have.") `(("protobuf" ,protobuf) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qttools" ,qttools) ("qtwebsockets" ,qtwebsockets) ("xz" ,xz) @@ -7253,7 +7253,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available. #:tests? #f)) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (native-inputs `(("cmake" ,cmake-minimal) ("gettext-minimal" ,gettext-minimal) @@ -9304,7 +9304,7 @@ and also provides the base for the FlightGear Flight Simulator.") ("plib" ,plib) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("simgear" ,simgear) ("speexdsp" ,speexdsp) ("sqlite" ,sqlite) @@ -10159,7 +10159,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") (inputs `(("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (arguments '(#:phases (modify-phases %standard-phases @@ -10252,7 +10252,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Stamp drawing toy") (description "KTuberling is a drawing toy intended for small children and @@ -10299,7 +10299,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -10381,7 +10381,7 @@ This package is part of the KDE games module.") ("ki18n" ,ki18n) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("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 @@ -10415,7 +10415,7 @@ other Mah Jongg like games.") ("libkmahjongg" ,libkmahjongg) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -10502,7 +10502,7 @@ This package is part of the KDE games module.") ("python-twisted" ,python-twisted) ("python-pyqt" ,python-pyqt) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("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. @@ -10622,7 +10622,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -10662,7 +10662,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -10701,7 +10701,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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. @@ -10745,7 +10745,7 @@ This package is part of the KDE games module.") ("glu" ,glu) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -10926,7 +10926,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -10966,7 +10966,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -11092,7 +11092,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Bomberman clone") (description "Granatier is a clone of the classic Bomberman game, @@ -11129,7 +11129,7 @@ This package is part of the KDE games module.") ("qca" ,qca) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("zlib" ,zlib))) (home-page "https://games.kde.org/") (synopsis "Computerized version of the well known strategy board game @@ -11191,7 +11191,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("shared-mime-info" ,shared-mime-info))) (home-page "https://games.kde.org/") (synopsis "Jigsaw puzzle game") @@ -11273,7 +11273,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Go board game") (description "Kigo is an open-source implementation of the popular Go @@ -11319,7 +11319,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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. @@ -11360,7 +11360,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Lieutnant Skat card game") (description "Lieutnant Skat (from German \"Offiziersskat\") is a fun and @@ -11399,7 +11399,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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. @@ -11439,7 +11439,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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, @@ -11473,7 +11473,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -11555,7 +11555,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -11674,7 +11674,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -11753,7 +11753,7 @@ This package is part of the KDE games module.") ("libkdegames" ,libkdegames) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("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 @@ -11917,7 +11917,7 @@ and chess engines.") `(("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtspeech" ,qtspeech) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("zlib" ,zlib))) (arguments `(#:tests? #f diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index a0b43308e4..6270009651 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2287,7 +2287,7 @@ growing set of geoscientific methods.") ("qtkeychain" ,qtkeychain) ("qtlocation" ,qtlocation) ("qtserialport" ,qtserialport) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qwt" ,qwt) ;;("saga" ,saga) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 5003b3f9c4..a409e924b9 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -1938,7 +1938,7 @@ Automated palette selection is supported.") ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,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 f2bb3a1572..26207362bd 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1158,7 +1158,7 @@ substituted by matching images.") ("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 f01b6a614a..13e3b5d828 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -360,7 +360,7 @@ It supports JPEG, PNG and GIF formats.") (inputs `(("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("boost" ,boost) ("eigen" ,eigen) @@ -528,7 +528,7 @@ For PDF support, install the @emph{mupdf} package.") #t))))) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtimageformats" ,qtimageformats))) (home-page "https://interversehq.com/qview/") (synopsis "Convenient and minimal image viewer") @@ -734,7 +734,7 @@ to set X desktop background.") ("python" ,python-wrapper) ("quazip" ,quazip) ("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 00cf5acd73..6e7e1ef870 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1825,7 +1825,7 @@ parsing, viewing, modifying, and saving this metadata.") `(("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,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 a0a66e2811..e75e2b9469 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -133,7 +133,7 @@ ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) ("qtscript" ,qtscript) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("snorenotify" ,snorenotify) ("zlib" ,zlib))) (home-page "https://quassel-irc.org/") diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index a6b221f09e..204a27f440 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -601,7 +601,7 @@ decentralized calling using P2P-DHT.") `(("libringclient" ,libringclient) ("network-manager" ,network-manager) ("qrencode" ,qrencode) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebengine" ,qtwebengine) ("qtwebchannel" ,qtwebchannel) ("qtmultimedia" ,qtmultimedia) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 7a3b6b26a8..6892be4743 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -716,7 +716,7 @@ infrastructure.") ("graphviz" ,graphviz) ("kiconthemes" ,kiconthemes) ("kparts" ,kparts) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) ("extra-cmake-modules" ,extra-cmake-modules) @@ -892,7 +892,7 @@ or user activity.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ;; Run-time dependency ("qtgraphicaleffects" ,qtgraphicaleffects))) (home-page "https://community.kde.org/Frameworks") @@ -2644,7 +2644,7 @@ window does not need focus for them to be activated.") ("kitemviews" ,kitemviews) ("kwidgetsaddons" ,kwidgetsaddons) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (arguments `(#:phases (modify-phases %standard-phases @@ -3460,7 +3460,7 @@ setUrl, setUserAgent and call.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid))) (arguments @@ -3670,7 +3670,7 @@ workspace.") ("libsm" ,libsm) ("networkmanager-qt" ,networkmanager-qt) ("openssl" ,openssl) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qttools" ,qttools) ("qtx11extras" ,qtx11extras))) ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and @@ -3832,7 +3832,7 @@ support.") `(("ki18n" ,ki18n) ("kjs" ,kjs) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,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 21ca996246..95e96884d6 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -175,7 +175,7 @@ This package is part of the KDE multimedia module.") ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt ("vlc" ,vlc))) @@ -273,7 +273,7 @@ This package is part of the KDE multimedia module.") ("phonon" ,phonon) ("phonon-backend-gstreamer" ,phonon-backend-gstreamer) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("taglib" ,taglib))) (home-page "https://kde.org/applications/multimedia/org.kde.juk") (synopsis "Music jukebox / music player") @@ -568,7 +568,7 @@ This package is part of the KDE multimedia module.") ("phonon" ,phonon) ("qtbase" ,qtbase-5) ("cairo" ,cairo) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("xcb-util" ,xcb-util) ("xcb-util-cursor" ,xcb-util-cursor) diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 86f169e819..a0bd90c839 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -354,7 +354,7 @@ This package is part of the KDE administration module.") ("kwidgetsaddons" ,kwidgetsaddons) ("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,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 a8cd156cf5..37d9e8674d 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -245,7 +245,7 @@ browser for easy news reading.") ("mlt" ,mlt) ("qtbase" ,qtbase-5) ("qtscript" ,qtscript) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtmultimedia" ,qtmultimedia) ("kparts" ,kparts) ("knotifications" ,knotifications) @@ -446,7 +446,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") ("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (home-page "https://invent.kde.org/graphics/kdiagram") (synopsis "Libraries for creating business diagrams") (description "This package provides libraries for integrating business @@ -535,7 +535,7 @@ illustrate project schedules.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("quazip" ,quazip) ("zlib" ,zlib))) @@ -573,7 +573,7 @@ features include brush stabilizers, brush engines and wrap-around mode.") ("kio" ,kio) ("ki18n" ,ki18n) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) (home-page "https://apps.kde.org/en/massif-visualizer") (synopsis "Visualize massif data generated by Valgrind") @@ -833,7 +833,7 @@ communicate with each other. Here's a few things KDE Connect can do: ("kwidgetsaddons" ,kwidgetsaddons) ("kxmlgui" ,kxmlgui) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("shared-mime-info" ,shared-mime-info) ;; Optional. ("cfitsio" ,cfitsio) @@ -993,7 +993,7 @@ Python, PHP, and Perl.") ("openal" ,openal) ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (home-page "https://games.kde.org/") (synopsis "Runtime library for kdegames") (description "Runtime library for kdegames") @@ -1055,7 +1055,7 @@ Python, PHP, and Perl.") ("poppler-qt5" ,poppler-qt5) ("qca" ,qca) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("threadweaver" ,threadweaver) ("kcrash" ,kcrash) ("kjs" ,kjs))) @@ -1196,7 +1196,7 @@ or Bonjour by other projects).") `(("qtbase" ,qtbase-5) ("qtcharts" ,qtcharts) ("qtdeclarative" ,qtdeclarative) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,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 1c60e767b0..49f0caf7a6 100644 --- a/gnu/packages/linphone.scm +++ b/gnu/packages/linphone.scm @@ -865,7 +865,7 @@ and video calls or instant messaging capabilities to an application.") ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg))) + ("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 2318398b91..ae8c22f845 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -185,7 +185,7 @@ itself as well as other components maintained by the LXQt project.") ;; required by Qt5XdgIconLoader.pc `(("glib" ,glib) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) ("pkg-config" ,pkg-config))) @@ -230,7 +230,7 @@ in Qt.") ("libqtxdg" ,libqtxdg) ("libxscrnsaver" ,libxscrnsaver) ("polkit-qt" ,polkit-qt) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -284,7 +284,7 @@ and memory usage or network traffic.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -327,7 +327,7 @@ LXQt and the system it's running on.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("polkit-qt" ,polkit-qt) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -377,7 +377,7 @@ the operating system LXQt is running on.") ("libxcursor" ,libxcursor) ("libxi" ,libxi) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid) ("xf86-input-libinput" ,xf86-input-libinput) @@ -443,7 +443,7 @@ configuration of both LXQt and the underlying operating system.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -491,7 +491,7 @@ as a whole and are not limited to distinct applications.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -537,7 +537,7 @@ according to the Desktop Notifications Specification.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -588,7 +588,7 @@ of other programs.") ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid) ("xcb-util" ,xcb-util) @@ -653,7 +653,7 @@ of other programs.") ("pcre" ,pcre) ("polkit-qt" ,polkit-qt) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -701,7 +701,7 @@ LXQt.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid))) (native-inputs @@ -749,7 +749,7 @@ when laptop batteries are low on power.") ("libfm-qt" ,libfm-qt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("lxqt-build-tools" ,lxqt-build-tools) @@ -790,7 +790,7 @@ Qt with LXQt.") ("muparser" ,muparser) ("pcre" ,pcre) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -837,7 +837,7 @@ allows for launching applications or shutting down the system.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("xdg-user-dirs" ,xdg-user-dirs))) (native-inputs @@ -907,7 +907,7 @@ for the LXQt desktop environment.") ("liblxqt" ,liblxqt) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("sudo" ,sudo))) (native-inputs @@ -1096,7 +1096,7 @@ manager Compton.") `(("libexif" ,libexif) ("libfm-qt" ,libfm-qt) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1273,7 +1273,7 @@ QTermWidget.") `(("kwindowsystem" ,kwindowsystem) ("libqtxdg" ,libqtxdg) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("pkg-config" ,pkg-config) @@ -1338,7 +1338,7 @@ like @command{tar} and @command{zip}.") (inputs `(("kwindowsystem" ,kwindowsystem) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("liblxqt" ,liblxqt) ("qtx11extras" ,qtx11extras) ("libqtxdg" ,libqtxdg))) @@ -1389,7 +1389,7 @@ desktop.") ;; Base ;; TODO: qtsvg is needed for lxqt apps to display icons. Maybe it ;; should be added to their propagated-inputs? - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ;; Core ("lxqt-about" ,lxqt-about) ("lxqt-admin" ,lxqt-admin) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d48313b1ed..8be6d19cfc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2326,7 +2326,7 @@ ASCII text files using Gmsh's own scripting language.") ("python-h5py" ,python-h5py) ;optional, for HDF5 data ("python-pyqt" ,python-pyqt) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (propagated-inputs `(("python-numpy" ,python-numpy))) (home-page "https://veusz.github.io/") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 71c9144ddf..d359b1ec20 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -180,7 +180,7 @@ ("qca" ,qca) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) ("x11" ,libx11) @@ -1605,7 +1605,7 @@ instant messenger with audio and video chat capabilities.") ("openal" ,openal) ("qrencode" ,qrencode) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("sqlcipher" ,sqlcipher))) (native-inputs `(("pkg-config" ,pkg-config) @@ -2334,7 +2334,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("spdlog" ,spdlog) ("tweeny" ,tweeny) ("zlib" ,zlib))) @@ -2387,7 +2387,7 @@ There is support for: ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qttools" ,qttools) ("xdg-utils" ,xdg-utils))) (arguments @@ -2854,7 +2854,7 @@ social and chat platform.") ("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 c69beb9266..36311061bb 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -449,7 +449,7 @@ support") ("mpg123" ,mpg123) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("taglib" ,taglib) ("zlib" ,zlib))) (synopsis "Graphical MPD Client") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index f4d2cfff90..2420f91282 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2718,7 +2718,7 @@ browser.") #t))))) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qttools" ,qttools) ("alsa-lib" ,alsa-lib))) (native-inputs @@ -2766,7 +2766,7 @@ backends, including ALSA, OSS, Network and FluidSynth.") (inputs `(("drumstick" ,drumstick) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (native-inputs `(("libxslt" ,libxslt) ;for xsltproc @@ -4746,7 +4746,7 @@ standalone JACK client and an LV2 plugin is also available.") ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2) ("qtscript" ,qtscript) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) (native-inputs `(("pkg-config" ,pkg-config) @@ -4823,7 +4823,7 @@ sample library.") ("pcre" ,pcre) ("pulseaudio" ,pulseaudio) ; required by rtaudio ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("rtaudio" ,rtaudio) ("rubberband" ,rubberband))) (native-inputs @@ -5503,7 +5503,7 @@ discard bad quality ones. ("portaudio" ,portaudio) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg))) + ("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 6cfaa5e803..3b2baf96a5 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1474,7 +1474,7 @@ of the same name.") ("krb5" ,mit-krb5) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("sbc" ,sbc) ("snappy" ,snappy) ("zlib" ,zlib))) diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index bedbad7e60..be2bb7b192 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -178,7 +178,7 @@ GUI based workflow. It is primarily used in the Orange framework.") ("python-xlrd" ,python-xlrd) ("python-xlsxwriter" ,python-xlsxwriter) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("xdg-utils" ,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 0e658cefd8..ba58f26b79 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -161,7 +161,7 @@ human.") ("libxtst" ,libxtst) ("qrencode" ,qrencode) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("quazip" ,quazip) ; XC_KEESHARE ("readline" ,readline) @@ -698,7 +698,7 @@ key URIs using the standard otpauth:// scheme.") `(("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,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 9298332940..a07df23c4d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -848,7 +848,7 @@ program capable of converting PDF into other formats.") ("libspectre" ,libspectre) ("poppler-qt5" ,poppler-qt5) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (arguments `(#:imported-modules ((guix build qt-build-system) (guix build cmake-build-system) 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 @@ (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 58934d736e..5ebdb17add 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -189,7 +189,7 @@ `(("qttools" ,qttools))) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,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 @@ -704,12 +704,36 @@ developers using C++ or QML, a CSS & JavaScript like language.") (files '("etc/xdg"))))))) (define-public qtsvg - (package (inherit qtbase) + (package (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")))) @@ -725,7 +749,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (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"))) @@ -776,7 +800,7 @@ HostData=lib/qt5 contents of SVG files."))) (define-public qtimageformats - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtimageformats") (version "5.15.2") (source (origin @@ -791,7 +815,7 @@ HostData=lib/qt5 (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 @@ -814,7 +838,7 @@ HostData=lib/qt5 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 @@ -824,7 +848,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) (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 `(("perl" ,perl))) (inputs @@ -835,7 +859,7 @@ support for MNG, TGA, TIFF and WBMP image formats."))) from within Qt 5."))) (define-public qtxmlpatterns - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtxmlpatterns") (version "5.15.2") (source (origin @@ -845,7 +869,7 @@ from within Qt 5."))) (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 @@ -863,7 +887,7 @@ XML and custom data models. It contains programs such as xmlpatterns and xmlpatternsvalidator."))) (define-public qtdeclarative - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtdeclarative") (version "5.15.2") (source (origin @@ -873,7 +897,7 @@ xmlpatternsvalidator."))) (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 @@ -891,7 +915,7 @@ xmlpatternsvalidator."))) ("pkg-config" ,pkg-config) ("python" ,python) ("python-wrapper" ,python-wrapper) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("vulkan-headers" ,vulkan-headers))) (inputs `(("mesa" ,mesa) @@ -904,7 +928,7 @@ developers to extend the QML language with custom types and integrate QML code with JavaScript and C++."))) (define-public qtconnectivity - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtconnectivity") (version "5.15.2") (source (origin @@ -925,7 +949,7 @@ with JavaScript and C++."))) with Bluetooth and NFC."))) (define-public qtwebsockets - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebsockets") (version "5.15.2") (source (origin @@ -935,7 +959,7 @@ with Bluetooth and NFC."))) (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 `(("perl" ,perl) @@ -949,7 +973,7 @@ to act as a server that can process WebSocket requests, or a client that can 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 @@ -959,7 +983,7 @@ consume data received from the server, or both."))) (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 @@ -979,7 +1003,7 @@ and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices."))) (define-public qtmultimedia - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtmultimedia") (version "5.15.2") (source (origin @@ -998,7 +1022,7 @@ recognition API for devices."))) (("spectrum") "#")) #t)))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (replace 'configure @@ -1027,7 +1051,7 @@ record media, and manage a collection of media content. It also contains a 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 @@ -1037,7 +1061,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) (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 @@ -1079,7 +1103,7 @@ set of plugins for interacting with pulseaudio and GStreamer."))) compositor libraries."))) (define-public qtserialport - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtserialport") (version "5.15.2") (source (origin @@ -1093,7 +1117,7 @@ compositor libraries."))) `(("qtbase" ,qtbase-5) ("eudev" ,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 @@ -1110,7 +1134,7 @@ compositor libraries."))) 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 @@ -1120,7 +1144,7 @@ interacting with serial ports from within Qt."))) (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 @@ -1142,7 +1166,7 @@ access the various industrial serial buses and protocols, such as CAN, ModBus, and others."))) (define-public qtwebchannel - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtwebchannel") (version "5.15.2") (source (origin @@ -1163,7 +1187,7 @@ application). The transport mechanism is supported out of the box by the two 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 @@ -1173,7 +1197,7 @@ popular web engines, Qt WebKit 2 and Qt WebEngine."))) (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 @@ -1196,7 +1220,7 @@ compatible web browser without the use of plug-ins. The API is similar to 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 @@ -1216,7 +1240,7 @@ application without necessarily including a full web browser stack by using native APIs where it makes sense."))) (define-public qtlocation - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtlocation") (version "5.15.2") (source (origin @@ -1229,7 +1253,7 @@ native APIs where it makes sense."))) (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 `(("perl" ,perl) @@ -1246,7 +1270,7 @@ native APIs where it makes sense."))) positioning and geolocation plugins."))) (define-public qttools - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qttools") (version "5.15.2") (source (origin @@ -1256,7 +1280,7 @@ positioning and geolocation plugins."))) (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 `(("perl" ,perl) @@ -1271,7 +1295,7 @@ the documentation, translate applications, generate help files and other stuff that helps in Qt development."))) (define-public qtscript - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtscript") (version "5.15.2") (source (origin @@ -1292,7 +1316,7 @@ The following guides and references cover aspects of programming with ECMAScript and Qt."))) (define-public qtquickcontrols - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtquickcontrols") (version "5.15.2") (source (origin @@ -1302,7 +1326,7 @@ ECMAScript and Qt."))) (base32 "1dczakl868mg0lnwpf082jjc5976ycn879li1vqlgw5ihirzp4y3")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) @@ -1313,7 +1337,7 @@ applications scriptable. This module provides a set of extra components that 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 @@ -1323,7 +1347,7 @@ can be used to build complete interfaces in Qt Quick."))) (base32 "06c9vrwvbjmzapmfa25y34lgjkzg57xxbm92nr6wkv5qykjnq6v7")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) @@ -1335,7 +1359,7 @@ and tray icons. It falls back to Qt Widgets when a native implementation is not available."))) (define-public qtgraphicaleffects - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtgraphicaleffects") (version "5.15.2") (source (origin @@ -1345,7 +1369,7 @@ not available."))) (base32 "1r6zfc0qga2ax155js7c8y5rx6vgayf582s921j09mb797v6g3gc")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) @@ -1359,7 +1383,7 @@ types. The effects cover functional areas such as blending, masking, blurring, coloring, and many more."))) (define-public qtgamepad - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtgamepad") (version "5.15.2") (source (origin @@ -1386,7 +1410,7 @@ primary target audience are embedded devices with fullscreen user interfaces, 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 @@ -1414,7 +1438,7 @@ generating a C++ file that has a class implementing the state machine. It 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 @@ -1431,7 +1455,7 @@ also contains functionality to support data models and executable content."))) purchasing goods and services."))) (define-public qtcharts - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtcharts") (version "5.15.2") (source (origin @@ -1441,7 +1465,7 @@ purchasing goods and services."))) (base32 "049x7z8zcp9jixmdv2fjscy2ggpd6za9hkdbb2bqp2mxjm0hwxg0")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) @@ -1455,7 +1479,7 @@ selecting one of the charts themes.") (license license:gpl3))) (define-public qtdatavis3d - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtdatavis3d") (version "5.15.2") (source (origin @@ -1465,7 +1489,7 @@ selecting one of the charts themes.") (base32 "1zdn3vm0nfy9ny7c783aabp3mhlnqhi9fw2rljn7ibbksmsnasi2")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5) @@ -1479,7 +1503,7 @@ customized by using themes or by adding custom items and labels to them.") (license license:gpl3))) (define-public qtnetworkauth - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtnetworkauth") (version "5.15.2") (source (origin @@ -1489,7 +1513,7 @@ customized by using themes or by adding custom items and labels to them.") (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 @@ -1505,7 +1529,7 @@ customized by using themes or by adding custom items and labels to them.") 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 @@ -1515,7 +1539,7 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt."))) (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 @@ -1539,7 +1563,7 @@ Qt's functionalities to enable an easy exchange of information between processes or computers."))) (define-public qtspeech - (package (inherit qtsvg) + (package (inherit qtsvg-5) (name "qtspeech") (version "5.15.2") (source (origin @@ -1550,7 +1574,7 @@ processes or computers."))) "1xc3x3ghnhgchsg1kgj156yg69wn4rwjx8r28i1jd05hxjggn468")))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:tests? _ #f) #f))) ; TODO: Enable the tests (inputs `(("qtbase" ,qtbase-5))) @@ -1600,7 +1624,7 @@ using the Enchant spell-checking library.") (define-public qtwebengine (package - (inherit qtsvg) + (inherit qtsvg-5) (name "qtwebengine") (version (package-version qtbase)) (source @@ -1893,7 +1917,7 @@ using the Enchant spell-checking library.") ("vulkan-headers" ,vulkan-headers) ("xcb-util" ,xcb-util))) (arguments - (substitute-keyword-arguments (package-arguments qtsvg) + (substitute-keyword-arguments (package-arguments qtsvg-5) ((#:phases phases) `(modify-phases ,phases (add-before 'configure 'substitute-source @@ -2065,7 +2089,7 @@ module provides support functions to the automatically generated code.") ("qtmultimedia" ,qtmultimedia) ("qtsensors" ,qtsensors) ("qtserialport" ,qtserialport) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qttools" ,qttools) ("qtwebchannel" ,qtwebchannel) ("qtwebkit" ,qtwebkit) @@ -2170,7 +2194,7 @@ contain over 620 classes.") ("python-sip" ,python-sip) ("python-pyqt" ,python-pyqt) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) @@ -2558,7 +2582,7 @@ that can be only started once per user. (build-system gnu-build-system) (inputs `(("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qttools" ,qttools))) (arguments `(#:phases @@ -2880,7 +2904,7 @@ color-related widgets.") ("qtscxml" ,qtscxml) ("qtsensors" ,qtsensors) ("qtspeech" ,qtspeech) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebchannel" ,qtwebchannel) ("qtwebsockets" ,qtwebsockets) ("qtx11extras" ,qtx11extras) diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index fcaf9bb20d..43638082f2 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -650,7 +650,7 @@ to the fix block above. ("portaudio" ,portaudio) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("volk" ,volk))) (arguments `(#:tests? #f)) ; no tests @@ -1493,7 +1493,7 @@ Compatible hardware/software: ("opus" ,opus) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qwt" ,qwt) ("speexdsp" ,speexdsp) diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm index 87dcc6f890..3a0b7165cd 100644 --- a/gnu/packages/robotics.scm +++ b/gnu/packages/robotics.scm @@ -108,7 +108,7 @@ hundred times faster than real-time.") ("enki" ,enki) ("protobuf" ,protobuf-3.5) ;for logging ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qttools" ,qttools) ;for libQt5Help, needed by "studio" ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index c85b4f801c..66339c5bf1 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -198,7 +198,7 @@ ("qtkeychain" ,qtkeychain) ("qtquickcontrols2" ,qtquickcontrols2) ("qtsolutions" ,qtsolutions) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebchannel" ,qtwebchannel) ("qtwebsockets" ,qtwebsockets) ("qtwebkit" ,qtwebkit) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 788e05632c..34e1b21af6 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -644,7 +644,7 @@ address of one of the participants.") ("protobuf" ,protobuf) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("speech-dispatcher" ,speech-dispatcher) ("speex" ,speex) ; avoid bundled ("speexdsp" ,speexdsp))) ; avoid bundled diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index da19a57e59..6e7609fafa 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -6607,7 +6607,7 @@ and Karl Berry.") ("mythes" ,mythes) ("python" ,python) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("zlib" ,zlib))) (propagated-inputs `(("texlive" ,(texlive-union (list texlive-fonts-ec))))) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 844f30d35c..71cf6edacb 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -621,7 +621,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. ("qtdeclarative" ,qtdeclarative) ("qtmultimedia" ,qtmultimedia) ("qtquickcontrols" ,qtquickcontrols) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtwebchannel" ,qtwebchannel))) (propagated-inputs ; To get native-search-path `(("qtwebengine" ,qtwebengine))) @@ -724,7 +724,7 @@ environment with Markdown markup.") ("python-lxml" ,python-lxml) ("python-markdown" ,python-markdown) ("python-pyqt" ,python-pyqt) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (home-page "http://www.theologeek.ch/manuskript/") (synopsis "Tool for writers") (description "Manuskript provides a rich environment to help @@ -824,7 +824,7 @@ editors.") ("perl" ,perl) ("python" ,python-wrapper) ("qt" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg" ,qtsvg-5))) (arguments `(#:tests? #f ; no check target #:phases diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 6b27a71de1..b5a0f669dc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1828,7 +1828,7 @@ videoformats depend on the configuration flags of ffmpeg.") ("protobuf" ,protobuf) ("python" ,python-wrapper) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("samba" ,samba) ("sdl" ,sdl) @@ -2998,7 +2998,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") ("libsamplerate" ,libsamplerate) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("sdl" ,sdl) ("sox" ,sox))) (native-inputs @@ -3132,7 +3132,7 @@ be used for realtime video capture via Linux-specific APIs.") ("mesa" ,mesa) ("pulseaudio" ,pulseaudio) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("speexdsp" ,speexdsp) ("v4l-utils" ,v4l-utils) @@ -4529,7 +4529,7 @@ API. It includes bindings for Python, Ruby, and other languages.") ("python-pyqt" ,python-pyqt) ("python-pyzmq" ,python-pyzmq) ("python-requests" ,python-requests) - ("qtsvg" ,qtsvg))) + ("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 04cf3a1a60..64dc326127 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -469,7 +469,7 @@ access.") ("openssl" ,openssl) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg))) + ("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 5e1954788d..2361d31241 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -319,7 +319,7 @@ with X11 or Wayland, or in a text terminal with ncurses.") (inputs `(("qtbase" ,qtbase-5) ("qtscript" ,qtscript) - ("qtsvg" ,qtsvg) + ("qtsvg" ,qtsvg-5) ("qtx11extras" ,qtx11extras))) (synopsis "Clipboard manager with advanced features") (description "CopyQ is clipboard manager with editing and scripting -- 2.31.1