[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.0-rc1-1-5-g7096809

Fathi Boudra fabo at alioth.debian.org
Thu Sep 30 16:14:12 UTC 2010 

The following commit has been merged in the experimental-snapshots branch:
commit 70968091610960a07fa818fef4cadef13fef09f5
Author: Fathi Boudra <fabo at debian.org>
Date:   Thu Sep 30 19:07:02 2010 +0300

    Refresh/Adjust patches to Qt 4.7.1
---
 debian/patches/0180-window-role.diff               |    2 +-
 debian/patches/0216-allow-isystem-for-headers.diff |    4 +-
 debian/patches/05_append_qt4_target.diff           |   22 +++++++++----------
 debian/patches/08_configure_quilt_compat.diff      |    2 +-
 debian/patches/10_config_tests_fixes.diff          |   22 --------------------
 .../patches/15_fix_qmake_makefile_generation.diff  |    2 +-
 .../18_enable_qt3support_qtwebkit_debug_info.diff  |    2 +-
 debian/patches/20_install_qvfb.diff                |    3 +-
 debian/patches/21_qt_ia32_library_path.diff        |    8 +++---
 debian/patches/40_alpha_ice.diff                   |    4 +-
 debian/patches/50_kfreebsd_build_fix.diff          |   18 ----------------
 debian/patches/51_kfreebsd_strnstr_build_fix.diff  |    2 +-
 debian/patches/92_armel_gcc43_valist_compat.diff   |    2 +-
 13 files changed, 26 insertions(+), 67 deletions(-)

diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index 8cda02c..fb8ec1e 100644
--- a/debian/patches/0180-window-role.diff
+++ b/debian/patches/0180-window-role.diff
@@ -52,7 +52,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
                                      Sender *sender);
 --- a/src/gui/kernel/qwidget_p.h
 +++ b/src/gui/kernel/qwidget_p.h
-@@ -756,6 +756,7 @@ public:
+@@ -757,6 +757,7 @@ public:
      static QWidget *keyboardGrabber;
  
      void setWindowRole();
diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff
index 5d0d41d..5e72e48 100644
--- a/debian/patches/0216-allow-isystem-for-headers.diff
+++ b/debian/patches/0216-allow-isystem-for-headers.diff
@@ -27,7 +27,7 @@ bugs.kde.org number :
 
 --- a/configure
 +++ b/configure
-@@ -1045,6 +1045,11 @@ while [ "$#" -gt 0 ]; do
+@@ -1058,6 +1058,11 @@ while [ "$#" -gt 0 ]; do
              VAL=`echo $1 | sed 's,-D,,'`
          fi
          ;;
@@ -39,7 +39,7 @@ bugs.kde.org number :
      -I?*|-I)
          VAR="add_ipath"
          if [ "$1" = "-I" ]; then
-@@ -2119,6 +2124,9 @@ while [ "$#" -gt 0 ]; do
+@@ -2182,6 +2187,9 @@ while [ "$#" -gt 0 ]; do
      add_ipath)
          I_FLAGS="$I_FLAGS -I\"${VAL}\""
          ;;
