[bug#40458] Make some qttools inputs native

[bug#40458] Make some qttools inputs native

[Vincent Legoll]

This is for the qttools ones, but a few of the
warnings were false positives, as I've found
the packages to retain references to qttools.

So here are those that should still be applied.

The one with most dependents would cause
149 rebuilds, so it looks like they can go to
master.

I have to thank Christopher Baines for the
guix data service, as it made the task easier.

Each batch I send is made with less manual
work and more automated than the preceding
one (but still not fully, and shell- instead of
scheme-based, though).

$ for p in $(cat native-inputs.txt); do
  echo $p;
  guix refresh --list-dependent $p | awk -F: '{print $1}';
done

alsa-modular-synth
No dependents other than itself
gpsbabel
A single dependent package
itk-snap
No dependents other than itself
kdewebkit
Building the following 14 packages would ensure 40 dependent packages
are rebuilt
kiconthemes
Building the following 85 packages would ensure 149 dependent packages
are rebuilt
kio
Building the following 81 packages would ensure 140 dependent packages
are rebuilt
kplotting
Building the following 14 packages would ensure 40 dependent packages
are rebuilt
kxmlgui
Building the following 84 packages would ensure 145 dependent packages
are rebuilt
synthv1
No dependents other than itself
vmpk
No dependents other than itself

-- 
Vincent Legoll

[bug#40458] [PATCH 01/10] gnu: alsa-modular-synth: Make some inputs native.

[Vincent Legoll]

* gnu/packages/audio.scm (alsa-modular-synth)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/audio.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 68cea0a693..f5ef7b0f86 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2019 Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
 ;;; Copyright © 2019 Hartmt Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2019 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -154,10 +155,10 @@
        ("jack" ,jack-1)
        ("ladspa" ,ladspa)
        ("liblo" ,liblo)
-       ("qtbase" ,qtbase)
-       ("qttools" ,qttools)))
+       ("qtbase" ,qtbase)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
+       ("qttools" ,qttools)
        ("gcc" ,gcc-5)))
     (home-page "http://alsamodular.sourceforge.net/")
     (synopsis "Realtime modular synthesizer and effect processor")
-- 
2.26.0

