r16527 - in /desktop/unstable/glib2.0/debian: changelog patches/04_big-endian.patch patches/99_autoconf.patch patches/series

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Mon Jul 14 12:47:16 UTC 2008


Author: slomo
Date: Mon Jul 14 12:47:15 2008
New Revision: 16527

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16527
Log:
* debian/patches/04_big-endian.patch,
  debian/patches/99_autoconf.patch:
  + Fix endianness detection on big endian architectures like PPC. In
    2.16.4-1 this was broken, resulting in essentially every package
    built against it on big endian architectures to be potentially broken.
    Set urgency=high for this.

Added:
    desktop/unstable/glib2.0/debian/patches/04_big-endian.patch
    desktop/unstable/glib2.0/debian/patches/99_autoconf.patch
Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/patches/series

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=16527&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog (original)
+++ desktop/unstable/glib2.0/debian/changelog Mon Jul 14 12:47:15 2008
@@ -1,3 +1,14 @@
+glib2.0 (2.16.4-2) unstable; urgency=high
+
+  * debian/patches/04_big-endian.patch,
+    debian/patches/99_autoconf.patch:
+    + Fix endianness detection on big endian architectures like PPC. In
+      2.16.4-1 this was broken, resulting in essentially every package
+      built against it on big endian architectures to be potentially broken.
+      Set urgency=high for this.
+
+ -- Sebastian Dröge <slomo at debian.org>  Mon, 14 Jul 2008 14:45:15 +0200
+
 glib2.0 (2.16.4-1) unstable; urgency=low
 
   [ Josselin Mouette ]

Added: desktop/unstable/glib2.0/debian/patches/04_big-endian.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/04_big-endian.patch?rev=16527&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/04_big-endian.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/04_big-endian.patch Mon Jul 14 12:47:15 2008
@@ -1,0 +1,44 @@
+--- glib-2.16.4/configure.in.old	2008-07-14 14:39:51.000000000 +0200
++++ glib-2.16.4/configure.in	2008-07-14 14:40:33.000000000 +0200
+@@ -831,6 +831,19 @@
+ 
+ # check for bytesex stuff
+ AC_C_BIGENDIAN
++if test x$ac_cv_c_bigendian = xuniversal ; then
++AC_TRY_COMPILE([#include <endian.h>], [#if __BYTE_ORDER == __BIG_ENDIAN
++#else
++#error Not a big endian. 
++#endif],
++    ac_cv_c_bigendian=yes
++    ,AC_TRY_COMPILE([#include <endian.h>], [#if __BYTE_ORDER == __LITTLE_ENDIAN
++#else
++#error Not a little endian. 
++#endif],
++    ac_cv_c_bigendian=no
++    ,AC_MSG_WARN([Could not determine endianness.])))
++fi
+ 
+ # check for header files
+ AC_CHECK_HEADERS([dirent.h float.h limits.h pwd.h grp.h sys/param.h sys/poll.h sys/resource.h])
+@@ -3137,18 +3150,15 @@
+ g_have_gnuc_visibility=$g_have_gnuc_visibility
+ g_have_sunstudio_visibility=$g_have_sunstudio_visibility
+ 
+-case xyes in
+-x$ac_cv_c_bigendian)
++if test x$ac_cv_c_bigendian = xyes; then
+   g_byte_order=G_BIG_ENDIAN
+   g_bs_native=BE
+   g_bs_alien=LE
+-  ;;
+-*)
++else
+   g_byte_order=G_LITTLE_ENDIAN
+   g_bs_native=LE
+   g_bs_alien=BE
+-  ;;
+-esac
++fi
+ 
+ g_pollin=$glib_cv_value_POLLIN
+ g_pollout=$glib_cv_value_POLLOUT

Added: desktop/unstable/glib2.0/debian/patches/99_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/99_autoconf.patch?rev=16527&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/99_autoconf.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/99_autoconf.patch Mon Jul 14 12:47:15 2008
@@ -1,0 +1,145 @@
+--- glib-2.16.4/configure.old	2008-07-14 14:42:13.000000000 +0200
++++ glib-2.16.4/configure	2008-07-14 14:42:43.000000000 +0200
+@@ -31836,6 +31836,100 @@
+    { (exit 1); exit 1; }; } ;;
+  esac
+ 
++if test x$ac_cv_c_bigendian = xuniversal ; then
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <endian.h>
++int
++main ()
++{
++#if __BYTE_ORDER == __BIG_ENDIAN
++#else
++#error Not a big endian.
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_c_bigendian=yes
++
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <endian.h>
++int
++main ()
++{
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++#else
++#error Not a little endian.
++#endif
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_c_bigendian=no
++
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	{ $as_echo "$as_me:$LINENO: WARNING: Could not determine endianness." >&5
++$as_echo "$as_me: WARNING: Could not determine endianness." >&2;}
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
+ 
+ # check for header files
+ 
+@@ -47144,18 +47238,15 @@
+ g_have_gnuc_visibility=$g_have_gnuc_visibility
+ g_have_sunstudio_visibility=$g_have_sunstudio_visibility
+ 
+-case xyes in
+-x$ac_cv_c_bigendian)
++if test x$ac_cv_c_bigendian = xyes; then
+   g_byte_order=G_BIG_ENDIAN
+   g_bs_native=BE
+   g_bs_alien=LE
+-  ;;
+-*)
++else
+   g_byte_order=G_LITTLE_ENDIAN
+   g_bs_native=LE
+   g_bs_alien=BE
+-  ;;
+-esac
++fi
+ 
+ g_pollin=$glib_cv_value_POLLIN
+ g_pollout=$glib_cv_value_POLLOUT
+@@ -47568,9 +47659,9 @@
+   }
+   split(mac1, mac2, "(") #)
+   macro = mac2[1]
+-  prefix = substr(line, 1, index(line, defundef) - 1)
+   if (D_is_set[macro]) {
+     # Preserve the white space surrounding the "#".
++    prefix = substr(line, 1, index(line, defundef) - 1)
+     print prefix "define", macro P[macro] D[macro]
+     next
+   } else {
+@@ -47578,7 +47669,7 @@
+     # in the case of _POSIX_SOURCE, which is predefined and required
+     # on some systems where configure will not decide to define it.
+     if (defundef == "undef") {
+-      print "/*", prefix defundef, macro, "*/"
++      print "/*", line, "*/"
+       next
+     }
+   }

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=16527&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series (original)
+++ desktop/unstable/glib2.0/debian/patches/series Mon Jul 14 12:47:15 2008
@@ -1,4 +1,6 @@
 01_gettext-desktopfiles.patch
 02_usr_share_gnome_applications.patch
 03_blacklist-directories.patch
+04_big-endian.patch
 60_wait-longer-for-threads-to-die.patch
+99_autoconf.patch




More information about the pkg-gnome-commits mailing list