File gnome-pilot-hal.patch of Package gnome-pilot
--- gnome-pilot-2.0.14/configure.in
+++ gnome-pilot-2.0.14/configure.in
@@ -157,6 +157,8 @@
BONOBO_ACTIVATION_REQUIRED="bonobo-activation-2.0 >= 1.0.3"
LIBPANELAPPLET_REQUIRED="libpanelapplet-2.0 >= 2.0.6"
GCONF_REQUIRED="gconf-2.0"
+DBUS_REQUIRED="dbus-glib-1 >= 0.31"
+HAL_REQUIRED="hal >= 0.5.4"
PKG_CHECK_MODULES(GNOME_PILOT,
[
@@ -169,6 +171,8 @@
$BONOBO_ACTIVATION_REQUIRED
$GNOMEVFS_REQUIRED
$GCONF_REQUIRED
+ $DBUS_REQUIRED
+ $HAL_REQUIRED
])
GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS $PISOCK_CFLAGS $HAL_CFLAGS"
@@ -240,12 +244,12 @@
dnl Set platform specific libs and defines here
dnl For defines, remember an addition to acconfig.h
-case "$host" in
+case "$host_os" in
*solaris*)
LIBS="$LIBS -lnsl"
;;
*linux*)
- AC_DEFINE(USE_XOPEN_SOURCE,,"Use XOpen Source")
+ AC_DEFINE(USE_GNU_SOURCE,,"Use GNU Source")
;;
esac
--- gnome-pilot-2.0.14/gpilotd/gpilotd.c
+++ gnome-pilot-2.0.14/gpilotd/gpilotd.c
@@ -28,10 +28,10 @@
#endif
/* for crypt () */
-#ifdef USE_XOPEN_SOURCE
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE
-#endif /* _XOPEN_SOURCE */
+#ifdef USE_GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
#endif
#define _BSD_SOURCE 1 /* Or gethostname won't be declared properly
@@ -673,9 +673,8 @@
int ret;
ret = stat (pilot->sync_options.basedir, &buf);
-
- if (ret < 0 || !( S_ISDIR (buf.st_mode) && (buf.st_mode & (S_IRUSR | S_IWUSR |S_IXUSR))) ) {
-
+
+ if (ret < 0 || !(S_ISDIR (buf.st_mode) && (buf.st_mode & (S_IRUSR | S_IWUSR | S_IXUSR)))) {
g_message ("Invalid basedir: %s", pilot->sync_options.basedir);
gpilot_gui_warning_dialog (_("The base directory %s is invalid.\n"
"Please fix it or use gnomecc to choose another directory."),