[SCM] Qt 4 packaging branch, master, updated. debian/4.8.1-1-4-g4579523

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=4579523

The following commit has been merged in the master branch:
commit 457952342fd5d7727a626efe476f03b289944882
Author: Pino Toscano <pino at debian.org>
Date:   Tue May 15 18:44:26 2012 +0200

    add patch qelfreader_fix.diff
    
    fixes the plugin loading on big endian 64 bits architectures, such as s390x and ppc64
---
 debian/changelog                   |    2 ++
 debian/patches/qelfreader_fix.diff |   32 ++++++++++++++++++++++++++++++++
 debian/patches/series              |    1 +
 3 files changed, 35 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c20fce5..61b963c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ qt4-x11 (4:4.8.1-2) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * Change the Homepage to http://qt-project.org/.
+  * Add patch qelfreader_fix.diff to fix plugin loading on big endian 64 bit
+    architectures, such as s390x and ppc64.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 May 2012 21:58:22 +0200
 
diff --git a/debian/patches/qelfreader_fix.diff b/debian/patches/qelfreader_fix.diff
new file mode 100644
index 0000000..e39b9a8
--- /dev/null
+++ b/debian/patches/qelfreader_fix.diff
@@ -0,0 +1,32 @@
+Author: Pino Toscano <toscano.pino at tiscali.it>
+Description: QElfParser: fix type of sh_size
+ The type of the sh_size field of a section header is either Elf32_Word or
+ Elf64_Xword, so the type used cannot be qelfword_t (always 32 bits) but
+ qelfoff_t.
+Last-Update: 2012-05-15
+Forwarded: https://codereview.qt-project.org/#change,26252 (for qt5, still not for qt4)
+
+--- a/src/corelib/plugin/qelfparser_p.cpp
++++ b/src/corelib/plugin/qelfparser_p.cpp
+@@ -61,8 +61,8 @@ const char *QElfParser::parseSectionHead
+          + sizeof(qelfaddr_t);  // sh_addr
+     sh->offset = read<qelfoff_t>(data);
+     data += sizeof(qelfoff_t);  // sh_offset
+-    sh->size = read<qelfword_t>(data);
+-    data += sizeof(qelfword_t); // sh_size
++    sh->size = read<qelfoff_t>(data);
++    data += sizeof(qelfoff_t);  // sh_size
+     return data;
+ }
+ 
+--- a/src/corelib/plugin/qelfparser_p.h
++++ b/src/corelib/plugin/qelfparser_p.h
+@@ -80,7 +80,7 @@ public:
+         qelfword_t name;
+         qelfword_t type;
+         qelfoff_t  offset;
+-        qelfword_t size;
++        qelfoff_t  size;
+     };
+ 
+     int m_endian;
diff --git a/debian/patches/series b/debian/patches/series
index 1962b28..ab91640 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -46,3 +46,4 @@ add_missing_method_for_QBasicAtomicPointer_on_s390.patch
 CVE-2011-3922.patch
 qt_atomic_sparc64.patch
 gcc-4.7.diff
+qelfreader_fix.diff

-- 
Qt 4 packaging