[bug#40458] [PATCH 02/10] gnu: gpsbabel: Make some inputs native.

[Vincent Legoll]

* gnu/packages/gps.scm (gpsbabel)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/gps.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 4393398bb0..4a4b18f3e1 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Guillaume Le Vaillant <glv@posteo.net>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -86,10 +87,10 @@
     (inputs
      `(("expat" ,expat)
        ("zlib" ,zlib)
-       ("qtbase" ,qtbase)
-       ("qttools" ,qttools)))
+       ("qtbase" ,qtbase)))
     (native-inputs
      `(("which" ,which)
+       ("qttools" ,qttools)
        ("libxml2" ,libxml2)))              ;'xmllint' needed for the KML tests
     (home-page "https://www.gpsbabel.org/")
     (synopsis "Convert and exchange data with GPS and map programs")
-- 
2.26.0

[bug#40458] [PATCH 03/10] gnu: itk-snap: Make some inputs native.

[Vincent Legoll]

* gnu/packages/image-processing.scm (itk-snap)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/image-processing.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index f5d67c8917..02d903a6a3 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2018 Lprndn <guix@lprndn.info>
 ;;; Copyright © 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -798,11 +799,11 @@ combine the information contained in both.")
        ("vtk" ,vtk-6)
        ("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)
-       ("qttools" ,qttools)
        ("vxl" ,vxl-1)
        ("zlib" ,zlib)))
     (native-inputs
      `(("googletest" ,googletest)
+       ("qttools" ,qttools)
        ("pkg-config" ,pkg-config)
        ("c3d-src"
         ,(let* ((commit "f521358db26e00002c911cc47bf463b043942ad3")
-- 
2.26.0

[bug#40458] [PATCH 04/10] gnu: kdewebkit: Make some inputs native.

[Vincent Legoll]

* gnu/packages/kde-framework.scm (kdewebkit)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/kde-frameworks.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index aab54ec4fb..1790555ace 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2017 Thomas Danckaert <post@thomasdanckaert.be>
 ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2448,7 +2449,8 @@ with su and ssh respectively.")
                 "1s3bmn1ck7xvc7a6gv7ywv9161hdahiiw20aq88s4qkm2s5wyy6v"))))
     (build-system cmake-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("qttools" ,qttools)))
     (inputs
      `(("kconfig" ,kconfig)
        ("kcoreaddons" ,kcoreaddons)
@@ -2458,7 +2460,6 @@ with su and ssh respectively.")
        ("kservice" ,kservice)
        ("kwallet" ,kwallet)
        ("qtbase" ,qtbase)
-       ("qttools" ,qttools)
        ("qtwebkit" ,qtwebkit)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "KDE Integration for QtWebKit")
-- 
2.26.0

[bug#40458] [PATCH 05/10] gnu: kiconthemes: Make some inputs native.

[Vincent Legoll]

* gnu/packages/kde-frameworks.scm (kiconthemes)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/kde-frameworks.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 1790555ace..304dbee866 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2559,6 +2559,7 @@ window does not need focus for them to be activated.")
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("qttools" ,qttools)
        ("shared-mime-info" ,shared-mime-info)))
     (inputs
      `(("karchive" ,karchive)
@@ -2571,8 +2572,7 @@ window does not need focus for them to be activated.")
        ("kitemviews" ,kitemviews)
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("qtbase" ,qtbase)
-       ("qtsvg" ,qtsvg)
-       ("qttools" ,qttools)))
+       ("qtsvg" ,qtsvg)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-- 
2.26.0

[bug#40458] [PATCH 06/10] gnu: kio: Make some inputs native.

[Vincent Legoll]

* gnu/packages/kde-frameworks.scm (kio)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/kde-frameworks.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 304dbee866..d010027c1d 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -2687,6 +2687,7 @@ consumption.")
        ("solid" ,solid)))
     (native-inputs
      `(("dbus" ,dbus)
+       ("qttools" ,qttools)
        ("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(;; TODO:  LibACL , <ftp://oss.sgi.com/projects/xfs/cmd_tars>
@@ -2709,7 +2710,6 @@ consumption.")
        ("libxslt" ,libxslt)
        ("qtbase" ,qtbase)
        ("qtscript" ,qtscript)
-       ("qttools" ,qttools)
        ("qtx11extras" ,qtx11extras)
        ("sonnet" ,sonnet)))
     (arguments
-- 
2.26.0

[bug#40458] [PATCH 07/10] gnu: kplotting: Make some inputs native.

[Vincent Legoll]

* gnu/packages/kde-framework.scm (kplotting)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/kde-frameworks.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index d010027c1d..e57fc27fbe 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -958,10 +958,10 @@ to flat and hierarchical lists.")
                 "11kpq34j37c1gsvj5nxhkc31bw8gw2n7nkqsfx87jw9f4v2vhmr9"))))
     (build-system qt-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
-    (inputs
-     `(("qtbase" ,qtbase)
+     `(("extra-cmake-modules" ,extra-cmake-modules)
        ("qttools" ,qttools)))
+    (inputs
+     `(("qtbase" ,qtbase)))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Data plotting library")
     (description "KPlotWidget is a QWidget-derived class that provides a virtual
-- 
2.26.0

[bug#40458] [PATCH 08/10] gnu: kplotting: Make some inputs native.

[Vincent Legoll]

* gnu/packages/kde-framework.scm (kplotting)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/kde-frameworks.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index e57fc27fbe..a586b26d7e 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -3242,7 +3242,8 @@ the passwords on KDE work spaces.")
      `(("kconfig" ,kconfig)
        ("kconfigwidgets" ,kconfigwidgets)))
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)))
+     `(("extra-cmake-modules" ,extra-cmake-modules)
+       ("qttools" ,qttools)))
     (inputs
      `(("attica" ,attica)
        ("kauth" ,kauth)
@@ -3256,7 +3257,6 @@ the passwords on KDE work spaces.")
        ("kwidgetsaddons" ,kwidgetsaddons)
        ("kwindowsystem" ,kwindowsystem)
        ("qtbase" ,qtbase)
-       ("qttools" ,qttools)
        ("sonnet" ,sonnet)))
     (arguments
      `(#:tests? #f ; FIXME: 1/5 tests fail.
-- 
2.26.0

[bug#40458] [PATCH 08/10] gnu: kplotting: Make some inputs native.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 39 bytes --]

This one was supposed to say kxmlgui.

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[bug#40458] [PATCH 08/10] gnu: kplotting: Make some inputs native.

[Vincent Legoll]

On Mon, Apr 6, 2020 at 12:04 AM Danny Milosavljevic
<dannym@scratchpost.org> wrote:
> This one was supposed to say kxmlgui.

Argh, I knew I'd screw a copy/paste,
hope this is the only one...

I'll fully automate my process to avoid such mishaps

-- 
Vincent Legoll

[bug#40458] [PATCH 09/10] gnu: synthv1: Make some inputs native.

[Vincent Legoll]

* gnu/packages/music.scm (synthv1)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/music.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 3b5f172dd4..0b9b6e52fa 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2019 raingloom <raingloom@protonmail.com>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
 ;;; Copyright © 2019, 2020 Alexandros Theodotou <alex@zrythm.org>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1422,10 +1423,10 @@ users to select LV2 plugins and run them with jalv.")
        ("alsa-lib" ,alsa-lib)
        ("non-session-manager" ,non-session-manager)
        ("liblo" ,liblo)
-       ("qtbase" ,qtbase)
-       ("qttools" ,qttools)))
+       ("qtbase" ,qtbase)))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
+     `(("pkg-config" ,pkg-config)
+       ("qttools" ,qttools)))
     (home-page "https://synthv1.sourceforge.io")
     (synopsis "Polyphonic subtractive synthesizer")
     (description
-- 
2.26.0

[bug#40458] [PATCH 10/10] gnu: vmpk: Make some inputs native.

[Vincent Legoll]

* gnu/packages/music.scm (vmpk)[inputs]: Move qttools from here...
[native-inputs]: ...to here.
---
 gnu/packages/music.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 0b9b6e52fa..ee402bad4d 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -2139,11 +2139,11 @@ backends, including ALSA, OSS, Network and FluidSynth.")
      `(("drumstick" ,drumstick)
        ("qtbase" ,qtbase)
        ("qtsvg" ,qtsvg)
-       ("qttools" ,qttools)
        ("qtx11extras" ,qtx11extras)))
     (native-inputs
      `(("libxslt" ,libxslt) ;for xsltproc
        ("docbook-xsl" ,docbook-xsl)
+       ("qttools" ,qttools)
        ("pkg-config" ,pkg-config)))
     (home-page "http://vmpk.sourceforge.net")
     (synopsis "Virtual MIDI piano keyboard")
-- 
2.26.0

bug#40458: [PATCH 01/10] gnu: alsa-modular-synth: Make some inputs native.

[Danny Milosavljevic]

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]

Hi,

thanks for the patches!

Pushed the patchset to guix master as
commits 391d12ff8127899db26be8adac9b31fd743742e6 (inclusive)
to f4783d77ed8a24633611693b091102b226004971 (inclusive).

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]