Refresh patches.

7 files changed, 8 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index fab09ab..ba9907d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qt4-x11 (4:4.8.6+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Also add ppc64 to the list of non-pch build archs. Thanks Hiroyuki Yamamoto
     for the tip.
+  * Refresh patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Tue, 11 Mar 2014 12:38:06 -0300
 
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index d01a869..6b54f77 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
-@@ -9173,7 +9173,7 @@ fi
+@@ -9222,7 +9222,7 @@ fi
  # .projects.3    -> the rest
  rm -f .projects .projects.1 .projects.2 .projects.3
  
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index e02cb7c..6b4a927 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -22,7 +22,7 @@ This patch enable them.
  *-g++*:QMAKE_CXXFLAGS_RELEASE -= -O2
 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri
 +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
-@@ -273,8 +273,6 @@ contains(DEFINES, ENABLE_WEBGL=1)|contai
+@@ -266,8 +266,6 @@ contains(DEFINES, ENABLE_WEBGL=1)|contai
  
  !CONFIG(webkit-debug):CONFIG(QTDIR_build) {
      # Remove the following 2 lines if you want debug information in WebCore
diff --git a/debian/patches/51_kfreebsd_strnstr_build_fix.diff b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
index 5dd5aa7..735eed9 100644
--- a/debian/patches/51_kfreebsd_strnstr_build_fix.diff
+++ b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
@@ -9,7 +9,7 @@ Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
 
 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
-@@ -423,7 +423,7 @@
+@@ -427,7 +427,7 @@
  #endif
  
  /* OS(LINUX) - Linux */
@@ -20,7 +20,7 @@ Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
  
 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -415,7 +415,7 @@
+@@ -423,7 +423,7 @@
  #endif
  
  /* OS(LINUX) - Linux */
diff --git a/debian/patches/96_webkit_no_gc_sections.diff b/debian/patches/96_webkit_no_gc_sections.diff
index f738da7..36b67dc 100644
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@ -13,7 +13,7 @@ Last-Update: 2010-05-31 (mipsel added)
 
 --- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri
 +++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
-@@ -324,7 +324,7 @@ mac {
+@@ -317,7 +317,7 @@ mac {
  }
  
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections
diff --git a/debian/patches/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
index 71831c8..dbf8610 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
-@@ -2520,6 +2520,23 @@ QStringList QCoreApplication::libraryPat
+@@ -2529,6 +2529,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 53486a9..6a1171a 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3311,6 +3311,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3317,6 +3317,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              ;;
          esac
          ;;