Make some qttools inputs native

  • Done
  • quality assurance status badge
Details
2 participants
  • Danny Milosavljevic
  • Vincent Legoll
Owner
unassigned
Submitted by
Vincent Legoll
Severity
normal

Debbugs page

Vincent Legoll wrote 5 years ago
(address . guix-patches@gnu.org)
CAEwRq=qH_fr=6T8XR80Y+Cug2bqcViiwVRr2PQtZWdV+vsfD5g@mail.gmail.com
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
Vincent Legoll wrote 5 years ago
[PATCH 01/10] gnu: alsa-modular-synth: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-1-vincent.legoll@gmail.com
* 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(-)

Toggle diff (27 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 02/10] gnu: gpsbabel: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-2-vincent.legoll@gmail.com
* 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(-)

Toggle diff (27 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 03/10] gnu: itk-snap: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-3-vincent.legoll@gmail.com
* 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(-)

Toggle diff (27 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 04/10] gnu: kdewebkit: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-4-vincent.legoll@gmail.com
* 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(-)

Toggle diff (32 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 05/10] gnu: kiconthemes: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-5-vincent.legoll@gmail.com
* 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(-)

Toggle diff (24 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 06/10] gnu: kio: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-6-vincent.legoll@gmail.com
* 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(-)

Toggle diff (22 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 07/10] gnu: kplotting: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-7-vincent.legoll@gmail.com
* 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(-)

Toggle diff (20 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 08/10] gnu: kplotting: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-8-vincent.legoll@gmail.com
* 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(-)

Toggle diff (24 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 10/10] gnu: vmpk: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-10-vincent.legoll@gmail.com
* 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(-)

Toggle diff (19 lines)
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
Vincent Legoll wrote 5 years ago
[PATCH 09/10] gnu: synthv1: Make some inputs native.
(address . 40458@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405213202.13798-9-vincent.legoll@gmail.com
* 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(-)

Toggle diff (28 lines)
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
Danny Milosavljevic wrote 5 years ago
Re: [bug#40458] [PATCH 08/10] gnu: kplotting: Make some inputs native.
(name . Vincent Legoll)(address . vincent.legoll@gmail.com)(address . 40458@debbugs.gnu.org)
20200406000359.76c4ed88@scratchpost.org
This one was supposed to say kxmlgui.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl6KVc8ACgkQ5xo1VCww
uqUXqwf/XCKLoyc3x093llaxQtDlhrGpYlJckX2Fi/m+7u6Z7DSgjKuLmPOIBiWs
ZdBvxEzVz5K4UaAV8ayLFNfm5DRQ6JroKsHV4x91cARzQ0uYVY+fHMyGRhBv8VBk
NwT74vUwtummh1wzKsOQw0s7NMq+HpscmY24Yo4632xtQ5Zyya5d++FjPcHMGo+l
ronmotEKuxuWKGN7YsTQN3gAEAlAq4V/a8LnLcgtOM8F03UFPDZnXsUTcZB5LKLu
73u7cIAb4ecrX3DH745MtCUsCA87lhfDmJ7gNzGQ6IqV80o7+QLHETO0+ufUvNye
0ck+WSGg1ef26B6IBDd5OpgdOk0iyQ==
=lmHI
-----END PGP SIGNATURE-----


Danny Milosavljevic wrote 5 years ago
Re: [bug#40458] [PATCH 01/10] gnu: alsa-modular-synth: Make some inputs native.
(name . Vincent Legoll)(address . vincent.legoll@gmail.com)(address . 40458-done@debbugs.gnu.org)
20200406000512.05ac865b@scratchpost.org
Hi,

thanks for the patches!

Pushed the patchset to guix master as
commits 391d12ff8127899db26be8adac9b31fd743742e6 (inclusive)
to f4783d77ed8a24633611693b091102b226004971 (inclusive).
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl6KVhgACgkQ5xo1VCww
uqW8wQf+NKyC/f92hRg/HGixNyOKGKLebzxA4jhH4iWqcY4uKgW/3RGtdX1ymbif
mUTYCnf+nyCJC8h32oiD0+9o39vANB3tl79uYXWnr55SnglOJYqbC5Szo9tyGJY3
Z9/PGVL/AnKgXidPKPuokfGIGWtCHd/A6UR3AV/eJJOwvx8kDrSN0NE/JqdSlqku
D59r58O4c2cvTgaEqwtxnUUb+JwXksis1uASQo+pmfdyB3z8LOwGVk3QyVJYKkPK
RpxKuBx7w7c5pnpIgUgSdOdbc9sn6onA1xVvVZpHQ8xJoXaQ+LnFl9uVxf/AJh5f
SWVwMrEZ4CuunXilqzD+Zk+oDJRAAg==
=Iu6Q
-----END PGP SIGNATURE-----


Closed
Vincent Legoll wrote 5 years ago
Re: [bug#40458] [PATCH 08/10] gnu: kplotting: Make some inputs native.
(name . Danny Milosavljevic)(address . dannym@scratchpost.org)(address . 40458@debbugs.gnu.org)
CAEwRq=o1mwx-941YUNySS5NDvoX-d5w73RShYPaXbLriRyhZDg@mail.gmail.com
On Mon, Apr 6, 2020 at 12:04 AM Danny Milosavljevic
<dannym@scratchpost.org> wrote:
Toggle quote (2 lines)
> 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
?
Your comment

This issue is archived.

To comment on this conversation send an email to 40458@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 40458
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help