diff --git a/debian/patches/05_append_qt4_target.diff b/debian/patches/05_append_qt4_target.diff
index 4e8953c..a593a9c 100644
--- a/debian/patches/05_append_qt4_target.diff
+++ b/debian/patches/05_append_qt4_target.diff
@@ -57,7 +57,7 @@ author: Fathi Boudra <fabo at debian.org>
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -4474,7 +4474,7 @@ END {
+@@ -4582,7 +4582,7 @@ END {
  }
  
  # build qmake
@@ -66,7 +66,7 @@ author: Fathi Boudra <fabo at debian.org>
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -7759,8 +7759,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -8000,8 +8000,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
@@ -77,7 +77,7 @@ author: Fathi Boudra <fabo at debian.org>
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -8150,11 +8150,11 @@ EXEC=""
+@@ -8397,11 +8397,11 @@ EXEC=""
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@ author: Fathi Boudra <fabo at debian.org>
  fi
  
  # .projects      -> projects to process
-@@ -8331,7 +8331,7 @@ for file in .projects .projects.3; do
+@@ -8580,7 +8580,7 @@ for file in .projects .projects.3; do
          QMAKE_SPEC_ARGS="-spec $SPEC"
          echo $ECHO_N "  for $a$ECHO_C"
  
@@ -174,7 +174,7 @@ author: Fathi Boudra <fabo at debian.org>
 --- a/tools/assistant/tools/assistant/assistant.pro
 +++ b/tools/assistant/tools/assistant/assistant.pro
 @@ -1,7 +1,7 @@
- include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
+ include(../../../shared/fontpanel/fontpanel.pri)
  TEMPLATE = app
  LANGUAGE = C++
 -TARGET = assistant
@@ -191,8 +191,8 @@ author: Fathi Boudra <fabo at debian.org>
 -TARGET = designer
 +TARGET = designer-qt4
  
- include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
- include($$QT_SOURCE_TREE/tools/shared/qttoolbardialog/qttoolbardialog.pri)
+ include(../../../shared/fontpanel/fontpanel.pri)
+ include(../../../shared/qttoolbardialog/qttoolbardialog.pri)
 --- a/tools/linguist/linguist/linguist.pro
 +++ b/tools/linguist/linguist/linguist.pro
 @@ -69,7 +69,7 @@ HEADERS += \
@@ -217,15 +217,13 @@ author: Fathi Boudra <fabo at debian.org>
  target.path=$$[QT_INSTALL_BINS]
 --- a/translations/translations.pri
 +++ b/translations/translations.pri
-@@ -8,7 +8,7 @@ defineReplace(prependAll) {
-     return ($$result)
- }
- 
+@@ -1,5 +1,5 @@
+ qtPrepareTool(LCONVERT, lconvert)
 -qtPrepareTool(LUPDATE, lupdate)
 +qtPrepareTool(LUPDATE, lupdate-qt4)
  LUPDATE += -locations relative -no-ui-lines
  
- ###### Qt Libraries
+ TS_TARGETS =
 --- a/translations/translations.pro
 +++ b/translations/translations.pro
 @@ -1,6 +1,6 @@
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 27aea69..7c1e853 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
-@@ -8206,7 +8206,7 @@ fi
+@@ -8453,7 +8453,7 @@ fi
  # .projects.3    -> the rest
  rm -f .projects .projects.1 .projects.2 .projects.3
  
diff --git a/debian/patches/10_config_tests_fixes.diff b/debian/patches/10_config_tests_fixes.diff
index 96a4768..6728f0d 100644
--- a/debian/patches/10_config_tests_fixes.diff
+++ b/debian/patches/10_config_tests_fixes.diff
@@ -12,28 +12,6 @@ Last-Update: 2010-05-24
  mac:CONFIG -= app_bundle
 -LIBS += -lgds
 +LIBS += -lfbclient
---- a/src/sql/drivers/drivers.pri
-+++ b/src/sql/drivers/drivers.pri
-@@ -89,7 +89,7 @@ contains(sql-drivers, ibase) {
-     HEADERS += drivers/ibase/qsql_ibase.h
-     SOURCES += drivers/ibase/qsql_ibase.cpp
-     
--    unix:LIBS *= -lgds  
-+    unix:LIBS *= -lfbclient
-     
-     win32 {
-         !win32-borland:LIBS *= -lgds32_ms
---- a/src/plugins/sqldrivers/ibase/ibase.pro
-+++ b/src/plugins/sqldrivers/ibase/ibase.pro
-@@ -4,7 +4,7 @@ HEADERS		= ../../../sql/drivers/ibase/qs
- SOURCES		= main.cpp \
- 		  ../../../sql/drivers/ibase/qsql_ibase.cpp
- 
--unix:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS    *= -lgds
-+unix:!contains( LIBS, .*gds.* ):!contains( LIBS, .*libfb.* ):LIBS    *= -lfbclient
- 
- win32:!contains( LIBS, .*gds.* ):!contains( LIBS, .*fbclient.* ) {
- 	!win32-borland:LIBS *= -lgds32_ms
 --- a/config.tests/unix/sqlite/sqlite.pro
 +++ b/config.tests/unix/sqlite/sqlite.pro
 @@ -1,3 +1,4 @@
diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff
index 8e3a220..f30c04a 100644
--- a/debian/patches/15_fix_qmake_makefile_generation.diff
+++ b/debian/patches/15_fix_qmake_makefile_generation.diff
@@ -3,7 +3,7 @@ Author: Sune Vuorela <debian at pusling.com>
 
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -2403,7 +2403,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2433,7 +2433,7 @@ MakefileGenerator::writeSubTargets(QText
  
          QString mkfile = subtarget->makefile;
          if(!in_directory.isEmpty())
diff --git a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
index 7eeea09..9dcf99c 100644
--- a/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
+++ b/debian/patches/18_enable_qt3support_qtwebkit_debug_info.diff
@@ -5,7 +5,7 @@ This patch enable them.
 
 --- a/src/3rdparty/webkit/WebCore/WebCore.pro
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -2943,8 +2943,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -2954,8 +2954,6 @@ HEADERS += $$WEBKIT_API_HEADERS
  
  CONFIG(QTDIR_build) {
      # Remove the following 2 lines if you want debug information in WebCore
diff --git a/debian/patches/20_install_qvfb.diff b/debian/patches/20_install_qvfb.diff
index 9808fd8..06ff1f8 100644
--- a/debian/patches/20_install_qvfb.diff
+++ b/debian/patches/20_install_qvfb.diff
@@ -3,7 +3,7 @@ Author: Fathi Boudra <fabo at debian.org>
 
 --- a/tools/tools.pro
 +++ b/tools/tools.pro
-@@ -41,5 +41,7 @@ embedded: SUBDIRS += makeqpf
+@@ -41,6 +41,8 @@ embedded: SUBDIRS += makeqpf
  
  !wince*:!cross_compile:SUBDIRS += qdoc3
  
@@ -11,3 +11,4 @@ Author: Fathi Boudra <fabo at debian.org>
 +
  CONFIG+=ordered
  QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)"
+ 
diff --git a/debian/patches/21_qt_ia32_library_path.diff b/debian/patches/21_qt_ia32_library_path.diff
index e725f9c..8553885 100644
--- a/debian/patches/21_qt_ia32_library_path.diff
+++ b/debian/patches/21_qt_ia32_library_path.diff
@@ -16,8 +16,8 @@ Author: Bo Thorsen <bo at sonofthor.dk>
 +
  QT_BEGIN_NAMESPACE
  
- #ifndef QT_NO_SETTINGS
-@@ -211,6 +215,22 @@ QLibraryInfo::buildKey()
+ extern void qDumpCPUFeatures(); // in qsimd.cpp
+@@ -213,6 +217,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
-@@ -439,7 +459,7 @@ QLibraryInfo::location(LibraryLocation l
+@@ -441,7 +461,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
-@@ -448,21 +468,21 @@ QLibraryInfo::location(LibraryLocation l
+@@ -450,21 +470,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 169aac7..09fef54 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
-@@ -83,12 +83,7 @@ class QLibraryInfoPrivate
+@@ -85,12 +85,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();
-@@ -96,6 +91,13 @@ public:
+@@ -98,6 +93,13 @@ public:
      }
  };
  
diff --git a/debian/patches/50_kfreebsd_build_fix.diff b/debian/patches/50_kfreebsd_build_fix.diff
index 4046ad3..e029e07 100644
--- a/debian/patches/50_kfreebsd_build_fix.diff
+++ b/debian/patches/50_kfreebsd_build_fix.diff
@@ -26,24 +26,6 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
  #elif defined(__DGUX__)
  #  define Q_OS_DGUX
  #elif defined(__QNXNTO__)
---- a/src/corelib/plugin/qlibrary.cpp
-+++ b/src/corelib/plugin/qlibrary.cpp
-@@ -295,13 +295,13 @@ static bool qt_parse_pattern(const char
- 
- #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(Q_OS_SYMBIAN) && !defined(QT_NO_PLUGIN_CHECK)
- 
--#if defined(Q_OS_FREEBSD) || defined(Q_OS_LINUX)
-+#if defined(Q_OS_FREEBSD) || defined(Q_OS_GLIBC)
- #  define USE_MMAP
- QT_BEGIN_INCLUDE_NAMESPACE
- #  include <sys/types.h>
- #  include <sys/mman.h>
- QT_END_INCLUDE_NAMESPACE
--#endif // Q_OS_FREEBSD || Q_OS_LINUX
-+#endif // Q_OS_FREEBSD || Q_OS_GLIBC
- 
- static long qt_find_pattern(const char *s, ulong s_len,
-                              const char *pattern, ulong p_len)
 --- a/src/corelib/tools/qlocale.cpp
 +++ b/src/corelib/tools/qlocale.cpp
 @@ -77,7 +77,7 @@ QT_END_NAMESPACE
diff --git a/debian/patches/51_kfreebsd_strnstr_build_fix.diff b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
index ca6bbed..8440fbf 100644
--- a/debian/patches/51_kfreebsd_strnstr_build_fix.diff
+++ b/debian/patches/51_kfreebsd_strnstr_build_fix.diff
@@ -4,7 +4,7 @@ Bug: https://bugs.webkit.org/show_bug.cgi?id=33903
 
 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
 +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
-@@ -367,7 +367,7 @@
+@@ -370,7 +370,7 @@
  #endif
  
  /* OS(LINUX) - Linux */
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index a7e7c91..b260c10 100644
--- a/debian/patches/92_armel_gcc43_valist_compat.diff
+++ b/debian/patches/92_armel_gcc43_valist_compat.diff
@@ -15,7 +15,7 @@ Forward: not-needed
 
 --- a/src/corelib/tools/qstring.cpp
 +++ b/src/corelib/tools/qstring.cpp
-@@ -5432,6 +5432,11 @@ QString &QString::vsprintf(const char* c
+@@ -5466,6 +5466,11 @@ QString &QString::vsprintf(const char* c
      return *this;
  }
  

-- 
Qt 4 packaging

More information about the pkg-kde-commits mailing list