native-inputs for desktop-file-utils

DoneSubmitted by Vincent Legoll.
Details
2 participants
  • Danny Milosavljevic
  • Vincent Legoll
Owner
unassigned
Severity
normal
V
V
Vincent Legoll wrote on 5 Apr 2020 13:46
(address . guix-patches@gnu.org)
CAEwRq=qE-_2eYQW8DYqfJ3GvL_d6Mbyiho_uD5-PuAZKo3qaow@mail.gmail.com
Those could all go to master.

Same check as for the previous batches

--
Vincent Legoll
V
V
Vincent Legoll wrote on 5 Apr 2020 13:48
[PATCH 1/9] gnu: aegisub: Make some inputs native.
(address . 40446@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405114835.18229-1-vincent.legoll@gmail.com
* gnu/packages/video.scm (aegisub)[inputs]: Move desktop-files-utils from here...
[native-inputs]: ...to here.
---
gnu/packages/video.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (30 lines)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index c62e651612..83cce1753e 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2020 Josh Holland <josh@inv.alid.pw>
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3277,7 +3278,6 @@ programmers to access a standard API to open and decompress media files.")
                  #t)))))
     (inputs
      `(("boost" ,boost)
-       ("desktop-file-utils" ,desktop-file-utils)
        ("ffms2" ,ffms2)
        ("fftw" ,fftw)
        ("hunspell" ,hunspell)
@@ -3290,6 +3290,7 @@ programmers to access a standard API to open and decompress media files.")
        ("wxwidgets-gtk2" ,wxwidgets-gtk2)))
     (native-inputs
      `(("intltool" ,intltool)
+       ("desktop-file-utils" ,desktop-file-utils)
        ("pkg-config" ,pkg-config)))
     (home-page "http://www.aegisub.org/")
     (synopsis "Subtitle engine")
-- 
2.26.0
V
V
Vincent Legoll wrote on 5 Apr 2020 13:48
[PATCH 2/9] gnu: geda-gaf: Make some inputs native.
(address . 40446@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405114835.18229-2-vincent.legoll@gmail.com
* gnu/packages/engineering.scm (geda-gaf)[inputs]: Move desktop-files-utils from here...
[native-inputs]: ...to here.
---
gnu/packages/engineering.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

Toggle diff (29 lines)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index d4117de25e..aa4384e868 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019 Steve Sprang <scs@stevesprang.com>
 ;;; Copyright © 2019 John Soo <jsoo1@asu.edu>
 ;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -227,13 +228,13 @@ plans and designs.")
        ("glib" ,glib)
        ("gtk" ,gtk+-2)
        ("guile" ,guile-2.0)
-       ("desktop-file-utils" ,desktop-file-utils)
        ("shared-mime-info" ,shared-mime-info)
        ("m4" ,m4)
        ("pcb" ,pcb)
        ("python" ,python-2))) ; for xorn
     (native-inputs
      `(("pkg-config" ,pkg-config)
+       ("desktop-file-utils" ,desktop-file-utils)
        ("perl" ,perl))) ; for tests
     (home-page "http://geda-project.org/")
     (synopsis "Schematic capture, netlister, symbols, symbol checker, and utils")
-- 
2.26.0
V
V
Vincent Legoll wrote on 5 Apr 2020 13:48
[PATCH 4/9] gnu: lepton-eda: Make some inputs native.
(address . 40446@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405114835.18229-4-vincent.legoll@gmail.com
* gnu/packages/engineering.scm (lepton-eda)[inputs]: Move desktop-files-utils from here...
[native-inputs]: ...to here.
---
gnu/packages/engineering.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (22 lines)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 36cfcb96aa..82f947f06a 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -267,6 +267,7 @@ utilities.")
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
+       ("desktop-file-utils" ,desktop-file-utils)
        ("libtool" ,libtool)
        ("gettext" ,gettext-minimal)
        ("texinfo" ,texinfo)
@@ -277,7 +278,6 @@ utilities.")
      `(("glib" ,glib)
        ("gtk" ,gtk+-2)
        ("guile" ,guile-2.2)
-       ("desktop-file-utils" ,desktop-file-utils)
        ("shared-mime-info" ,shared-mime-info)
        ("m4" ,m4)
        ("pcb" ,pcb)))
