[jhbuild] [3.0] Add gudev

[Craig Keogh <cskeogh src gnome org>]

commit b40c6e1813049e3cf74f8d94193ee68a37fd0c2d
Author: Craig Keogh <cskeogh adam com au>
Date:   Wed Dec 8 21:27:41 2010 +1030

    [3.0] Add gudev
    
    This adds gudev. gudev is distributed together with udev in the extras
    directory. gudev-145.patch just builds gudev and uses the system udev.
    udev is too low level to JHBuild sandbox, but gudev is ok.
    Alternatively, welcome to use your distro's gudev and add gudev to
    ~/.jhbuildrc 'skip', but remembering that the distro's gudev is built
    against a different glib than the JHBuild sandbox.
    
    This gudev requires system udev >= 145, which is ok for:
    Ubuntu >= 9.10 karmic
    Fedora >= 12 constantine
    Mint >= 8 helena
    openSUSE >= 11.2
    Red Hat >= RHEL-6
    Mandriva >= 2010

 modulesets/gnome-apps-3.0.modules             |    1 +
 modulesets/gnome-suites-core-3.0.modules      |    7 ++
 modulesets/gnome-suites-core-deps-3.0.modules |   12 ++++
 patches/gudev-145.patch                       |   80 +++++++++++++++++++++++++
 4 files changed, 100 insertions(+), 0 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index 56da854..947a2a5 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -384,6 +384,7 @@
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
+      <dep package="gudev"/>
       <dep package="clutter-gst" />
       <dep package="clutter-gtk"/>
       <dep package="libgee"/>
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index dd9f315..68c5eb9 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -180,6 +180,9 @@
       <dep package="gnome-control-center"/>
       <dep package="upower"/>
     </dependencies>
+    <suggests>
+      <dep package="gudev"/>
+    </suggests>
   </autotools>
 
   <autotools id="gnome-power-manager">
@@ -309,6 +312,7 @@
     <suggests>
       <dep package="gconf"/>
       <dep package="gnome-disk-utility"/>
+      <dep package="gudev"/>
     </suggests>
   </autotools>
 
@@ -866,6 +870,7 @@
       <dep package="libgcrypt"/>
       <dep package="gtk-doc"/>
       <dep package="polkit"/>
+      <dep package="gudev"/>
     </dependencies>
   </autotools>
 
@@ -880,6 +885,7 @@
       <dep package="dbus-glib"/>
     </dependencies>
     <suggests>
+      <dep package="gudev"/>
       <dep package="NetworkManager"/>
       <dep package="polkit"/>
     </suggests>
@@ -909,6 +915,7 @@
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
+      <dep package="gudev"/>
     </suggests>
   </tarball>
 
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index c11aff3..eab1df8 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -149,6 +149,7 @@
     <suggests>
       <dep package="gobject-introspection"/>
       <dep package="gdk-pixbuf"/>
+      <dep package="gudev"/>
     </suggests>
   </autotools>
 
@@ -434,6 +435,9 @@
       <dep package="gtk+"/>
       <dep package="liboil"/>
     </dependencies>
+    <suggests>
+      <dep package="gudev"/>
+    </suggests>
   </autotools>
 
   <autotools id="gst-plugins-good" autogenargs="-- --disable-tests --disable-examples" supports-non-srcdir-builds="no">
@@ -445,6 +449,7 @@
     <suggests>
       <dep package="pulseaudio"/>
       <dep package="gdk-pixbuf"/>
+      <dep package="gudev"/>
     </suggests>
   </autotools>
 
@@ -518,6 +523,13 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gudev" check-target="false" supports-non-srcdir-builds="no">
+    <branch checkoutdir="gudev-145" repo="kernel.org"
+            module="utils/kernel/hotplug/udev-145.tar.bz2" version="145">
+      <patch file="gudev-145.patch" strip="1"/>
+    </branch>
+  </autotools>
+
   <tarball id="gupnp" version="0.15.0" autogenargs="--with-context-manager=network-manager">
     <source href="http://www.gupnp.org/sites/all/files/sources/gupnp-0.15.0.tar.gz";
             hash="sha256:7b81df4b0e810b608e29dae8aed79cd1b1e71002db387de7fdb884c2ca1e77eb"
