[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.2+dfsg-10-26-g4af52c0

Lisandro Damián Nicanor Pérez lisandro at alioth.debian.org
Tue Mar 12 23:32:49 UTC 2013


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

The following commit has been merged in the experimental branch:
commit b41ff766ca1f10737d38ccf06f6df7638eb226d0
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Mar 12 20:30:54 2013 -0300

    Refreshed patch 71_hppa_unaligned_access_fix_458133.diff
---
 debian/changelog                                   |    1 +
 .../71_hppa_unaligned_access_fix_458133.diff       |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 594d33f..a692626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ qt4-x11 (4:4.8.4+dfsg-1) UNRELEASED; urgency=low
     - 08_configure_quilt_compat.diff
     - 12_add_nostrip_for_debug_packages.diff
     - 23_permit_plugins_built_with_future_qt.diff
+    - 71_hppa_unaligned_access_fix_458133.diff
   * Update symbols
 
  -- Timo Jyrinki <timo at debian.org>  Mon, 21 Jan 2013 08:37:04 +0000
diff --git a/debian/patches/71_hppa_unaligned_access_fix_458133.diff b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
index 280092f..c1461ea 100644
--- a/debian/patches/71_hppa_unaligned_access_fix_458133.diff
+++ b/debian/patches/71_hppa_unaligned_access_fix_458133.diff
@@ -8,7 +8,7 @@ Fix unaligned access on hppa
 
 --- a/src/3rdparty/sha1/sha1.cpp
 +++ b/src/3rdparty/sha1/sha1.cpp
-@@ -149,10 +149,10 @@ static inline void sha1ProcessChunk(Sha1
+@@ -150,10 +150,10 @@ static inline void sha1ProcessChunk(Sha1
      quint32 d = state->h3;
      quint32 e = state->h4;
  
@@ -22,7 +22,7 @@ Fix unaligned access on hppa
  
      for (int i = 0; i < 16; ++i)
          chunk->words[i] = qFromBigEndian(chunk->words[i]);
-@@ -188,7 +188,7 @@ static inline void sha1ProcessChunk(Sha1
+@@ -189,7 +189,7 @@ static inline void sha1ProcessChunk(Sha1
      // Wipe variables
  #ifdef SHA1_WIPE_VARIABLES
      a = b = c = d = e = 0;

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list