Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2671
Modified Files:
gnome-pilot.info
Added Files:
gnome-pilot.patch
Log Message:
upstream patch for newer libhal
--- NEW FILE: gnome-pilot.patch ---
diff -Nurd -x'*~' gnome-pilot-2.0.16.orig/gpilotd/gpilotd.c
gnome-pilot-2.0.16/gpilotd/gpilotd.c
--- gnome-pilot-2.0.16.orig/gpilotd/gpilotd.c 2008-02-26 19:02:35.000000000
-0500
+++ gnome-pilot-2.0.16/gpilotd/gpilotd.c 2008-11-20 02:58:39.000000000
-0500
@@ -1094,8 +1094,13 @@
* and then try to match the usb_device.product_id and
usb_device.vendor_id
* against the list in devices.xml.
*/
- if (!(bus = libhal_device_get_property_string (hal_ctx, udi,
"info.bus", NULL)))
- return;
+ if (!(bus = libhal_device_get_property_string (hal_ctx, udi,
"info.bus", NULL))) {
+ /* Bastien Durel: newer HAL seems to use info.subsystem, not
info.bus */
+ if (!(bus = libhal_device_get_property_string (hal_ctx, udi,
"info.subsystem", NULL))) {
+ return;
+ }
+ }
+
if (strcmp (bus, "usb_device") != 0) {
libhal_free_string (bus);
return;
Index: gnome-pilot.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/gnome/gnome-pilot.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gnome-pilot.info 20 Nov 2008 07:53:46 -0000 1.3
+++ gnome-pilot.info 20 Nov 2008 08:02:39 -0000 1.4
@@ -1,6 +1,6 @@
Package: gnome-pilot
Version: 2.0.16
-Revision: 3
+Revision: 4
Depends: <<
%N-shlibs (>= %v-%r),
atk1-shlibs (>= 1.24.0-1),
@@ -49,6 +49,7 @@
dbus-dev (>= 1.2.1-1),
esound (>= 0.2.38-1),
expat1,
+ fink (>= 0.24.12-1),
fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.7-7),
gconf2-dev (>= 2.20.0-1),
@@ -86,8 +87,11 @@
<<
Source: mirror:gnome:sources/%n/2.0/%n-%v.tar.bz2
Source-MD5: f14e87d89902f82981f106c8df9277c9
+PatchFile: %n.patch
+PatchFile-MD5: 80e7df8c5bd5aa041ddae665e8229b46
Patchscript: <<
#!/bin/sh -ev
+ %{default_script}
perl -pi -e 's|-scrollkeeper-update|#-scrollkeeper-update|g' `find .
-name Makefile.in -o -name \*.make`
perl -pi -e 's,\(libdir\)/$,(libdir),' gpilotd/Makefile.in
libgpilotdCM/Makefile.in
perl -pi -e 's,(libpisock\.)so,\1dylib,' configure
@@ -184,7 +188,7 @@
Fix doubled-slash in install_name of libraries. See:
http://bugzilla.gnome.org/show_bug.cgi?id=491921
- Need to fix:
+ Fix usage of newer libhal. See:
http://bugzilla.gnome.org/show_bug.cgi?id=484509
<<
License: GPL/LGPL/GFDL
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
