r25452 - in /desktop/experimental/glib2.0/debian: changelog patches/70_dtrace.patch patches/series

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Fri Oct 29 09:33:02 UTC 2010


Author: slomo
Date: Fri Oct 29 09:32:55 2010
New Revision: 25452

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25452
Log:
  + debian/libglib2.0-0.symbols:
    - Updated
  + debian/patches/70_dtrace.patch:
    - Patch from upstream GIT to not enable DTrace if it's not
      available. Fixes the build on kFreeBSD.

Added:
    desktop/experimental/glib2.0/debian/patches/70_dtrace.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=25452&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Oct 29 09:32:55 2010
@@ -10,10 +10,13 @@
       - Dropped, merged upstream.
     + debian/patches/*:
       - Refreshed.
-  * debian/libglib2.0-0.symbols
-    + Updated
-
- -- Sebastian Dröge <slomo at debian.org>  Fri, 29 Oct 2010 11:08:10 +0200
+    + debian/libglib2.0-0.symbols:
+      - Updated
+    + debian/patches/70_dtrace.patch:
+      - Patch from upstream GIT to not enable DTrace if it's not
+        available. Fixes the build on kFreeBSD.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 29 Oct 2010 11:32:02 +0200
 
 glib2.0 (2.27.0-1) experimental; urgency=low
 

Added: desktop/experimental/glib2.0/debian/patches/70_dtrace.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/70_dtrace.patch?rev=25452&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/70_dtrace.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/70_dtrace.patch [utf-8] Fri Oct 29 09:32:55 2010
@@ -1,0 +1,48 @@
+Index: glib2.0-2.27.1/configure
+===================================================================
+--- glib2.0-2.27.1.orig/configure	2010-10-29 11:29:10.368045795 +0200
++++ glib2.0-2.27.1/configure	2010-10-29 11:30:37.700013079 +0200
+@@ -27049,17 +27042,18 @@
+       if test "x$enable_dtrace" = xyes; then
+         as_fn_error $? "dtrace not found" "$LINENO" 5
+       fi
+-    fi
+-    ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
++    else
++      ac_fn_c_check_header_mongrel "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
+ if test "x$ac_cv_header_sys_sdt_h" = x""yes; then :
+   have_dtrace=yes
+ else
+   if test "x$enable_dtrace" = xyes; then
+-                      as_fn_error $? "dtrace support needs sys/sdt.h header" "$LINENO" 5
+-                     fi
++                        as_fn_error $? "dtrace support needs sys/sdt.h header" "$LINENO" 5
++                       fi
+ fi
+ 
+ 
++    fi
+   fi
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+Index: glib2.0-2.27.1/configure.ac
+===================================================================
+--- glib2.0-2.27.1.orig/configure.ac	2010-10-29 11:29:10.397028810 +0200
++++ glib2.0-2.27.1/configure.ac	2010-10-29 11:29:21.888024724 +0200
+@@ -2785,11 +2785,12 @@
+       if test "x$enable_dtrace" = xyes; then
+         AC_MSG_ERROR([dtrace not found])
+       fi
++    else
++      AC_CHECK_HEADER([sys/sdt.h],have_dtrace=yes,
++                      [if test "x$enable_dtrace" = xyes; then
++                        AC_MSG_ERROR([dtrace support needs sys/sdt.h header])
++                       fi])
+     fi
+-    AC_CHECK_HEADER([sys/sdt.h],have_dtrace=yes,
+-                    [if test "x$enable_dtrace" = xyes; then
+-                      AC_MSG_ERROR([dtrace support needs sys/sdt.h header])
+-                     fi])
+   fi
+ else
+   AC_MSG_RESULT([no])

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=25452&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Fri Oct 29 09:32:55 2010
@@ -4,3 +4,4 @@
 04_homedir_env.patch
 60_wait-longer-for-threads-to-die.patch
 61_glib-compile-schemas-path.patch
+70_dtrace.patch




More information about the pkg-gnome-commits mailing list