[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+git121-g2a9ea11+dfsg1-2-6-gac1294b

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Thu Dec 5 23:44:20 UTC 2013 

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

The following commit has been merged in the master branch:
commit d362f72806a373564f895836d960b88ee959b72a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Dec 5 16:37:38 2013 -0300

    Refresh multiple patches.
---
 debian/changelog                                            | 1 +
 debian/patches/08_configure_quilt_compat.diff               | 2 +-
 debian/patches/51_kfreebsd_strnstr_build_fix.diff           | 2 +-
 debian/patches/99_hppa_bug561203_decrease_failure_rate.diff | 8 ++++----
 debian/patches/qt-multiarch-plugin-path-compat.diff         | 2 +-
 debian/patches/qtdebug_syslog.patch                         | 6 +++---
 debian/patches/s390x_jscore.diff                            | 8 ++++----
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de7abd9..c56ac39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qt4-x11 (4:4.8.5+git192-g085f851+dfsg-1) UNRELEASED; urgency=medium
   * New upstream git snapshot. This includes the fix for CVE-2013-4549: XML
     Entity Expansion Denial of Service. Set severity to medium.
   * Update symbols files with buildds' logs.
+  * Refresh patches.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 05 Dec 2013 12:10:03 -0300
 
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index d725083..d01a869 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
-@@ -9172,7 +9172,7 @@ fi
+@@ -9173,7 +9173,7 @@ fi
  # .projects.3    -> the rest
  rm -f .projects .projects.1 .projects.2 .projects.3
  
diff --git a/debian/patches/51_kfreebsd_strnstr_build_fix.diff b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
index 506ec40..5dd5aa7 100644
--- a/debian/patches/51_kfreebsd_strnstr_build_fix.diff
+++ b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
@@ -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
-@@ -393,7 +393,7 @@
+@@ -415,7 +415,7 @@
  #endif
  
  /* OS(LINUX) - Linux */
diff --git a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
index 3017c93..49acca3 100644
--- a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
+++ b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
@@ -17,7 +17,7 @@ Last-Update: 2011-12-26
 
 --- a/src/corelib/io/qprocess_unix.cpp
 +++ b/src/corelib/io/qprocess_unix.cpp
-@@ -532,6 +532,13 @@ static char **_q_dupEnvironment(const QP
+@@ -555,6 +555,13 @@ static char **_q_dupEnvironment(const QP
      return envp;
  }
  
@@ -31,7 +31,7 @@ Last-Update: 2011-12-26
  #ifdef Q_OS_MAC
  Q_GLOBAL_STATIC(QMutex, cfbundleMutex);
  #endif
-@@ -660,6 +667,7 @@ void QProcessPrivate::startProcess()
+@@ -683,6 +690,7 @@ void QProcessPrivate::startProcess()
  #if defined(Q_OS_QNX)
      pid_t childPid = spawnChild(workingDirPtr, argv, envp);
  #else
@@ -39,7 +39,7 @@ Last-Update: 2011-12-26
      pid_t childPid = fork();
      int lastForkErrno = errno;
  #endif
-@@ -1357,6 +1365,7 @@ bool QProcessPrivate::startDetached(cons
+@@ -1380,6 +1388,7 @@ bool QProcessPrivate::startDetached(cons
          return false;
      }
  
@@ -47,7 +47,7 @@ Last-Update: 2011-12-26
      pid_t childPid = fork();
      if (childPid == 0) {
          struct sigaction noaction;
-@@ -1369,6 +1378,7 @@ bool QProcessPrivate::startDetached(cons
+@@ -1392,6 +1401,7 @@ bool QProcessPrivate::startDetached(cons
          qt_safe_close(startedPipe[0]);
          qt_safe_close(pidPipe[0]);
  
diff --git a/debian/patches/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
index 02db5f2..71831c8 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
-@@ -2511,6 +2511,23 @@ QStringList QCoreApplication::libraryPat
+@@ -2520,6 +2520,23 @@ QStringList QCoreApplication::libraryPat
              if (!app_libpaths->contains(installPathPlugins))
                  app_libpaths->append(installPathPlugins);
          }
diff --git a/debian/patches/qtdebug_syslog.patch b/debian/patches/qtdebug_syslog.patch
index fb6892e..b131243 100644
--- a/debian/patches/qtdebug_syslog.patch
+++ b/debian/patches/qtdebug_syslog.patch
@@ -25,7 +25,7 @@ Author: Thiago Macieira <thiago at kde.org>
  #endif
  
  QT_BEGIN_NAMESPACE
-@@ -2290,6 +2293,27 @@ void qt_message_output(QtMsgType msgType
+@@ -2324,6 +2327,27 @@ void qt_message_output(QtMsgType msgType
  #else
          fprintf(stderr, "%s
", buf);
          fflush(stderr);
@@ -62,5 +62,5 @@ Author: Thiago Macieira <thiago at kde.org>
 +    static QString staticAppName()
 +    { return QCoreApplication::self ? QCoreApplication::self->d_func()->appName() : QString(); }
      virtual QString appName() const;
-     virtual void createEventDispatcher();
-     static void removePostedEvent(QEvent *);
+     mutable QString applicationName;
+ 
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
index 96ec0f4..5a68c64 100644
--- a/debian/patches/s390x_jscore.diff
+++ b/debian/patches/s390x_jscore.diff
@@ -2,7 +2,7 @@ Description: Add support for s390/s390x architectures
 Author: Dan Horák <dan at danny.cz>
 Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+)
 Forwarded: no
-Last-Update: 2011-08-03
+Last-Update: 2013-12-05
 
 ---
  src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |   14 +++++++++++++-
@@ -29,12 +29,12 @@ Last-Update: 2011-08-03
  /* CPU(X86) - i386 / x86 32-bit */
  #if   defined(__i386__) \
      || defined(i386)     \
-@@ -873,7 +885,7 @@
+@@ -895,7 +907,7 @@
  #endif
  
  #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
-+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64)
++#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(S390x)
  #define WTF_USE_JSVALUE64 1
  #elif CPU(ARM) || CPU(PPC64)
  #define WTF_USE_JSVALUE32 1

-- 
Qt 4 packaging

More information about the pkg-kde-commits mailing list