r37095 - in /desktop/experimental/glib2.0/debian: changelog patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Wed Mar 20 19:08:29 2013
New Revision: 37095

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37095
Log:
* d/p/11_kfreebsd_pthread_condattr_setclock_prototype.patch:
  + Another patch to fix the build on kfreebsd. Add a prototype
    for pthread_condattr_setclock() when building on kfreebsd
    since the prototype there is missing. The glibc bug to add
    the missing prototype is #703545, we can remove this hack
    when that is fixed.

Added:
    desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=37095&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Wed Mar 20 19:08:29 2013
@@ -1,3 +1,14 @@
+glib2.0 (2.35.9-2) UNRELEASED; urgency=low
+
+  * d/p/11_kfreebsd_pthread_condattr_setclock_prototype.patch:
+    + Another patch to fix the build on kfreebsd. Add a prototype
+      for pthread_condattr_setclock() when building on kfreebsd
+      since the prototype there is missing. The glibc bug to add
+      the missing prototype is #703545, we can remove this hack
+      when that is fixed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 20 Mar 2013 20:05:37 +0100
+
 glib2.0 (2.35.9-1) experimental; urgency=low
 
   * debian/control.in:

Added: desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch?rev=37095&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch [utf-8] Wed Mar 20 19:08:29 2013
@@ -1,0 +1,22 @@
+Author: Emilio Pozuelo Monfort <pochu at debian.org>
+
+Add a prototype for pthread_condattr_setclock() when building
+on kFreeBSD since the prototype there is missing. The glibc bug
+to add the missing prototype is http://bugs.debian.org/703545,
+we can remove this hack when that is fixed.
+
+--- a/glib/gthread-posix.c
++++ b/glib/gthread-posix.c
+@@ -630,6 +630,12 @@
+ 
+ /* {{{1 GCond */
+ 
++#if defined (HAVE_PTHREAD_CONDATTR_SETCLOCK) && defined (CLOCK_MONOTONIC) && defined (__FreeBSD_kernel__)
++extern int pthread_condattr_setclock (pthread_condattr_t *__attr,
++                                      __clockid_t __clock_id)
++     __THROW __nonnull ((1));
++#endif
++
+ static pthread_cond_t *
+ g_cond_impl_new (void)
+ {

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=37095&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Wed Mar 20 19:08:29 2013
@@ -6,5 +6,6 @@
 06_thread_test_ignore_prctl_fail.patch
 07_disable_tests_on_slow_archs.patch
 10_kfreebsd_issetugid_prototype.patch
+11_kfreebsd_pthread_condattr_setclock_prototype.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch