[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:42:46 UTC 2011


The following commit has been merged in the experimental-snapshots branch:
commit 1c956e2699adee18b1fcedaf8b7ada199f3bf0b4
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Mar 3 21:14:21 2011 +0200

    Refresh patches and update 01_debian_append_qt4_suffix.diff
---
 ...port_6ae84f1_fix_QTextEdit_selectAll_crash.diff |   11 ++-----
 debian/patches/01_debian_append_qt4_suffix.diff    |   28 ++++++++++----------
 ...cqt_sane_timestamp_for_nonexisting_headers.diff |    2 +-
 debian/patches/08_configure_quilt_compat.diff      |    2 +-
 .../18_enable_qt3support_qtwebkit_debug_info.diff  |    2 +-
 debian/patches/21_qt_ia32_library_path.diff        |    8 +++---
 debian/patches/40_alpha_ice.diff                   |    4 +-
 7 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff b/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
index 4a0dfb8..0868781 100644
--- a/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
+++ b/debian/patches/0002_backport_6ae84f1_fix_QTextEdit_selectAll_crash.diff
@@ -13,13 +13,11 @@ Reviewed-by: Eskil
  src/gui/text/qtextcursor.cpp |    3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)
 
-diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
-index 769ab2f..f73cc4b 100644
 --- a/src/gui/text/qtextcursor.cpp
 +++ b/src/gui/text/qtextcursor.cpp