-- 
2.26.0
V
V
Vincent Legoll wrote on 5 Apr 2020 13:48
[PATCH 5/9] gnu: mate: Make some inputs native.
(address . 40446@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405114835.18229-5-vincent.legoll@gmail.com
* gnu/packages/mate.scm (mate)[inputs]: Move desktop-files-utils from here...
[native-inputs]: ...to this new field.
---
gnu/packages/mate.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (22 lines)
diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm
index eaafc5db63..f5d0b834b6 100644
--- a/gnu/packages/mate.scm
+++ b/gnu/packages/mate.scm
@@ -1551,6 +1551,7 @@ used to bring up authentication dialogs.")
             (union-build (assoc-ref %outputs "out")
                          directories)
             #t)))))
+    (native-inputs `(("desktop-file-utils" ,desktop-file-utils)))
     (inputs
      ;; TODO: Add more packages
      `(("at-spi2-core"              ,at-spi2-core)
@@ -1558,7 +1559,6 @@ used to bring up authentication dialogs.")
        ("caja"                      ,caja)
        ("dbus"                      ,dbus)
        ("dconf"                     ,dconf)
-       ("desktop-file-utils"        ,desktop-file-utils)
        ("engrampa"                  ,engrampa)
        ("eom"                       ,eom)
        ("font-cantarell"            ,font-cantarell)
-- 
2.26.0
V
V
Vincent Legoll wrote on 5 Apr 2020 13:48
[PATCH 6/9] gnu: pcb: Make some inputs native.
(address . 40446@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405114835.18229-6-vincent.legoll@gmail.com
* gnu/packages/engineering.scm (pcb)[inputs]: Move desktop-files-utils from here...
[native-inputs]: ...to here.
---
gnu/packages/engineering.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (21 lines)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 82f947f06a..5405db762c 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -386,13 +386,13 @@ features.")))
        ("gd" ,gd)
        ("gtk" ,gtk+-2)
        ("gtkglext" ,gtkglext)
-       ("desktop-file-utils" ,desktop-file-utils)
        ("shared-mime-info" ,shared-mime-info)
        ("tk" ,tk)))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)
        ("bison" ,bison)
+       ("desktop-file-utils" ,desktop-file-utils)
        ("flex" ,flex)
        ;; For tests
        ("imagemagick" ,imagemagick)
-- 
2.26.0
V
V
Vincent Legoll wrote on 5 Apr 2020 13:48
[PATCH 7/9] gnu: ristretto: Make some inputs native.
(address . 40446@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405114835.18229-7-vincent.legoll@gmail.com
* gnu/packages/xfce.scm (ristretto)[inputs]: Move desktop-files-utils from here...
[native-inputs]: ...to here.
---
gnu/packages/xfce.scm | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

Toggle diff (27 lines)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index e8cb215d35..ac9663f2e3 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2019 Pkill -9 <pkill9@runbox.com>
 ;;; Copyright © 2019 L  p R n  d n <guix@lprndn.info>
 ;;; Copyright © 2019 Ingo Ruhnke <grumbel@gmail.com>
+;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -926,10 +927,10 @@ inhibit interface which allows applications to prevent automatic sleep.")
     (build-system gnu-build-system)
     (native-inputs
      `(("intltool" ,intltool)
+       ("desktop-file-utils" ,desktop-file-utils)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("desktop-file-utils" ,desktop-file-utils)
-       ("gtk+" ,gtk+)
+     `(("gtk+" ,gtk+)
        ("libexif" ,libexif)
        ("libxfce4ui" ,libxfce4ui)
        ("librsvg" ,librsvg)
-- 
2.26.0
V
V
Vincent Legoll wrote on 5 Apr 2020 13:48
[PATCH 9/9] gnu: xfce4-places-plugin: Make some inputs native.
(address . 40446@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405114835.18229-9-vincent.legoll@gmail.com
* gnu/packages/xfce.scm (xfce4-places-plugin)[inputs]: Move desktop-files-utils from here...
[native-inputs]: ...to here.
---
gnu/packages/xfce.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index ac9663f2e3..428d89dd1b 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -1707,10 +1707,10 @@ interfaces of your choice in the panel.")
     (build-system gnu-build-system)
     (native-inputs
      `(("intltool" ,intltool)
+       ("desktop-file-utils" ,desktop-file-utils)
        ("pkg-config" ,pkg-config)))
     (inputs
-     `(("desktop-file-utils" ,desktop-file-utils)
-       ("gtk+-2" ,gtk+-2)
+     `(("gtk+-2" ,gtk+-2)
        ("exo" ,exo)
        ("libxfce4ui" ,libxfce4ui)
        ("xfce4-panel" ,xfce4-panel)))
-- 
2.26.0
V
V
Vincent Legoll wrote on 5 Apr 2020 13:48
[PATCH 8/9] gnu: spacefm: Make some inputs native.
(address . 40446@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405114835.18229-8-vincent.legoll@gmail.com
* gnu/packages/lxde.scm (spacefm)[inputs]: Move desktop-files-utils from here...
[native-inputs]: ...to here.
---
gnu/packages/lxde.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Toggle diff (19 lines)
diff --git a/gnu/packages/lxde.scm b/gnu/packages/lxde.scm
index dac2ef6d24..f5dc027e03 100644
--- a/gnu/packages/lxde.scm
+++ b/gnu/packages/lxde.scm
@@ -264,11 +264,11 @@ with freedesktop.org standard.")
               (file-name (string-append name "-" version ".tar.gz"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
+                     ("desktop-file-utils" ,desktop-file-utils)
                      ("intltool" ,intltool)))
     (inputs `(("bash" ,bash)
               ("gtk+" ,gtk+)
               ("eudev" ,eudev)
-              ("desktop-file-utils" ,desktop-file-utils)
               ("shared-mime-info" ,shared-mime-info)
               ("ffmpegthumbnailer" ,ffmpegthumbnailer)
               ("jmtpfs" ,jmtpfs)
-- 
2.26.0
V
V
Vincent Legoll wrote on 5 Apr 2020 13:48
[PATCH 3/9] gnu: gerbv: Make some inputs native.
(address . 40446@debbugs.gnu.org)(name . Vincent Legoll)(address . vincent.legoll@gmail.com)
20200405114835.18229-3-vincent.legoll@gmail.com
* gnu/packages/engineering.scm (gerbv)[inputs]: Move desktop-files-utils from here...
[native-inputs]: ...to here.
---
gnu/packages/engineering.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (20 lines)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index aa4384e868..36cfcb96aa 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -676,11 +676,11 @@ ready for production.")
     (build-system gnu-build-system)
     (native-inputs
      `(("glib:bin" ,glib "bin")         ; for glib-compile-schemas, etc.
+       ("desktop-file-utils" ,desktop-file-utils)
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("cairo" ,cairo)
-       ("gtk" ,gtk+-2)
-       ("desktop-file-utils" ,desktop-file-utils)))
+       ("gtk" ,gtk+-2)))
     (home-page "http://gerbv.geda-project.org/")
     (synopsis "Gerber file viewer")
     (description
-- 
2.26.0
D
D
Danny Milosavljevic wrote on 5 Apr 2020 19:33
Re: [bug#40446] [PATCH 1/9] gnu: aegisub: Make some inputs native.
(name . Vincent Legoll)(address . vincent.legoll@gmail.com)(address . 40446-done@debbugs.gnu.org)
20200405193359.4b9e59bb@scratchpost.org
Hi Vincent,

thanks for the patches!

I've pushed the patchset to guix master as
commits 2f0952616535c8bbd2bdeff24a9fd33e72f72c96 (inclusive)
to 223e920abc023be91fe1e6747c599d547ad12bc5 (inclusive).
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEds7GsXJ0tGXALbPZ5xo1VCwwuqUFAl6KFocACgkQ5xo1VCww
uqWCQgf+O82I9rAdPT6vZEF9zK3+k0PYGThMy3PgbRQI/SimtwZIEZw82zRe3/ld
dvp2bPreoItBTk1nSGpGkY6B0EwOtiwkJSWxWGy9qc+ixX9FQwL45fKOQ237mf/s
qHlGKBRZN0DYLjL3OoeFGdmY1aQ4DUk2QP+CYavyKlxbz2bgYMd2wmscz4vWFFtG
rFBINKGzQsezWQdunTo49WuMRJls15M5T90I1lHTHhodvUgGEc3nfpQCb+0lqprh
Uh419DW9WBhvIFMXn7+cdFWIl6lOE3t7wnXZXqugiB3ahpXeoasffoWEAP7WkfE/
gts6a6wy4w+/ZXdMvaaqkNg44VJlMg==
=p2lA
-----END PGP SIGNATURE-----


Closed
?
Your comment

This issue is archived.

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