[SCM] Qt 4 packaging branch, master, updated. debian/4.8.6+git49-gbc62005+dfsg-1-11-gff1bb1b

Sat Aug 23 15:28:02 UTC 2014

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

The following commit has been merged in the master branch:
commit ff1bb1b0fcad2ca682f5d453de909dff83776735
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Aug 23 12:26:11 2014 -0300

    Refresh patches.
---
 debian/patches/08_configure_quilt_compat.diff         | 2 +-
 debian/patches/12_add_nostrip_for_debug_packages.diff | 2 +-
 debian/patches/15_fix_qmake_makefile_generation.diff  | 2 +-
 debian/patches/no_libicu_message.diff                 | 4 ++--
 debian/patches/powerpcspe.diff                        | 2 +-
 debian/patches/ppc64el_configure_support.patch        | 7 +++----
 debian/patches/qt-multiarch-plugin-path-compat.diff   | 2 +-
 debian/patches/sh.diff                                | 2 +-
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 6b54f77..62883e0 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -7,7 +7,7 @@ It breaks qmake projects search.
 
 --- a/configure
 +++ b/configure
-@@ -9222,7 +9222,7 @@ fi
+@@ -9228,7 +9228,7 @@ fi
  # .projects.3    -> the rest
  rm -f .projects .projects.1 .projects.2 .projects.3
  
diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff
index f56291b..7de25fc 100644
--- a/debian/patches/12_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/12_add_nostrip_for_debug_packages.diff
@@ -10,7 +10,7 @@ let dh_strip do it to generate debug packages.
 
 --- a/configure
 +++ b/configure
-@@ -753,6 +753,8 @@ mkdir -p "$outpath/config.tests"
+@@ -756,6 +756,8 @@ mkdir -p "$outpath/config.tests"
  rm -f "$outpath/config.tests/.qmake.cache"
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  
diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff
index ed3997f..9093e2f 100644
--- a/debian/patches/15_fix_qmake_makefile_generation.diff
+++ b/debian/patches/15_fix_qmake_makefile_generation.diff
@@ -7,7 +7,7 @@ Author: Sune Vuorela <debian at pusling.com>
 
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -2447,7 +2447,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2470,7 +2470,7 @@ MakefileGenerator::writeSubTargets(QText
  
          QString mkfile = subtarget->makefile;
          if(!in_directory.isEmpty())
diff --git a/debian/patches/no_libicu_message.diff b/debian/patches/no_libicu_message.diff
index a6a7fb0..db3f63c 100644
--- a/debian/patches/no_libicu_message.diff
+++ b/debian/patches/no_libicu_message.diff
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/src/corelib/tools/qlocale_icu.cpp
 +++ b/src/corelib/tools/qlocale_icu.cpp
-@@ -84,7 +84,9 @@ bool qt_initIcu(const QString &localeStr
+@@ -88,7 +88,9 @@ bool qt_initIcu(const QString &localeStr
          QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
          lib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
          if (!lib.load()) {
@@ -18,7 +18,7 @@ Forwarded: not-needed
              status = ErrorLoading;
              return false;
          }
-@@ -114,7 +116,9 @@ bool qt_initIcu(const QString &localeStr
+@@ -118,7 +120,9 @@ bool qt_initIcu(const QString &localeStr
          QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
          ucLib.setLoadHints(QLibrary::ImprovedSearchHeuristics);
          if (!ucLib.load()) {
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index a796bc6..a138be6 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3271,7 +3271,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3277,7 +3277,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              CFG_HOST_ARCH=x86_64
          fi
          ;;
diff --git a/debian/patches/ppc64el_configure_support.patch b/debian/patches/ppc64el_configure_support.patch
index 40d6b91..c6be681 100644
--- a/debian/patches/ppc64el_configure_support.patch
+++ b/debian/patches/ppc64el_configure_support.patch
@@ -18,10 +18,9 @@ Some chunks were changed/removed on Debian:
 [2] http://launchpadlibrarian.net/162331250/qt4-x11_4:4.8.4+dfsg-0ubuntu22_4:4.8.5+git192-g085f851+dfsg-2ubuntu1.diff.gz
 [3] https://launchpad.net/ubuntu/+source/qt4-x11/+changelog
 
-diff -pruN a/configure b/configure
---- qt4-x11-4.8.6+dfsg.orig/configure	2014-03-17 13:53:25.000000000 +0000
-+++ qt4-x11-4.8.6+dfsg/configure	2014-03-17 13:55:46.000000000 +0000
-@@ -3277,7 +3280,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+--- a/configure
++++ b/configure
+@@ -3283,7 +3283,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
          fi
          CFG_HOST_ARCH=powerpc
          ;;
diff --git a/debian/patches/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
index dbf8610..de86782 100644
--- a/debian/patches/qt-multiarch-plugin-path-compat.diff
+++ b/debian/patches/qt-multiarch-plugin-path-compat.diff
@@ -17,7 +17,7 @@ Last-Update: 2012-04-25
 
 --- a/src/corelib/kernel/qcoreapplication.cpp
 +++ b/src/corelib/kernel/qcoreapplication.cpp
-@@ -2529,6 +2529,23 @@ QStringList QCoreApplication::libraryPat
+@@ -2531,6 +2531,23 @@ QStringList QCoreApplication::libraryPat
              if (!app_libpaths->contains(installPathPlugins))
                  app_libpaths->append(installPathPlugins);
          }
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 6a1171a..1fe6f21 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3317,6 +3317,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3323,6 +3323,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              ;;
          esac
          ;;

-- 
Qt 4 packaging

