Re: bump hal req to 0.5.10? (Was Re: Releases: gvfs 0.1.0, eel & nautlus 2.21.1)
Luca Ferretti <[email protected]>
| Newsgroups | gmane.comp.gnome.nautilus,gmane.comp.gnome.vfs.general |
|---|---|
| Message-ID | <1198321158.5977.18.camel@redrum> |
Il giorno ven, 21/12/2007 alle 18.18 -0500, David Zeuthen ha scritto: > On Fri, 2007-12-21 at 12:51 +0100, Luca Ferretti wrote: > > Do we need a newer hal? The one shipped with jhbuild (and official > > external dep) is 0.5.9. > > Right, gvfs uses some new client-side API in libhal that uses a hash > table so property lookup is O(1) instead of O(n). > > Since 0.5.10 was released Oct. 11 2007 and GNOME 2.22 is scheduled for > sometime in 2008 I think we probably just want to bump the requirement > to be hal 0.5.10. Most distros shipping 2.20 ship hal 0.5.10; everyone > else, I think, has it in their development trees. > > Anyway, adding release-team to answer this question. Here is the patch for jhbuild. Note that you also need newer expat and newer libvolume_id. -- nautilus-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/nautilus-list
use-newer-hal.diff
(text/x-patch, 4.4 KB)
Index: modulesets/gnome-external-deps-2.22.modules
===================================================================
--- modulesets/gnome-external-deps-2.22.modules (revisione 1757)
+++ modulesets/gnome-external-deps-2.22.modules (copia locale)
@@ -109,9 +109,9 @@
</dependencies>
</tarball>
- <tarball id="hal" version="0.5.9">
- <source href="http://people.freedesktop.org/~david/dist/hal-0.5.9.tar.gz"
- md5sum="a6f532770cf9286e1de38d6570cbc6bc" size="1587364"/>
+ <tarball id="hal" version="0.5.10">
+ <source href="http://hal.freedesktop.org/releases/hal-0.5.10.tar.gz"
+ md5sum="fce852c428e7cda0b937087c79eec63f" size="1591146"/>
<dependencies>
<dep package="dbus-glib"/>
<dep package="libvolume_id"/>
@@ -289,8 +289,8 @@
makeargs="EXTRAS=extras/volume_id prefix=${prefix} libdir=${libdir}"
makeinstallargs="-C extras/volume_id prefix=${prefix} libdir=${libdir} install-bin install-man">
<branch repo="kernel.org"
- module="utils/kernel/hotplug/udev-105.tar.bz2" version="105"
- size="187920" md5sum="e789686432bfdcb6ec23661b111364fa">
+ module="utils/kernel/hotplug/udev-115.tar.bz2" version="115"
+ size="198893" md5sum="39bbe5ddcd62d35cd56b184d6862c540">
<patch file="libvolume_id_Makefile.patch" strip="1"/>
</branch>
</autotools>
@@ -321,9 +321,9 @@
</dependencies>
</tarball>
- <tarball id="expat" version="1.95.7">
- <source href="http://kent.dl.sourceforge.net/sourceforge/expat/expat-1.95.7.tar.gz"
- md5sum="2ff59c2a5cbdd21a285c5f343e214fa9" size="296718"/>
+ <tarball id="expat" version="1.95.8">
+ <source href="http://kent.dl.sourceforge.net/sourceforge/expat/expat-1.95.8.tar.gz"
+ md5sum="aff487543845a82fe262e6e2922b4c8e" size="318349"/>
</tarball>
</moduleset>
Index: patches/libvolume_id_Makefile.patch
===================================================================
--- patches/libvolume_id_Makefile.patch (revisione 1757)
+++ patches/libvolume_id_Makefile.patch (copia locale)
@@ -1,5 +1,5 @@
---- udev-100/extras/volume_id/Makefile- 2006-09-23 11:52:33.000000000 -0400
-+++ udev-100/extras/volume_id/Makefile 2006-09-23 11:53:04.000000000 -0400
+--- udev-115/extras/volume_id/Makefile- 2007-09-04 19:30:57.000000000 -0400
++++ udev-115/extras/volume_id/Makefile 2007-09-04 19:31:03.000000000 -0400
@@ -15,7 +15,7 @@
usrbindir = ${prefix}/usr/bin
usrsbindir = ${prefix}/usr/sbin
@@ -8,9 +8,9 @@
+mandir = ${prefix}/share/man
configdir = ${etcdir}/udev/
- INSTALL = /usr/bin/install -c
---- udev-100/extras/volume_id/lib/Makefile- 2006-09-23 11:58:47.000000000 -0400
-+++ udev-100/extras/volume_id/lib/Makefile 2006-09-23 11:59:23.000000000 -0400
+ INSTALL = install -c
+--- udev-115/extras/volume_id/lib/Makefile- 2007-09-04 19:37:29.000000000 -0400
++++ udev-115/extras/volume_id/lib/Makefile 2007-09-04 19:38:30.000000000 -0400
@@ -4,7 +4,7 @@
#
# Released under the GNU General Public License, version 2.
@@ -20,25 +20,22 @@
libdir = ${prefix}/lib
usrlibdir = ${prefix}/usr/lib
-@@ -102,16 +102,16 @@
-
- install: all
- $(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h
-- $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(usrlibdir)/libvolume_id.a
-+ $(INSTALL_LIB) -D libvolume_id.a $(DESTDIR)$(libdir)/libvolume_id.a
+@@ -105,8 +105,8 @@
$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)
-- ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
+ mkdir -p $(DESTDIR)$(usrlibdir)/
+ ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
- ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
- $(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
-+ ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
-+ ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so
++ ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so
+ $(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(libdir)/pkgconfig/libvolume_id.pc
.PHONY: install
uninstall:
- rm -f $(DESTDIR)$(includedir)/libvolume_id.h
-- rm -f $(DESTDIR)$(usrlibdir)/libvolume_id.a
-+ rm -f $(DESTDIR)$(libdir)/libvolume_id.a
+@@ -115,6 +115,7 @@
rm -f $(DESTDIR)$(libdir)/$(SHLIB)
rm -f $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)
rm -f $(DESTDIR)$(libdir)/libvolume_id.so
++ rm -f $(DESTDIR)$(libdir)/pkgconfig/libvolume_id.pc
+ .PHONY: uninstall
+
+ clean: