[maemo-commits] [maemo-commits] r18324 - projects/haf/trunk/dbus/debian/patches

[From: subversion at stage.maemo.org]

Author: makarhun
Date: 2009-05-12 12:13:43 +0300 (Tue, 12 May 2009)
New Revision: 18324

Modified:
   projects/haf/trunk/dbus/debian/patches/45-dbus-clock-monotonic-1.patch
Log:
DUH

Modified: projects/haf/trunk/dbus/debian/patches/45-dbus-clock-monotonic-1.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/45-dbus-clock-monotonic-1.patch	2009-05-12 08:10:19 UTC (rev 18323)
+++ projects/haf/trunk/dbus/debian/patches/45-dbus-clock-monotonic-1.patch	2009-05-12 09:13:43 UTC (rev 18324)
@@ -67,7 +67,7 @@
  
 -  result = pthread_cond_init (&pcond->cond, NULL);
 +  pthread_condattr_init (&attr);
-+#ifdef HAVE_CLOCK_MONOTONIC
++#ifdef HAVE_MONOTONIC_CLOCK
 +  if (have_monotonic_clock)
 +    pthread_condattr_setclock (&attr, CLOCK_MONOTONIC);
 +#endif
@@ -83,7 +83,7 @@
    _dbus_assert (pthread_equal (pmutex->holder, pthread_self ()));  
 -  
 +
-+#ifdef HAVE_CLOCK_MONOTONIC
++#ifdef HAVE_MONOTONIC_CLOCK
 +  if (have_monotonic_clock)
 +    {
 +      struct timespec monotonic_timer;
@@ -104,7 +104,7 @@
 +static void
 +check_monotonic_clock (void)
 +{
-+#ifdef HAVE_CLOCK_MONOTONIC
++#ifdef HAVE_MONOTONIC_CLOCK
 +  struct timespec dummy;
 +  if (clock_getres (CLOCK_MONOTONIC, &dummy) == 0)
 +    have_monotonic_clock = TRUE;
@@ -125,7 +125,7 @@
  _dbus_get_current_time (long *tv_sec,
                          long *tv_usec)
  {
-+#ifdef HAVE_CLOCK_MONOTONIC
++#ifdef HAVE_MONOTONIC_CLOCK
 +  struct timespec monotonic_timer;
 +
 +  clock_gettime (CLOCK_MONOTONIC, &monotonic_timer);
@@ -146,3 +146,19 @@
  }
  
  /**
+Index: dbus-1.2.12/dbus/Makefile.am
+===================================================================
+--- dbus-1.2.12.orig/dbus/Makefile.am
++++ dbus-1.2.12/dbus/Makefile.am
+@@ -173,9 +173,9 @@ noinst_LTLIBRARIES=libdbus-convenience.l
+ libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS)
+ ## don't export symbols that start with "_" (we use this 
+ ## convention for internal symbols)
+-libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ @PIC_LDFLAGS@
++libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ @PIC_LDFLAGS@ -lrt
+ 
+-libdbus_convenience_la_LDFLAGS=@R_DYNAMIC_LDFLAG@
++libdbus_convenience_la_LDFLAGS=@R_DYNAMIC_LDFLAG@ -lrt
+ 
+ ## note that TESTS has special meaning (stuff to use in make check)
+ ## so if adding tests not to be run in make check, don't add them to