[SCM] Qt 4 packaging branch, master, updated. debian/4.8.1-2-4-g0e1c5ef

Modestas Vainius modax at alioth.debian.org
Sun Jun 10 00:30:32 UTC 2012 

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

The following commit has been merged in the master branch:
commit 47c957c7dbadb84e590730e0d086de653ad016a3
Author: Modestas Vainius <modax at debian.org>
Date:   Sat Jun 9 23:58:58 2012 +0300

    Refresh patches.
---
 debian/changelog                                   |    1 +
 debian/patches/01_debian_append_qt4_suffix.diff    |    8 ++++----
 .../patches/07_trust_dpkg-arch_over_uname-m.diff   |    2 +-
 debian/patches/08_configure_quilt_compat.diff      |    2 +-
 .../patches/12_add_nostrip_for_debug_packages.diff |    2 +-
 debian/patches/94_armv6_uname_entry.diff           |    2 +-
 ..._support_for_QT_USE_DRAG_DISTANCE_env_var.patch |    2 +-
 .../patches/QElfParser-fix-type-of-sh_size.patch   |    9 +--------
 debian/patches/no_libicu_message.diff              |    4 ++--
 debian/patches/powerpcspe.diff                     |    2 +-
 .../patches/qt-multiarch-plugin-path-compat.diff   |    2 +-
 debian/patches/qtdebug_syslog.patch                |    2 +-
 debian/patches/sh.diff                             |    2 +-
 13 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 80f78b3..3046d02 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ qt4-x11 (4:4.8.2-0r1) UNRELEASED; urgency=low
     - QTBUG-24718_Fix_a_crash_in_cursorToX_when_new_block_is_added.patch
     - fix_qvfb_build.patch
     - gcc-4.7.diff
+  * Refresh patches.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 09 Jun 2012 23:53:49 +0300
 
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index 30f1b8e..dd002e4 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -93,7 +93,7 @@ Forwarded: not-needed
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -4816,7 +4816,7 @@ END {
+@@ -4847,7 +4847,7 @@ setBootstrapVariable()
  }
  
  # build qmake
@@ -102,7 +102,7 @@ Forwarded: not-needed
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -8517,8 +8517,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -8544,8 +8544,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
  QMAKE_MOC_SRC    = \$\$QT_BUILD_TREE/src/moc
  
  #local paths that cannot be queried from the QT_INSTALL_* properties while building QTDIR
@@ -113,7 +113,7 @@ Forwarded: not-needed
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -8921,11 +8921,11 @@ EXEC=""
+@@ -8948,11 +8948,11 @@ EXEC=""
  
  echo "Finding project files. Please wait..."
  if [ "$CFG_NOPROCESS" != "yes" ]; then
@@ -127,7 +127,7 @@ Forwarded: not-needed
      fi
  fi
  
-@@ -9112,7 +9112,7 @@ for file in .projects .projects.3; do
+@@ -9139,7 +9139,7 @@ for file in .projects .projects.3; do
          QMAKE_SPEC_ARGS="-spec $SPEC"
          echo $ECHO_N "  for $a$ECHO_C"
  
diff --git a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
index 3f6b101..e6d6657 100644
--- a/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
+++ b/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
@@ -8,7 +8,7 @@ Trolltech task ID : 181882
 
 --- a/configure
 +++ b/configure
-@@ -168,7 +168,50 @@ linkerSupportsFlag()
+@@ -228,7 +228,50 @@ linkerSupportsFlag()
  #-------------------------------------------------------------------------------
  
  # need that throughout the script
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 0a37abf..f26d104 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
-@@ -8978,7 +8978,7 @@ fi
+@@ -9005,7 +9005,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 6ffecc8..d5f3083 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
-@@ -674,6 +674,8 @@ mkdir -p "$outpath/config.tests"
+@@ -734,6 +734,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/94_armv6_uname_entry.diff b/debian/patches/94_armv6_uname_entry.diff
index 4cd7788..5c80cfe 100644
--- a/debian/patches/94_armv6_uname_entry.diff
+++ b/debian/patches/94_armv6_uname_entry.diff
@@ -7,7 +7,7 @@ Description: Add armv6 uname entry for armhf
 
 --- a/configure
 +++ b/configure