diff --git a/patches/gudev-145.patch b/patches/gudev-145.patch
new file mode 100644
index 0000000..f00c380
--- /dev/null
+++ b/patches/gudev-145.patch
@@ -0,0 +1,80 @@
+diff -urN udev-145.orig/configure.ac udev-145/configure.ac
+--- udev-145.orig/configure.ac	2009-07-08 06:50:09.000000000 +0930
++++ udev-145/configure.ac	2010-12-12 14:14:16.942358001 +1030
+@@ -62,6 +62,10 @@
+ 	AC_CHECK_LIB([acl], [acl_init], [:], AC_MSG_ERROR([libacl not found]))
+ 	AC_CHECK_HEADER([acl/libacl.h], [:], AC_MSG_ERROR([libacl header not found]))
+ 
++	PKG_CHECK_MODULES(LIBUDEV, libudev >= 145)
++	AC_SUBST(LIBUDEV_CFLAGS)
++	AC_SUBST(LIBUDEV_LIBS)
++
+ 	PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.12)
+ 	AC_SUBST(LIBUSB_CFLAGS)
+ 	AC_SUBST(LIBUSB_LIBS)
+diff -urN udev-145.orig/extras/gudev/Makefile.am udev-145/extras/gudev/Makefile.am
+--- udev-145.orig/extras/gudev/Makefile.am	2009-07-04 11:42:06.000000000 +0930
++++ udev-145/extras/gudev/Makefile.am	2010-12-12 14:13:41.181358001 +1030
+@@ -54,9 +54,9 @@
+ 	gudevprivate.h \
+ 	$(BUILT_SOURCES)
+ 
+-libgudev_1_0_la_CFLAGS = $(GLIB_CFLAGS)
++libgudev_1_0_la_CFLAGS = $(LIBUDEV_CFLAGS) $(GLIB_CFLAGS)
+ 
+-libgudev_1_0_la_LIBADD = $(top_builddir)/libudev/libudev.la $(GLIB_LIBS)
++libgudev_1_0_la_LIBADD = $(LIBUDEV_LIBS) $(GLIB_LIBS)
+ 
+ LT_CURRENT=0
+ LT_REVISION=1
+diff -urN udev-145.orig/extras/Makefile.am udev-145/extras/Makefile.am
+--- udev-145.orig/extras/Makefile.am	2009-06-17 19:42:08.000000000 +0930
++++ udev-145/extras/Makefile.am	2010-12-12 14:13:38.295358004 +1030
+@@ -1,25 +1,4 @@
+ include $(top_srcdir)/Makefile.am.inc
+ 
+-SUBDIRS = \
+-	ata_id \
+-	cdrom_id \
+-	edd_id \
+-	path_id \
+-	firmware \
+-	collect \
+-	floppy \
+-	fstab_import \
+-	rule_generator \
+-	scsi_id \
+-	usb_id \
+-	v4l_id
++SUBDIRS = gudev
+ 
+-if ENABLE_EXTRAS
+-SUBDIRS += \
+-	udev-acl \
+-	usb-db \
+-	hid2hci \
+-	keymap \
+-	modem-modeswitch \
+-	gudev
+-endif
+diff -urN udev-145.orig/Makefile.am udev-145/Makefile.am
+--- udev-145.orig/Makefile.am	2009-06-20 02:54:10.000000000 +0930
++++ udev-145/Makefile.am	2010-12-12 14:13:47.563358008 +1030
+@@ -1,15 +1,6 @@
+ include $(top_srcdir)/Makefile.am.inc
+-
+-SUBDIRS = \
+-	docs \
+-	libudev \
+-	udev \
+-	rules \
+-	extras
+-
+-udevconfdir = $(sysconfdir)/udev
+-dist_udevconf_DATA = \
+-	udev.conf
++ 
++SUBDIRS = extras
+ 
+ EXTRA_DIST = \
+ 	autogen.sh