diff options
50 files changed, 210 insertions, 211 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e66277ea92..571271b5ab 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -2137,7 +2137,7 @@ command.") (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) @@ -2157,7 +2157,7 @@ command.") (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) - (qt '("qtbase" "qtsvg"))) + (qt '("qtbase" "qtsvg-5"))) (install-file "wpa_gui" (string-append out "/bin")) (install-file "wpa_gui.desktop" (string-append out "/share/applications")) 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 @@ waveform until they line up with the proper sounds.") "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 d70f1e06b4..9c246cddc5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3232,7 +3232,7 @@ link REQUIRED)")))))) yaml-cpp qtbase-5 qtdeclarative - qtsvg + qtsvg-5 qtwebchannel qtwebsockets)) (propagated-inputs ;to get native-search-path @@ -5852,9 +5852,8 @@ and DSD streams.") `(#:tests? #f)) ;; no tests (inputs (list alsa-lib pipewire-0.3 - ;; qtsvg is still on version 5; use qtbase-5 to match qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config)) (synopsis "PipeWire graph manager") (description diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 2c5fd4abd9..06a8ac59eb 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1339,7 +1339,7 @@ borgmatic is powered by borg.") python-pyqt-without-qtwebkit python-secretstorage ;; This is included so that the qt-wrap phase picks it up. - qtsvg)) + qtsvg-5)) (home-page "https://github.com/borgbase/vorta") (synopsis "Graphical backup client based on BorgBackup") (description "Vorta is a graphical backup client based on the Borg backup diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 95e91b47f3..e9f7ab9e98 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11264,7 +11264,7 @@ Thus the per-base error rate is similar to the raw input reads.") (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..fe235d4b3b 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -477,7 +477,7 @@ desktops.") ("openssl" ,openssl) ("python" ,python-wrapper) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,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 @@ qtgraphicaleffects qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 shadow wayland)) (arguments diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 339a72ef91..5d864da281 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -293,7 +293,7 @@ sip-include-dirs = [\"" (setenv "CI" "true") ;; The Qt test complains about being unable to load all image ;; plugins, and I notice the available plugins list it shows - ;; lacks 'svg'. Adding qtsvg doesn't fix it, so I'm not sure how + ;; lacks 'svg'. Adding qtsvg-5 doesn't fix it, so I'm not sure how ;; to fix it. TODO: Fix test and remove this. (setenv "SKIP_QT_BUILD_TEST" "true"))) (add-after 'install 'install-rapydscript diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 9e5a17a6ae..0e3c8feaf9 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -185,7 +185,7 @@ of categories with some of the activities available in that category. qtmultimedia qtquickcontrols qtsensors - qtsvg + qtsvg-5 qtxmlpatterns)) (home-page "https://gcompris.net/index-en.html") (synopsis "Educational games for small children") @@ -560,7 +560,7 @@ specialized device.") qtbase-5 qtdeclarative qtmultimedia - qtsvg + qtsvg-5 qtwebchannel qtwebengine qtxmlpatterns diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 70d960aaab..342294de13 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -381,7 +381,7 @@ such as: 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 bf32187dde..8037ccb565 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -213,7 +213,7 @@ (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/") @@ -710,7 +710,7 @@ multipole-accelerated algorithm.") (inputs `(("qtbase" ,qtbase-5) ("qtserialport" ,qtserialport) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("libgit2" ,libgit2) ("boost" ,boost) ("zlib" ,zlib) @@ -764,7 +764,7 @@ ready for production.") (native-inputs (list pkg-config qttools)) (inputs - (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg sqlite)) + (list kcoreaddons kwidgetsaddons qtbase-5 qtsvg-5 sqlite)) (home-page "https://qelectrotech.org/") (synopsis "CAD/CAE editor focusing on schematics drawing features") (description "QElectroTech, or QET in short, is a desktop application to @@ -1246,7 +1246,7 @@ the 'showing the effect of'-style of operation.") mpfr openssl qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://github.com/ccoors/Valeronoi") (synopsis "WiFi mapping companion application for Valetudo") (description @@ -2118,7 +2118,7 @@ parallel computing platforms. It also supports serial execution.") (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)) @@ -2278,7 +2278,7 @@ simulation.") (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. @@ -2491,7 +2491,7 @@ comments."))) python-wrapper qtbase-5 qtdeclarative - qtsvg + qtsvg-5 qtwebchannel qtwebengine qtx11extras @@ -3426,7 +3426,7 @@ compiled translations. Prebuilt Firmware files are removed.") qtgraphicaleffects qtquickcontrols qtquickcontrols2 - qtsvg)) + qtsvg-5)) (arguments `(;; FIXME: tests are disabled, because they cause an infinite loop. #:tests? #f diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index adceb98f83..f59fb56f7a 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -651,7 +651,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") python-requests python-stem python-trezor - qtsvg + qtsvg-5 zlib)) (home-page "https://electroncash.org/") (synopsis "Bitcoin Cash wallet") @@ -807,7 +807,7 @@ the Monero command line client and daemon.") ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2",qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtxmlpatterns" ,qtxmlpatterns))) (arguments `(#:tests? #f ; No tests diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 30512dcc80..f9e8baffd4 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -520,7 +520,7 @@ formats such as PNG.") "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 d55a2ee867..cc246551a3 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -994,7 +994,7 @@ want what you have.") (list protobuf qtbase-5 qtmultimedia - qtsvg + qtsvg-5 qttools qtwebsockets xz @@ -7199,7 +7199,7 @@ making Yamagi Quake II one of the most solid Quake II implementations available. ;; 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) @@ -9271,7 +9271,7 @@ and also provides the base for the FlightGear Flight Simulator.") plib qtbase-5 qtdeclarative - qtsvg + qtsvg-5 simgear speexdsp sqlite @@ -10153,7 +10153,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") (native-inputs (list pkg-config)) (inputs - (list qtbase-5 qtmultimedia qtsvg)) + (list qtbase-5 qtmultimedia qtsvg-5)) (arguments '(#:phases (modify-phases %standard-phases @@ -10249,7 +10249,7 @@ can be downloaded from @url{https://zero.sjeng.org/best-network}.") 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 @@ -10295,7 +10295,7 @@ This package is part of the KDE games module.") 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 @@ -10376,7 +10376,7 @@ This package is part of the KDE games module.") 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 @@ -10409,7 +10409,7 @@ other Mah Jongg like games.") 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 @@ -10506,7 +10506,7 @@ This package is part of the KDE games module.") 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. @@ -10623,7 +10623,7 @@ This package is part of the KDE games module.") 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 @@ -10662,7 +10662,7 @@ This package is part of the KDE games module.") 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 @@ -10700,7 +10700,7 @@ This package is part of the KDE games module.") 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. @@ -10743,7 +10743,7 @@ This package is part of the KDE games module.") 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 @@ -10920,7 +10920,7 @@ This package is part of the KDE games module.") 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 @@ -10959,7 +10959,7 @@ This package is part of the KDE games module.") 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 @@ -11082,7 +11082,7 @@ This package is part of the KDE games module.") 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, @@ -11118,7 +11118,7 @@ This package is part of the KDE games module.") qca qtbase-5 qtdeclarative - qtsvg + qtsvg-5 zlib)) (home-page "https://games.kde.org/") (synopsis "Computerized version of the well known strategy board game @@ -11179,7 +11179,7 @@ This package is part of the KDE games module.") libkdegames qtbase-5 qtdeclarative - qtsvg + qtsvg-5 shared-mime-info)) (home-page "https://games.kde.org/") (synopsis "Jigsaw puzzle game") @@ -11259,7 +11259,7 @@ This package is part of the KDE games module.") 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 @@ -11304,7 +11304,7 @@ This package is part of the KDE games module.") 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. @@ -11344,7 +11344,7 @@ This package is part of the KDE games module.") 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 @@ -11382,7 +11382,7 @@ This package is part of the KDE games module.") 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. @@ -11421,7 +11421,7 @@ This package is part of the KDE games module.") 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, @@ -11454,7 +11454,7 @@ This package is part of the KDE games module.") 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 @@ -11534,7 +11534,7 @@ This package is part of the KDE games module.") 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 @@ -11650,7 +11650,7 @@ This package is part of the KDE games module.") 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 @@ -11727,7 +11727,7 @@ This package is part of the KDE games module.") 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 @@ -11885,7 +11885,7 @@ and chess engines.") (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 a05b86219e..0c98d57821 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -2622,7 +2622,7 @@ growing set of geoscientific methods.") qtkeychain qtlocation qtserialport - qtsvg + qtsvg-5 qwt ;;("saga" ,saga) sqlite)) @@ -2764,7 +2764,7 @@ using third-party geocoders and other data sources.") python-3 python-numpy qtbase-5 - qtsvg + qtsvg-5 qtxmlpatterns qwt zlib)) diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm index 853361bd61..b117ff4222 100644 --- a/gnu/packages/gps.scm +++ b/gnu/packages/gps.scm @@ -194,7 +194,7 @@ coordinates as well as partial support for adjustments in global coordinate syst (string-append "PREFIX=" (assoc-ref outputs "out")))))))) (inputs - (list qtbase-5 qtlocation qtsvg)) + (list qtbase-5 qtlocation qtsvg-5)) (native-inputs (list qttools)) (home-page "https://www.gpxsee.org") 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 @@ Automated palette selection is supported.") 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 bcb1d7a2f6..98d30d54ed 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1231,7 +1231,7 @@ substituted by matching images.") ("libpng" ,libpng) ("libtiff" ,libtiff) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("zlib" ,zlib))) (arguments `(#:phases diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8d4d2351c3..2d3b8aa46f 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -520,7 +520,7 @@ It supports JPEG, PNG and GIF formats.") (inputs (list qtbase-5 qtdeclarative - qtsvg + qtsvg-5 boost eigen ;; gtest @@ -673,7 +673,7 @@ For PDF support, install the @emph{mupdf} package.") (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 @@ -921,7 +921,7 @@ archives.") ("python" ,python-wrapper) ("quazip" ,quazip-0) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg-5" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qtlinguist" ,qttools))) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 7afe96d149..90554143d0 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1830,7 +1830,7 @@ parsing, viewing, modifying, and saving this metadata.") (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 5fc69cab3b..e7ace9e6c4 100644 --- a/gnu/packages/irc.scm +++ b/gnu/packages/irc.scm @@ -136,7 +136,7 @@ qtbase-5 qtmultimedia qtscript - qtsvg + qtsvg-5 snorenotify sonnet zlib)) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index b8210bcc1e..726221b1e5 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -604,7 +604,7 @@ decentralized calling using P2P-DHT.") 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..0f1799edb2 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -712,7 +712,7 @@ infrastructure.") 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 @@ or user activity.") qtbase-5 qtdeclarative qtquickcontrols2 - qtsvg + qtsvg-5 ;; Run-time dependency qtgraphicaleffects)) (home-page "https://community.kde.org/Frameworks") @@ -2546,7 +2546,7 @@ window does not need focus for them to be activated.") kitemviews kwidgetsaddons qtbase-5 - qtsvg)) + qtsvg-5)) (arguments `(#:phases (modify-phases %standard-phases @@ -3339,7 +3339,7 @@ setUrl, setUserAgent and call.") ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("solid" ,solid))) (arguments @@ -3548,7 +3548,7 @@ workspace.") libsm networkmanager-qt openssl - qtsvg + qtsvg-5 qttools qtx11extras)) ;; FIXME: Use Guix ca-bundle.crt in etc/xdg/ksslcalist and @@ -3700,7 +3700,7 @@ support.") (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 265dcef625..5b0d841445 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -177,7 +177,7 @@ This package is part of the KDE multimedia module.") qtmultimedia qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 qtx11extras ;; TODO: upnpqt https://gitlab.com/homeautomationqt/upnp-player-qt vlc)) @@ -269,7 +269,7 @@ This package is part of the KDE multimedia module.") 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") @@ -625,7 +625,7 @@ This package is part of the KDE multimedia module.") 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 @@ This package is part of the KDE administration module.") 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..2dfd1348e7 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -292,7 +292,7 @@ browser for easy news reading.") qtquickcontrols qtquickcontrols2 qtscript - qtsvg + qtsvg-5 shared-mime-info)) (home-page "https://kdenlive.org") (synopsis "Non-linear video editor") @@ -438,7 +438,7 @@ for some KDevelop language plugins (Ruby, PHP, CSS...).") (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 +541,7 @@ expression library, that is used in Krita.") qtbase-5 qtdeclarative qtmultimedia - qtsvg + qtsvg-5 qtx11extras quazip-0 zlib)) @@ -577,7 +577,7 @@ features include brush stabilizers, brush engines and wrap-around mode.") 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 +828,7 @@ communicate with each other. Here's a few things KDE Connect can do: kwidgetsaddons kxmlgui qtbase-5 - qtsvg + qtsvg-5 shared-mime-info ;; Optional. cfitsio @@ -978,7 +978,7 @@ Python, PHP, and Perl.") openal qtbase-5 qtdeclarative - qtsvg)) + qtsvg-5)) (home-page "https://games.kde.org/") (synopsis "Runtime library for kdegames") (description "Runtime library for kdegames") @@ -1027,7 +1027,7 @@ Python, PHP, and Perl.") qtdeclarative qtlocation qtserialport - qtsvg + qtsvg-5 qtwebchannel qtwebengine shapelib @@ -1095,7 +1095,7 @@ creating routes by drag and drop and more.") poppler-qt5 qca qtdeclarative - qtsvg + qtsvg-5 threadweaver kcrash kjs)) @@ -1225,7 +1225,7 @@ or Bonjour by other projects).") ;;("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 @@ and video calls or instant messaging capabilities to an application.") 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..9ff1de942c 100644 --- a/gnu/packages/lxqt.scm +++ b/gnu/packages/lxqt.scm @@ -187,7 +187,7 @@ itself as well as other components maintained by the LXQt project.") #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 @@ in Qt.") libqtxdg libxscrnsaver polkit-qt - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -284,7 +284,7 @@ and memory usage or network traffic.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -326,7 +326,7 @@ LXQt and the system it's running on.") liblxqt libqtxdg polkit-qt - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -375,7 +375,7 @@ the operating system LXQt is running on.") libxcursor libxi qtbase-5 - qtsvg + qtsvg-5 qtx11extras solid xf86-input-libinput @@ -443,7 +443,7 @@ configuration of both LXQt and the underlying operating system.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list pkg-config qttools lxqt-build-tools)) @@ -489,7 +489,7 @@ as a whole and are not limited to distinct applications.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -534,7 +534,7 @@ according to the Desktop Notifications Specification.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -584,7 +584,7 @@ of other programs.") pcre pulseaudio qtbase-5 - qtsvg + qtsvg-5 qtx11extras solid xcb-util @@ -646,7 +646,7 @@ of other programs.") pcre polkit-qt qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list pkg-config polkit lxqt-build-tools qttools)) @@ -692,7 +692,7 @@ LXQt.") libqtxdg lxqt-globalkeys qtbase-5 - qtsvg + qtsvg-5 qtx11extras solid)) (native-inputs @@ -739,7 +739,7 @@ when laptop batteries are low on power.") libfm-qt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list lxqt-build-tools qttools)) @@ -779,7 +779,7 @@ Qt with LXQt.") muparser pcre qtbase-5 - qtsvg + qtsvg-5 qtx11extras)) (native-inputs (list pkg-config qttools lxqt-build-tools)) @@ -825,7 +825,7 @@ allows for launching applications or shutting down the system.") libqtxdg procps qtbase-5 - qtsvg + qtsvg-5 qtx11extras xdg-user-dirs)) (native-inputs @@ -893,7 +893,7 @@ for the LXQt desktop environment.") liblxqt libqtxdg qtbase-5 - qtsvg + qtsvg-5 qtx11extras sudo)) (native-inputs @@ -1068,7 +1068,7 @@ manager Compton.") (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 @@ QTermWidget.") (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 @@ like @command{tar} and @command{zip}.") (inputs (list kwindowsystem qtbase-5 - qtsvg + qtsvg-5 liblxqt qtx11extras libqtxdg)) @@ -1332,9 +1332,9 @@ desktop.") xdg-user-dirs xdg-utils ;; Base - ;; TODO: qtsvg is needed for lxqt apps to display icons. Maybe it + ;; TODO: qtsvg-5 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 6a84f47468..72a8957200 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3064,7 +3064,7 @@ ASCII text files using Gmsh's own scripting language.") (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/veusz") `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") + ,(list (string-append (assoc-ref inputs "qtsvg-5") "/lib/qt5/plugins/")))))))))) (native-inputs (list pkg-config @@ -3076,7 +3076,7 @@ ASCII text files using Gmsh's own scripting language.") 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 f2e4d1f302..07f6bc17cb 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -233,7 +233,7 @@ XMPP-based sessions.") ("qca" ,qca) ("qtbase" ,qtbase-5) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtwebkit" ,qtwebkit) ("qtx11extras" ,qtx11extras) ("x11" ,libx11) @@ -1480,7 +1480,7 @@ default.") qtgraphicaleffects qtlocation qtquickcontrols2 - qtsvg + qtsvg-5 qtmultimedia qtxmlpatterns qqc2-desktop-style @@ -1826,7 +1826,7 @@ instant messenger with audio and video chat capabilities.") openal qrencode qtbase-5 - qtsvg + qtsvg-5 sqlcipher)) (home-page "https://qtox.github.io/") (synopsis "Tox chat client using Qt") @@ -2462,7 +2462,7 @@ for the Matrix protocol. It is built on to of @code{Boost.Asio}.") qtgraphicaleffects qtmultimedia qtquickcontrols2 - qtsvg + qtsvg-5 spdlog single-application-qt5 xcb-util-wm @@ -2501,7 +2501,7 @@ notification, emojis, E2E encryption, and voip calls.") qtmultimedia qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 qttools xdg-utils)) (arguments @@ -3041,7 +3041,7 @@ social and chat platform.") ("qtbase" ,qtbase-5) ("qtkeychain" ,qtkeychain) ("qtmultimedia" ,qtmultimedia) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtx11extras" ,qtx11extras) ("usrsctp" ,usrsctp) ("x11" ,libx11) diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index 8d87f8f261..e83c78e4d2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm @@ -464,7 +464,7 @@ support") 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 520d64d33c..2246da84be 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -2264,7 +2264,7 @@ users to select LV2 plugins and run them with jalv.") qtdeclarative qtkeychain qtscript - qtsvg + qtsvg-5 qtx11extras rubberband soundtouch @@ -2301,7 +2301,7 @@ perform creative live mixes with digital music files.") new-session-manager liblo qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://synthv1.sourceforge.io") @@ -2334,7 +2334,7 @@ oscillators and stereo effects.") new-session-manager liblo qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://drumkv1.sourceforge.io") @@ -2367,7 +2367,7 @@ effects.") new-session-manager liblo qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://samplv1.sourceforge.io") @@ -2400,7 +2400,7 @@ effects.") liblo fftwf qtbase-5 - qtsvg)) + qtsvg-5)) (native-inputs (list pkg-config qttools)) (home-page "https://padthv1.sourceforge.io") @@ -2928,7 +2928,7 @@ browser.") "/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 @@ -2972,7 +2972,7 @@ backends, including ALSA, OSS, Network and FluidSynth.") "/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)) @@ -4761,7 +4761,7 @@ includes LV2 plugins and a JACK standalone client.") qtgraphicaleffects qtquickcontrols2 qtscript - qtsvg + qtsvg-5 qtxmlpatterns)) (native-inputs (list pkg-config qttools)) @@ -4828,7 +4828,7 @@ sample library.") pcre pulseaudio ; required by rtaudio qtbase-5 - qtsvg + qtsvg-5 rtaudio rubberband sord)) @@ -5550,7 +5550,7 @@ discard bad quality ones. ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins")) - '("qtbase" "qtmultimedia" "qtsvg"))) + '("qtbase" "qtmultimedia" "qtsvg-5"))) `("QML2_IMPORT_PATH" ":" prefix ,(map (lambda (label) (string-append (assoc-ref inputs label) @@ -5564,7 +5564,7 @@ discard bad quality ones. 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 a48c4997ef..c39123ddfa 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1637,7 +1637,7 @@ of the same name.") minizip qtbase-5 qtmultimedia - qtsvg + qtsvg-5 sbc snappy zlib diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index d579442902..367c9cc288 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -137,7 +137,7 @@ GUI based workflow. It is primarily used in the Orange framework.") (let ((out (assoc-ref outputs "out"))) (wrap-program (string-append out "/bin/orange-canvas") `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") + ,(list (string-append (assoc-ref inputs "qtsvg-5") "/lib/qt5/plugins/")))))))))) (native-inputs (list python-cython)) @@ -172,7 +172,7 @@ GUI based workflow. It is primarily used in the Orange framework.") 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 @@ human.") pcsc-lite qrencode qtbase-5 - qtsvg + qtsvg-5 qtx11extras quazip-0 ; XC_KEESHARE readline @@ -699,7 +699,7 @@ key URIs using the standard otpauth:// scheme.") (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 f269449a92..39266a2822 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -869,7 +869,7 @@ program capable of converting PDF into other formats.") 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..e7761070e0 100644 --- a/gnu/packages/printers.scm +++ b/gnu/packages/printers.scm @@ -58,7 +58,7 @@ (inputs `(("libusb" ,libusb) ("qt" ,qtbase-5) - ("qtsvg" ,qtsvg))) + ("qtsvg-5" ,qtsvg-5))) (native-inputs `(("pkg-config" ,pkg-config) ("qmake" ,qtbase-5))) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 9cb6ae5893..07fc6128c2 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -187,7 +187,7 @@ (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 @@ -829,7 +829,7 @@ developers using C++ or QML, a CSS & JavaScript like language.") (variable "XDG_CONFIG_DIRS") (files '("etc/xdg"))))))) -(define-public qtsvg +(define-public qtsvg-5 (package (inherit qtbase-5) (name "qtsvg") (version "5.15.2") @@ -900,7 +900,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 @@ -915,7 +915,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 @@ -938,7 +938,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 @@ -948,7 +948,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 (list perl)) (inputs @@ -958,7 +958,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 @@ -968,7 +968,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 @@ -985,7 +985,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 @@ -995,7 +995,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 @@ -1013,7 +1013,7 @@ xmlpatternsvalidator."))) pkg-config python python-wrapper - qtsvg + qtsvg-5 vulkan-headers)) (inputs (list mesa qtbase-5)) @@ -1025,7 +1025,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 @@ -1043,7 +1043,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 @@ -1053,7 +1053,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 (list perl qtdeclarative)) @@ -1066,7 +1066,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 @@ -1076,7 +1076,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 @@ -1095,7 +1095,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 @@ -1114,7 +1114,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 @@ -1140,7 +1140,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 @@ -1150,7 +1150,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 @@ -1189,7 +1189,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 @@ -1202,7 +1202,7 @@ compositor libraries."))) (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 @@ -1219,7 +1219,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 @@ -1229,7 +1229,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 @@ -1249,7 +1249,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 @@ -1268,7 +1268,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 @@ -1278,7 +1278,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 @@ -1297,7 +1297,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 @@ -1316,7 +1316,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 @@ -1329,7 +1329,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 (list perl qtdeclarative qtquickcontrols qtserialport)) @@ -1340,7 +1340,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 @@ -1350,7 +1350,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 (list perl qtdeclarative vulkan-headers)) @@ -1362,7 +1362,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 @@ -1382,7 +1382,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 @@ -1392,7 +1392,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 (list qtbase-5 qtdeclarative)) @@ -1402,7 +1402,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 @@ -1412,7 +1412,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 (list qtbase-5 qtdeclarative)) @@ -1423,7 +1423,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 @@ -1433,7 +1433,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 (list qtbase-5 qtdeclarative)) @@ -1446,7 +1446,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 @@ -1472,7 +1472,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 @@ -1499,7 +1499,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 @@ -1515,7 +1515,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 @@ -1525,7 +1525,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 (list qtbase-5 qtdeclarative)) @@ -1538,7 +1538,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 @@ -1548,7 +1548,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 (list qtbase-5 qtdeclarative)) @@ -1561,7 +1561,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 @@ -1571,7 +1571,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 @@ -1587,7 +1587,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 @@ -1597,7 +1597,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 @@ -1620,7 +1620,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 @@ -1631,7 +1631,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 (list qtbase-5)) @@ -1676,7 +1676,7 @@ using the Enchant spell-checking library.") (define-public qtwebengine (package - (inherit qtsvg) + (inherit qtsvg-5) (name "qtwebengine") (version (package-version qtbase-5)) (source @@ -1970,7 +1970,7 @@ using the Enchant spell-checking library.") 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) @@ -2203,7 +2203,7 @@ module provides support functions to the automatically generated code.") ("qtmultimedia" ,qtmultimedia) ("qtsensors" ,qtsensors) ("qtserialport" ,qtserialport) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qttools" ,qttools) ("qtwebchannel" ,qtwebchannel) ("qtwebkit" ,qtwebkit) @@ -2307,7 +2307,7 @@ contain over 620 classes.") ("python-sip" ,python-sip) ("python-pyqt" ,python-pyqt-without-qtwebkit) ("qtbase" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qtdeclarative" ,qtdeclarative) ("qtwebchannel" ,qtwebchannel) ("qtwebengine" ,qtwebengine))) @@ -2693,7 +2693,7 @@ that can be only started once per user. (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 @@ -3019,7 +3019,7 @@ color-related widgets.") qtscxml qtsensors qtspeech - qtsvg + qtsvg-5 qtwebchannel qtwebengine qtwebsockets @@ -3068,7 +3068,7 @@ color-related widgets.") "qtscxml" "qtsensors" "qtspeech" - "qtsvg" + "qtsvg-5" "qttools" "qtwebchannel" "qtwebengine" diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index a694bc0050..d9f8e1002d 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -926,7 +926,7 @@ satellites.") portaudio pulseaudio qtbase-5 - qtsvg + qtsvg-5 spdlog volk)) (arguments @@ -1861,7 +1861,7 @@ Compatible hardware/software: 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 @@ hundred times faster than real-time.") enki protobuf-3.5 ;for logging qtbase-5 - qtsvg + qtsvg-5 qttools ;for libQt5Help, needed by "studio" qtwebkit qtx11extras diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index ec79544367..930c7431a3 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -789,7 +789,7 @@ base64url, base32, base32hex and hex.") libnitrokey libusb qtbase-5 - qtsvg)) + qtsvg-5)) (home-page "https://github.com/Nitrokey/nitrokey-app") (synopsis "GUI tool for Nitrokey devices") (description @@ -856,7 +856,7 @@ devices.") (list pkg-config qttools)) (inputs (list qtbase-5 - qtsvg + qtsvg-5 qtdeclarative qtwebsockets qtgraphicaleffects 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 @@ qtkeychain qtquickcontrols2 qtsolutions - qtsvg + qtsvg-5 qtwebchannel qtwebsockets sqlite diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6c5efc50b9..d62dc831b3 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -566,7 +566,7 @@ Telegram project, for its use in telegram desktop client.") ("pulseaudio" ,pulseaudio) ("qrcodegen" ,qrcodegen-cpp) ("qt" ,qtbase-5) - ("qtsvg" ,qtsvg) + ("qtsvg-5" ,qtsvg-5) ("qt5ct" ,qt5ct) ("qtimageformats" ,qtimageformats) ("qtwayland" ,qtwayland) 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 @@ address of one of the participants.") 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 ddcd0043c4..ff38c97c5d 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -8099,7 +8099,7 @@ and Karl Berry.") 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 0c8531cc4d..41e55db9c2 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -670,7 +670,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. qtdeclarative qtmultimedia qtquickcontrols - qtsvg + qtsvg-5 qtwebchannel)) (propagated-inputs ; To get native-search-path (list qtwebengine)) @@ -695,7 +695,7 @@ scripts/input/X11/C/Shell/HTML/Dired): 49KB. ,(map (lambda (label) (string-append (assoc-ref inputs label) "/lib/qt5/plugins/")) - '("qtsvg" "qtmultimedia")))))))))) + '("qtsvg-5" "qtmultimedia")))))))))) (home-page "https://wereturtle.github.io/ghostwriter/") (synopsis "Write without distractions") (description @@ -770,7 +770,7 @@ environment with Markdown markup.") #:icon "manuskript" #:categories "Office;WordProcessor;")))))))) (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 @@ -870,7 +870,7 @@ editors.") 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 af658ea8d7..c53cfe96d3 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1971,7 +1971,7 @@ videoformats depend on the configuration flags of ffmpeg.") pulseaudio python-wrapper qtbase-5 - qtsvg + qtsvg-5 qtx11extras samba sdl @@ -3194,7 +3194,7 @@ from sites like Twitch.tv and pipes them into a video player of choice.") libsamplerate pulseaudio qtbase-5 - qtsvg + qtsvg-5 rtaudio sdl2 sdl2-image @@ -3362,7 +3362,7 @@ be used for realtime video capture via Linux-specific APIs.") pipewire-0.3 pulseaudio qtbase-5 - qtsvg + qtsvg-5 qtx11extras qtwayland speexdsp @@ -4740,7 +4740,7 @@ API. It includes bindings for Python, Ruby, and other languages.") python-pyqt python-pyzmq python-requests - qtsvg)) + qtsvg-5)) (arguments `(#:modules ((guix build python-build-system) (guix build qt-utils) @@ -4862,7 +4862,7 @@ transitions, and effects and then export your film to many common formats.") qtmultimedia qtquickcontrols qtquickcontrols2 - qtsvg + qtsvg-5 qtwebkit qtwebsockets qtx11extras diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 3ab7dc6be9..24f0682e01 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -260,7 +260,7 @@ ("qtgraphicaleffects" ,qtgraphicaleffects) ("qtquickcontrols" ,qtquickcontrols) ("qtquickcontrols2" ,qtquickcontrols2) - ("qtsvg" ,qtsvg))) + ("qtsvg-5" ,qtsvg-5))) (propagated-inputs (list go-0xacab-org-leap-shapeshifter go-github-com-apparentlymart-go-openvpn-mgmt 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 @@ access.") 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 6100008393..5b54d02e2e 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -370,7 +370,7 @@ with X11 or Wayland, or in a text terminal with ncurses.") `(#: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 |