-@@ -182,6 +182,9 @@ case $DPKG_ARCH in
+@@ -242,6 +242,9 @@ case $DPKG_ARCH in
  	armel)
  		UNAME_MACHINE="armv5tel"
  	;;
diff --git a/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch b/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
index 00956e6..0f02a1b 100644
--- a/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
+++ b/debian/patches/Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
@@ -8,7 +8,7 @@ Author: Joonas Tanskanen <joonas.tanskanen at sasken.com>
 
 --- a/src/gui/kernel/qapplication.cpp
 +++ b/src/gui/kernel/qapplication.cpp
-@@ -1031,6 +1031,11 @@ void QApplicationPrivate::initialize()
+@@ -1028,6 +1028,11 @@ void QApplicationPrivate::initialize()
      q->setAttribute(Qt::AA_S60DisablePartialScreenInputMode);
  #endif
  
diff --git a/debian/patches/QElfParser-fix-type-of-sh_size.patch b/debian/patches/QElfParser-fix-type-of-sh_size.patch
index 51e0f26..1c30f9a 100644
--- a/debian/patches/QElfParser-fix-type-of-sh_size.patch
+++ b/debian/patches/QElfParser-fix-type-of-sh_size.patch
@@ -15,11 +15,9 @@ Reviewed-by: Arvid Picciani <arvid.picciani at nokia.com>
  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
+@@ -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
@@ -30,8 +28,6 @@ index cfe9a9d..33fff42 100644
      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:
@@ -43,6 +39,3 @@ index 2f10807..e552cbc 100644
      };
  
      int m_endian;
--- 
-1.7.10
-
diff --git a/debian/patches/no_libicu_message.diff b/debian/patches/no_libicu_message.diff
index 0aea3b4..fef8897 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
-@@ -83,7 +83,9 @@
+@@ -83,7 +83,9 @@ bool qt_initIcu(const QString &localeStr
          // resolve libicui18n
          QLibrary lib(QLatin1String("icui18n"), QLatin1String(U_ICU_VERSION_SHORT));
          if (!lib.load()) {
@@ -18,7 +18,7 @@ Forwarded: not-needed
              status = ErrorLoading;
              return false;
          }
-@@ -112,7 +114,9 @@
+@@ -112,7 +114,9 @@ bool qt_initIcu(const QString &localeStr
          // resolve libicuuc
          QLibrary ucLib(QLatin1String("icuuc"), QLatin1String(U_ICU_VERSION_SHORT));
          if (!ucLib.load()) {
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index 2d6e555..8d02d0f 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3148,7 +3148,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3208,7 +3208,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              CFG_HOST_ARCH=x86_64
          fi
          ;;
diff --git a/debian/patches/qt-multiarch-plugin-path-compat.diff b/debian/patches/qt-multiarch-plugin-path-compat.diff
index a1a6c16..be37bb8 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
-@@ -2398,6 +2398,23 @@ QStringList QCoreApplication::libraryPat
+@@ -2437,6 +2437,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 8c349b6..d7a9ecd 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
-@@ -2217,6 +2220,27 @@ void qt_message_output(QtMsgType msgType
+@@ -2225,6 +2228,27 @@ void qt_message_output(QtMsgType msgType
  #else
          fprintf(stderr, "%s
", buf);
          fflush(stderr);
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 520dae7..6391bcc 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -11,7 +11,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3188,6 +3188,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3248,6 +3248,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              ;;
          esac
          ;;

-- 
Qt 4 packaging

More information about the pkg-kde-commits mailing list