r34614 - in /desktop/unstable/glib2.0/debian: changelog patches/git_powerpc_gresources.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Apr 26 21:07:55 2012
New Revision: 34614

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=34614
Log:
debian/patches/git_powerpc_gresources.patch: Upstream fix for gresource on
big endian architectures, i.e powerpc. Closes: #669130

Added:
    desktop/unstable/glib2.0/debian/patches/git_powerpc_gresources.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=34614&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Thu Apr 26 21:07:55 2012
@@ -2,8 +2,10 @@
 
   * New upstream release.
   * Refresh patches.
-
- -- Michael Biebl <biebl at debian.org>  Thu, 26 Apr 2012 23:00:54 +0200
+  * debian/patches/git_powerpc_gresources.patch: Upstream fix for gresource on
+    big endian architectures, i.e powerpc. Closes: #669130
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 26 Apr 2012 23:03:59 +0200
 
 glib2.0 (2.32.0-4) unstable; urgency=low
 

Added: desktop/unstable/glib2.0/debian/patches/git_powerpc_gresources.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/git_powerpc_gresources.patch?rev=34614&op=file
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/git_powerpc_gresources.patch (added)
+++ desktop/unstable/glib2.0/debian/patches/git_powerpc_gresources.patch [utf-8] Thu Apr 26 21:07:55 2012
@@ -1,0 +1,28 @@
+Subject: [PATCH] resources: compiler: Fix resources on big endian
+ architectures
+https://bugzilla.gnome.org/show_bug.cgi?id=673409
+---
+
+Index: glib2.0-2.32.1/gio/gresource.c
+===================================================================
+--- glib2.0-2.32.1.orig/gio/gresource.c	2012-04-13 15:39:41.000000000 +0200
++++ glib2.0-2.32.1/gio/gresource.c	2012-04-16 06:36:35.796998600 +0200
+@@ -287,7 +287,7 @@
+       free_path[path_len-1] = 0;
+     }
+ 
+-  value = gvdb_table_get_value (resource->table, path);
++  value = gvdb_table_get_raw_value (resource->table, path);
+ 
+   if (value == NULL)
+     {
+@@ -305,6 +305,9 @@
+                      &_flags,
+                      &array);
+ 
++      _size = GUINT_FROM_LE (_size);
++      _flags = GUINT_FROM_LE (_flags);
++
+       if (size)
+         *size = _size;
+       if (flags)

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=34614&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Thu Apr 26 21:07:55 2012
@@ -6,3 +6,4 @@
 #10-add-a-forgotten-include-guard.patch
 61_glib-compile-binaries-path.patch
 90-gio-modules-multiarch-compat.patch
+git_powerpc_gresources.patch