* [PATCH 1/3] gnu: Add libgudev.
@ 2015-07-25 4:02 宋文武
2015-07-25 4:02 ` [PATCH 2/3] gnu: Prefer libgudev as GUDEV (GObject bindings for libudev) provider 宋文武
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: 宋文武 @ 2015-07-25 4:02 UTC (permalink / raw)
To: guix-devel
* gnu/packages/gnome.scm (libgudev): New variable.
---
gnu/packages/gnome.scm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 410a0f9..115d508 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3077,3 +3077,30 @@ supports playlists, song ratings, and any codecs installed through gstreamer.")
(description "Eye of GNOME is the GNOME image viewer. It
supports image conversion, rotation, and slideshows.")
(license license:gpl2+)))
+
+(define-public libgudev
+ (package
+ (name "libgudev")
+ (version "230")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ version "/" name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "063w6j35n0i0ssmv58kivc1mw4070z6fzb83hi4xfrhcxnn7zrx2"))))
+ (build-system gnu-build-system)
+ (native-inputs
+ `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc.
+ ("gobject-introspection" ,gobject-introspection)
+ ("pkg-config" ,pkg-config)))
+ (propagated-inputs
+ `(("glib" ,glib))) ; required by gudev-1.0.pc
+ (inputs
+ `(("udev" ,eudev)))
+ (home-page "https://wiki.gnome.org/Projects/libgudev")
+ (synopsis "GObject bindings for libudev")
+ (description
+ "This library provides GObject bindings for libudev. It was originally
+part of udev-extras, then udev, then systemd. It's now a project on its own.")
+ (license license:lgpl2.1+)))
--
2.4.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] gnu: Prefer libgudev as GUDEV (GObject bindings for libudev) provider.
2015-07-25 4:02 [PATCH 1/3] gnu: Add libgudev 宋文武
@ 2015-07-25 4:02 ` 宋文武
2015-07-25 23:19 ` Mark H Weaver
2015-07-25 4:02 ` [PATCH 3/3] gnu: colord: Propagate inputs 宋文武
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: 宋文武 @ 2015-07-25 4:02 UTC (permalink / raw)
To: guix-devel
* gnu/packages/gnome.scm (upower, gnome-settings-daemon, rhythmbox)
gnu/packages/xfce.scm (thunar, thunar-volman): Switch to libgudev as
GUDEV provider.
---
gnu/packages/gnome.scm | 8 ++++----
gnu/packages/xfce.scm | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 115d508..11afb61 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2315,8 +2315,8 @@ faster results and to avoid unnecessary server load.")
("intltool" ,intltool)
("python" ,python)))
(inputs
- `(("eudev" ,eudev)
- ("dbus-glib" ,dbus-glib)
+ `(("dbus-glib" ,dbus-glib)
+ ("libgudev" ,libgudev)
("libusb" ,libusb)))
(home-page "http://upower.freedesktop.org/")
(synopsis "System daemon for managing power devices")
@@ -2401,7 +2401,7 @@ services for numerous locations.")
("docbook-xsl" ,docbook-xsl)))
(inputs
`(("colord" ,colord)
- ("eudev" ,eudev)
+ ("libgudev" ,libgudev)
("upower" ,upower)
("polkit" ,polkit)
("pulseaudio" ,pulseaudio)
@@ -3001,8 +3001,8 @@ which can read a large number of file formats.")
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gst-plugins-good" ,gst-plugins-good)
- ("eudev" ,eudev)
("totem-pl-parser" ,totem-pl-parser)
+ ("libgudev" ,libgudev)
;;("libmtp" ,libmtp) FIXME: Not detected
("libsecret" ,libsecret)
("libsoup" ,libsoup)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 5c8b3a6..2cbdeef 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -457,8 +457,8 @@ like appearance, display, keyboard and mouse settings.")
("intltool" ,intltool)))
(inputs
`(("exo" ,exo)
- ("gudev", eudev)
("libexif" ,libexif)
+ ("libgudev" ,libgudev)
("libnotify" ,libnotify)
("libxfce4ui" ,libxfce4ui)
("pcre" ,pcre)
@@ -488,7 +488,7 @@ fast.")
("intltool" ,intltool)))
(inputs
`(("exo" ,exo)
- ("gudev" ,eudev)
+ ("libgudev" ,libgudev)
("libnotify" ,libnotify)
("libxfce4ui" ,libxfce4ui)))
(home-page "http://www.xfce.org/")
--
2.4.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] gnu: colord: Propagate inputs.
2015-07-25 4:02 [PATCH 1/3] gnu: Add libgudev 宋文武
2015-07-25 4:02 ` [PATCH 2/3] gnu: Prefer libgudev as GUDEV (GObject bindings for libudev) provider 宋文武
@ 2015-07-25 4:02 ` 宋文武
2015-07-25 23:21 ` Mark H Weaver
2015-07-25 4:08 ` [PATCH 1/3] gnu: Add libgudev 宋文武
2015-07-25 23:18 ` Mark H Weaver
3 siblings, 1 reply; 8+ messages in thread
From: 宋文武 @ 2015-07-25 4:02 UTC (permalink / raw)
To: guix-devel
* gnu/packages/gnome.scm (colord): Propagate inputs glib, eudev and lcms.
---
gnu/packages/gnome.scm | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 11afb61..738047e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2181,11 +2181,14 @@ keyboard shortcuts.")
("gobject-introspection" ,gobject-introspection)
("libtool" ,libtool)
("intltool" ,intltool)))
+ (propagated-inputs
+ ;; colord.pc refers to all these.
+ `(("glib" ,glib)
+ ("libudev" ,eudev)
+ ("lcms" ,lcms)))
(inputs
- `(("eudev" ,eudev)
- ("dbus-glib" ,dbus-glib)
+ `(("dbus-glib" ,dbus-glib)
("libusb" ,libusb)
- ("lcms" ,lcms)
("sqlite" ,sqlite)
("polkit" ,polkit)
("sane-backends" ,sane-backends)))
--
2.4.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] gnu: Add libgudev.
2015-07-25 4:02 [PATCH 1/3] gnu: Add libgudev 宋文武
2015-07-25 4:02 ` [PATCH 2/3] gnu: Prefer libgudev as GUDEV (GObject bindings for libudev) provider 宋文武
2015-07-25 4:02 ` [PATCH 3/3] gnu: colord: Propagate inputs 宋文武
@ 2015-07-25 4:08 ` 宋文武
2015-07-25 23:18 ` Mark H Weaver
3 siblings, 0 replies; 8+ messages in thread
From: 宋文武 @ 2015-07-25 4:08 UTC (permalink / raw)
To: guix-devel
Both systemd and eudev have remove libgudev from source tree recently.
https://github.com/gentoo/eudev/commit/252150e181c58c5ae58ffac144971767df9921f7
http://cgit.freedesktop.org/systemd/systemd/commit/?id=2375607039517c88df51ef16ddbb624ec1c10654
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/3] gnu: Add libgudev.
2015-07-25 4:02 [PATCH 1/3] gnu: Add libgudev 宋文武
` (2 preceding siblings ...)
2015-07-25 4:08 ` [PATCH 1/3] gnu: Add libgudev 宋文武
@ 2015-07-25 23:18 ` Mark H Weaver
3 siblings, 0 replies; 8+ messages in thread
From: Mark H Weaver @ 2015-07-25 23:18 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <iyzsong@gmail.com> writes:
> * gnu/packages/gnome.scm (libgudev): New variable.
Looks good to me, please push!
Thanks,
Mark
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] gnu: Prefer libgudev as GUDEV (GObject bindings for libudev) provider.
2015-07-25 4:02 ` [PATCH 2/3] gnu: Prefer libgudev as GUDEV (GObject bindings for libudev) provider 宋文武
@ 2015-07-25 23:19 ` Mark H Weaver
0 siblings, 0 replies; 8+ messages in thread
From: Mark H Weaver @ 2015-07-25 23:19 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <iyzsong@gmail.com> writes:
> * gnu/packages/gnome.scm (upower, gnome-settings-daemon, rhythmbox)
> gnu/packages/xfce.scm (thunar, thunar-volman): Switch to libgudev as
> GUDEV provider.
Good, please push!
Thanks,
Mark
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] gnu: colord: Propagate inputs.
2015-07-25 4:02 ` [PATCH 3/3] gnu: colord: Propagate inputs 宋文武
@ 2015-07-25 23:21 ` Mark H Weaver
2015-07-26 1:53 ` 宋文武
0 siblings, 1 reply; 8+ messages in thread
From: Mark H Weaver @ 2015-07-25 23:21 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <iyzsong@gmail.com> writes:
> * gnu/packages/gnome.scm (colord): Propagate inputs glib, eudev and lcms.
> ---
> gnu/packages/gnome.scm | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 11afb61..738047e 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -2181,11 +2181,14 @@ keyboard shortcuts.")
> ("gobject-introspection" ,gobject-introspection)
> ("libtool" ,libtool)
> ("intltool" ,intltool)))
> + (propagated-inputs
> + ;; colord.pc refers to all these.
> + `(("glib" ,glib)
> + ("libudev" ,eudev)
I suppose it doesn't matter, but normally for 'eudev' we make the key
string "udev". Or did you mean to use 'libgudev' here?
> + ("lcms" ,lcms)))
> (inputs
> - `(("eudev" ,eudev)
> - ("dbus-glib" ,dbus-glib)
> + `(("dbus-glib" ,dbus-glib)
> ("libusb" ,libusb)
> - ("lcms" ,lcms)
> ("sqlite" ,sqlite)
> ("polkit" ,polkit)
> ("sane-backends" ,sane-backends)))
Anyway, I'll trust your judgment here. Please push as you see fit.
Thank you!
Mark
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 3/3] gnu: colord: Propagate inputs.
2015-07-25 23:21 ` Mark H Weaver
@ 2015-07-26 1:53 ` 宋文武
0 siblings, 0 replies; 8+ messages in thread
From: 宋文武 @ 2015-07-26 1:53 UTC (permalink / raw)
To: Mark H Weaver; +Cc: guix-devel
Mark H Weaver <mhw@netris.org> writes:
> 宋文武 <iyzsong@gmail.com> writes:
>
>> * gnu/packages/gnome.scm (colord): Propagate inputs glib, eudev and lcms.
>> ---
>> gnu/packages/gnome.scm | 9 ++++++---
>> 1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
>> index 11afb61..738047e 100644
>> --- a/gnu/packages/gnome.scm
>> +++ b/gnu/packages/gnome.scm
>> @@ -2181,11 +2181,14 @@ keyboard shortcuts.")
>> ("gobject-introspection" ,gobject-introspection)
>> ("libtool" ,libtool)
>> ("intltool" ,intltool)))
>> + (propagated-inputs
>> + ;; colord.pc refers to all these.
>> + `(("glib" ,glib)
>> + ("libudev" ,eudev)
>
> I suppose it doesn't matter, but normally for 'eudev' we make the key
> string "udev". Or did you mean to use 'libgudev' here?
colord use both GObject and C-based udev API, unless we disable gudev
in eudev, it will still use GUDEV from eudev, so I don't touch it now,
I agree use 'udev' is less confusing.
>
>> + ("lcms" ,lcms)))
>> (inputs
>> - `(("eudev" ,eudev)
>> - ("dbus-glib" ,dbus-glib)
>> + `(("dbus-glib" ,dbus-glib)
>> ("libusb" ,libusb)
>> - ("lcms" ,lcms)
>> ("sqlite" ,sqlite)
>> ("polkit" ,polkit)
>> ("sane-backends" ,sane-backends)))
Pushed, thanks for review!
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-07-26 1:52 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-25 4:02 [PATCH 1/3] gnu: Add libgudev 宋文武
2015-07-25 4:02 ` [PATCH 2/3] gnu: Prefer libgudev as GUDEV (GObject bindings for libudev) provider 宋文武
2015-07-25 23:19 ` Mark H Weaver
2015-07-25 4:02 ` [PATCH 3/3] gnu: colord: Propagate inputs 宋文武
2015-07-25 23:21 ` Mark H Weaver
2015-07-26 1:53 ` 宋文武
2015-07-25 4:08 ` [PATCH 1/3] gnu: Add libgudev 宋文武
2015-07-25 23:18 ` Mark H Weaver
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).