-@@ -363,6 +363,9 @@ bool QTextCursorPrivate::movePosition(QTextCursor::MoveOperation op, QTextCursor
-     bool adjustX = true;
-     QTextBlock blockIt = block();
+@@ -366,6 +366,9 @@ bool QTextCursorPrivate::movePosition(QT
+     if (!blockIt.isValid())
+         return false;
  
 +    if (!blockIt.isValid())
 +        return false;
@@ -27,6 +25,3 @@ index 769ab2f..f73cc4b 100644
      if (op >= QTextCursor::Left && op <= QTextCursor::WordRight
          && blockIt.textDirection() == Qt::RightToLeft) {
          if (op == QTextCursor::Left)
--- 
-1.6.1
-
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index cd2fbfe..dcb39e5 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -4,7 +4,7 @@ Description: Append a -qt4 suffix to some tools.
  To allow co-installation of the development tools of Qt4 with the Qt3 ones,
  we append a -qt4 suffix to the executable names of some development tools:
  assistant, designer, linguist, lrelease, lupdate, moc, qmake, qtconfig, uic.
-Last-Update: 2010-10-06
+Last-Update: 2011-03-03
 Forwarded: not-needed
 
 --- a/config.tests/unix/compile.test
@@ -64,7 +64,7 @@ Forwarded: not-needed
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -4574,7 +4574,7 @@ END {
+@@ -4596,7 +4596,7 @@ END {
  }
  
  # build qmake
@@ -73,7 +73,7 @@ Forwarded: not-needed
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -7992,8 +7992,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -8033,8 +8033,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
@@ -84,21 +84,21 @@ Forwarded: not-needed
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -8389,11 +8389,11 @@ EXEC=""
- #-------------------------------------------------------------------------------
+@@ -8435,11 +8435,11 @@ EXEC=""
  
  echo "Finding project files. Please wait..."
--"$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
-+"$outpath/bin/qmake-qt4" -prl -r "${relpath}/projects.pro"
- if [ -f "${relpath}/projects.pro" ]; then
-     mkfile="${outpath}/Makefile"
-     [ -f "$mkfile" ] && chmod +w "$mkfile"
--    QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
-+    QTDIR="$outpath" "$outpath/bin/qmake-qt4" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
+ if [ "$CFG_NOPROCESS" != "yes" ]; then
+-    "$outpath/bin/qmake" -prl -r "${relpath}/projects.pro"
++    "$outpath/bin/qmake-qt4" -prl -r "${relpath}/projects.pro"
+     if [ -f "${relpath}/projects.pro" ]; then
+         mkfile="${outpath}/Makefile"
+         [ -f "$mkfile" ] && chmod +w "$mkfile"
+-        QTDIR="$outpath" "$outpath/bin/qmake" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
++        QTDIR="$outpath" "$outpath/bin/qmake-qt4" -spec "$XQMAKESPEC" "${relpath}/projects.pro" -o "$mkfile"
+     fi
  fi
  
- # .projects      -> projects to process
-@@ -8572,7 +8572,7 @@ for file in .projects .projects.3; do
+@@ -8626,7 +8626,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/02_syncqt_sane_timestamp_for_nonexisting_headers.diff b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
index 196b741..8ee8474 100644
--- a/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
+++ b/debian/patches/02_syncqt_sane_timestamp_for_nonexisting_headers.diff
@@ -11,7 +11,7 @@ GMT.) for the symlink, just use current time().
 
 --- a/bin/syncqt
 +++ b/bin/syncqt
-@@ -828,7 +828,7 @@ foreach my $lib (@modules_to_sync) {
+@@ -830,7 +830,7 @@ foreach my $lib (@modules_to_sync) {
                              print "SYMBOL: $_
";
                          }
                      } else {
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 0eafb5a..8a5a7e5 100644
--- a/debian/patches/08_configure_quilt_compat.diff
+++ b/debian/patches/08_configure_quilt_compat.diff
@@ -3,7 +3,7 @@ It breaks qmake projects search.
 
 --- a/configure
 +++ b/configure
-@@ -8445,7 +8445,7 @@ fi
+@@ -8492,7 +8492,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 9dcf99c..e31c54e 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -7,7 +7,7 @@ This patch enable them.
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
 @@ -2954,8 +2954,6 @@ HEADERS += $$WEBKIT_API_HEADERS
  
- CONFIG(QTDIR_build) {
+ !CONFIG(webkit-debug):CONFIG(QTDIR_build) {
      # Remove the following 2 lines if you want debug information in WebCore
 -    CONFIG -= separate_debug_info
 -    CONFIG += no_debug_info
diff --git a/debian/patches/21_qt_ia32_library_path.diff b/debian/patches/21_qt_ia32_library_path.diff
index 8553885..a2aebeb 100644
--- a/debian/patches/21_qt_ia32_library_path.diff
+++ b/debian/patches/21_qt_ia32_library_path.diff
@@ -6,7 +6,7 @@ Author: Bo Thorsen <bo at sonofthor.dk>
 
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -64,6 +64,10 @@ QT_END_NAMESPACE
+@@ -68,6 +68,10 @@ QT_END_NAMESPACE
  
  #include "qconfig.cpp"
  
@@ -17,7 +17,7 @@ Author: Bo Thorsen <bo at sonofthor.dk>
  QT_BEGIN_NAMESPACE
  
  extern void qDumpCPUFeatures(); // in qsimd.cpp
-@@ -213,6 +217,22 @@ QLibraryInfo::buildKey()
+@@ -217,6 +221,22 @@ QLibraryInfo::buildKey()
      return QString::fromLatin1(QT_BUILD_KEY);
  }
  
@@ -40,7 +40,7 @@ Author: Bo Thorsen <bo at sonofthor.dk>
  /*!
      \since 4.6
      Returns the installation date for this build of Qt. The install date will
-@@ -441,7 +461,7 @@ QLibraryInfo::location(LibraryLocation l
+@@ -453,7 +473,7 @@ QLibraryInfo::location(LibraryLocation l
          if (loc == PrefixPath) {
              // we make the prefix path absolute to the executable's directory
  #ifdef BOOTSTRAPPING
@@ -49,7 +49,7 @@ Author: Bo Thorsen <bo at sonofthor.dk>
  #else
              if (QCoreApplication::instance()) {
  #ifdef Q_OS_MAC
-@@ -450,21 +470,21 @@ QLibraryInfo::location(LibraryLocation l
+@@ -462,21 +482,21 @@ QLibraryInfo::location(LibraryLocation l
                      QCFType<CFURLRef> urlRef = CFBundleCopyBundleURL(bundleRef);
                      if (urlRef) {
                          QCFString path = CFURLCopyFileSystemPath(urlRef, kCFURLPOSIXPathStyle);
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index 09fef54..7f3cb1a 100644
--- a/debian/patches/40_alpha_ice.diff
+++ b/debian/patches/40_alpha_ice.diff
@@ -6,7 +6,7 @@ Author: Steve Langasek <vorlon at debian.org>
 
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -85,12 +85,7 @@ class QLibraryInfoPrivate
+@@ -89,12 +89,7 @@ class QLibraryInfoPrivate
  {
  public:
      static QSettings *findConfiguration();
@@ -20,7 +20,7 @@ Author: Steve Langasek <vorlon at debian.org>
      static QSettings *configuration()
      {
          QLibrarySettings *ls = qt_library_settings();
-@@ -98,6 +93,13 @@ public:
+@@ -102,6 +97,13 @@ public:
      }
  };
  

-- 
Qt 4 packaging



More information about the pkg-kde-commits mailing list