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

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 90c40f5a023ab2a446d55ddbc5e0c43c1bb5c060
Author: Pino Toscano <pino at debian.org>
Date:   Wed May 16 18:19:15 2012 +0200

    replace qelfreader_fix.diff with upstream QElfParser-fix-type-of-sh_size.patch
---
 debian/changelog                                   |    5 +-
 .../patches/QElfParser-fix-type-of-sh_size.patch   |   48 ++++++++++++++++++++
 debian/patches/qelfreader_fix.diff                 |   32 -------------
 debian/patches/series                              |    2 +-
 4 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61b963c..df778a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ 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.
+  * Backport the upstream commit 9e981c4dd03effc2c52b52f529edfa8955e534ce to
+    fix plugin loading on big endian 64 bit architectures, such as s390x and
+    ppc64; patch QElfParser-fix-type-of-sh_size.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 03 May 2012 21:58:22 +0200
 
diff --git a/debian/patches/QElfParser-fix-type-of-sh_size.patch b/debian/patches/QElfParser-fix-type-of-sh_size.patch
new file mode 100644
index 0000000..51e0f26
--- /dev/null
+++ b/debian/patches/QElfParser-fix-type-of-sh_size.patch
@@ -0,0 +1,48 @@
+From 9e981c4dd03effc2c52b52f529edfa8955e534ce Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino at tiscali.it>
+Date: Tue, 15 May 2012 14:40:15 +0200
+Subject: [PATCH] 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.
+
+Change-Id: Ia380b6823913fee7a96b39f742630ae3a9ca0cb8
+Reviewed-by: Thiago Macieira <thiago.macieira at intel.com>
+Reviewed-by: Arvid Picciani <arvid.picciani at nokia.com>
+(backport of 77b179689ba37dc909778fdd00df2701f83a2868 from qtbase)
+---
+ src/corelib/plugin/qelfparser_p.cpp |    4 ++--
+ src/corelib/plugin/qelfparser_p.h   |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp
+index cfe9a9d..33fff42 100644
+--- a/src/corelib/plugin/qelfparser_p.cpp
++++ b/src/corelib/plugin/qelfparser_p.cpp
+@@ -61,8 +61,8 @@ const char *QElfParser::parseSectionHeader(const char *data, ElfSectionHeader *s
+          + 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;
+ }
+ 
+diff --git a/src/corelib/plugin/qelfparser_p.h b/src/corelib/plugin/qelfparser_p.h
+index 2f10807..e552cbc 100644
+--- 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;
+-- 
+1.7.10
+
diff --git a/debian/patches/qelfreader_fix.diff b/debian/patches/qelfreader_fix.diff
deleted file mode 100644
index e39b9a8..0000000
--- a/debian/patches/qelfreader_fix.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-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 ab91640..2f05347 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
 QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch
 QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch
 QTBUG-24718_Fix_a_crash_in_cursorToX_when_new_block_is_added.patch
+QElfParser-fix-type-of-sh_size.patch
 
 # qt-copy patches
 0195-compositing-properties.diff
@@ -46,4 +47,3 @@ 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