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

Fathi Boudra fabo at alioth.debian.org
Sat Jun 11 11:50:29 UTC 2011 

The following commit has been merged in the experimental-snapshots branch:
commit d820a368fc52ee5c03c50ac586fb60b776b05d9d
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Jun 11 14:49:46 2011 +0300

    Refresh/Update patches for Qt 4.8 TP
---
 debian/changelog                                   |    6 +++
 debian/patches/01_debian_append_qt4_suffix.diff    |   48 +++++++++-----------
 ...cqt_sane_timestamp_for_nonexisting_headers.diff |    2 +-
 debian/patches/08_configure_quilt_compat.diff      |    2 +-
 .../patches/12_add_nostrip_for_debug_packages.diff |    2 +-
 .../patches/15_fix_qmake_makefile_generation.diff  |    2 +-
 .../18_enable_qt3support_qtwebkit_debug_info.diff  |    2 +-
 debian/patches/20_install_qvfb.diff                |    2 +-
 .../23_permit_plugins_built_with_future_qt.diff    |    2 +-
 debian/patches/40_alpha_ice.diff                   |    6 +-
 debian/patches/41_disable_opengl_visibility.diff   |    2 +-
 debian/patches/50_kfreebsd_Q_OS.diff               |    2 +-
 debian/patches/92_armel_gcc43_valist_compat.diff   |    2 +-
 debian/patches/96_webkit_no_gc_sections.diff       |    4 +-
 .../99_hppa_bug561203_decrease_failure_rate.diff   |    2 +-
 debian/patches/powerpcspe.diff                     |    2 +-
 debian/patches/qtdebug_syslog.patch                |    8 ++--
 debian/patches/series                              |   32 +++++++-------
 debian/patches/sh.diff                             |    2 +-
 19 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e2d5b7f..e86649c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qt4-x11 (4:4.8~alpha+tp-0r1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Fathi Boudra <fabo at debian.org>  Fri, 10 Jun 2011 14:45:45 +0300
+
 qt4-x11 (4:4.7.3-2) UNRELEASED; urgency=low
 
   * Add patch cherry-picked upstream:
diff --git a/debian/patches/01_debian_append_qt4_suffix.diff b/debian/patches/01_debian_append_qt4_suffix.diff
index dcb39e5..3cc0ee8 100644
--- a/debian/patches/01_debian_append_qt4_suffix.diff
+++ b/debian/patches/01_debian_append_qt4_suffix.diff
@@ -64,7 +64,7 @@ Forwarded: not-needed
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -4596,7 +4596,7 @@ END {
+@@ -4792,7 +4792,7 @@ END {
  }
  
  # build qmake
@@ -73,7 +73,7 @@ Forwarded: not-needed
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -8033,8 +8033,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -8428,8 +8428,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,7 +84,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
-@@ -8435,11 +8435,11 @@ EXEC=""
+@@ -8832,11 +8832,11 @@ EXEC=""
  
  echo "Finding project files. Please wait..."
  if [ "$CFG_NOPROCESS" != "yes" ]; then
@@ -98,7 +98,7 @@ Forwarded: not-needed
      fi
  fi
  
-@@ -8626,7 +8626,7 @@ for file in .projects .projects.3; do
+@@ -9023,7 +9023,7 @@ for file in .projects .projects.3; do
          QMAKE_SPEC_ARGS="-spec $SPEC"
          echo $ECHO_N "  for $a$ECHO_C"
  
@@ -109,7 +109,7 @@ Forwarded: not-needed
              echo " (fast)"
 --- a/projects.pro
 +++ b/projects.pro
-@@ -153,7 +153,7 @@ qmake.path=$$[QT_INSTALL_BINS]
+@@ -144,7 +144,7 @@ qmake.path=$$[QT_INSTALL_BINS]
  win32 {
     qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
  } else {
@@ -120,7 +120,7 @@ Forwarded: not-needed
  
 --- a/qmake/Makefile.unix
 +++ b/qmake/Makefile.unix
-@@ -75,17 +75,17 @@ CPPFLAGS = -I. -Igenerators -Igenerators
+@@ -86,17 +86,17 @@ CPPFLAGS = -g -I. -Igenerators -Igenerat
  
  CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
  
@@ -213,35 +213,29 @@ Forwarded: not-needed
      static:CONFIG -= global_init_link_order
 --- a/tools/qtconfig/qtconfig.pro
 +++ b/tools/qtconfig/qtconfig.pro
-@@ -22,7 +22,7 @@ FORMS        = mainwindowbase.ui palette
+@@ -19,7 +19,7 @@ FORMS        = mainwindow.ui paletteedit
  RESOURCES    = qtconfig.qrc
  
  PROJECTNAME        = Qt Configuration
--TARGET                = qtconfig
-+TARGET                = qtconfig-qt4
- DESTDIR                = ../../bin
+-TARGET             = qtconfig
++TARGET             = qtconfig-qt4
+ DESTDIR            = ../../bin
  
  target.path=$$[QT_INSTALL_BINS]
---- a/translations/translations.pri
-+++ b/translations/translations.pri
-@@ -1,5 +1,5 @@
- qtPrepareTool(LCONVERT, lconvert)
--qtPrepareTool(LUPDATE, lupdate)
-+qtPrepareTool(LUPDATE, lupdate-qt4)
- LUPDATE += -locations relative -no-ui-lines
- 
- TS_TARGETS =
 --- a/translations/translations.pro
 +++ b/translations/translations.pro
-@@ -1,6 +1,6 @@
+@@ -1,8 +1,8 @@
  TRANSLATIONS = $$files(*.ts)
  
 -qtPrepareTool(LRELEASE, lrelease)
 +qtPrepareTool(LRELEASE, lrelease-qt4)
+ qtPrepareTool(LCONVERT, lconvert)
+-qtPrepareTool(LUPDATE, lupdate)
++qtPrepareTool(LUPDATE, lupdate-qt4)
+ LUPDATE += -locations relative -no-ui-lines
  
- contains(TEMPLATE_PREFIX, vc):vcproj = 1
- 
-@@ -15,7 +15,7 @@ updateqm.input = TRANSLATIONS
+ TS_TARGETS =
+@@ -96,7 +96,7 @@ updateqm.input = TRANSLATIONS
  updateqm.output = ${QMAKE_FILE_BASE}.qm
  isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS
  updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
@@ -272,9 +266,9 @@ Forwarded: not-needed
  isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR
 --- a/mkspecs/common/linux.conf
 +++ b/mkspecs/common/linux.conf
-@@ -35,8 +35,8 @@ QMAKE_LIBS_OPENGL_ES2 = -lGLESv2
- QMAKE_LIBS_OPENVG     = -lOpenVG
- QMAKE_LIBS_THREAD     = -lpthread
+@@ -41,8 +41,8 @@ QMAKE_LIBS_WAYLAND =
+ QMAKE_LIBDIR_WAYLAND =
+ QMAKE_DEFINES_WAYLAND =
  
 -QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
 -QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
@@ -307,7 +301,7 @@ Forwarded: not-needed
  #endif
 --- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
 +++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -668,7 +668,7 @@ namespace qdesigner_internal
+@@ -782,7 +782,7 @@ namespace qdesigner_internal
          binary += QDir::separator();
          switch (mode) {
          case UIC_GenerateCode:
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 8ee8474..a60610e 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
-@@ -830,7 +830,7 @@ foreach my $lib (@modules_to_sync) {
+@@ -831,7 +831,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 8a5a7e5..ced8dc0 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
-@@ -8492,7 +8492,7 @@ fi
+@@ -8889,7 +8889,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 f721db5..e593598 100644
--- a/debian/patches/12_add_nostrip_for_debug_packages.diff
+++ b/debian/patches/12_add_nostrip_for_debug_packages.diff
@@ -6,7 +6,7 @@ let dh_strip do it to generate debug packages.
 
 --- a/configure
 +++ b/configure
-@@ -650,6 +650,8 @@ mkdir -p "$outpath/config.tests"
+@@ -674,6 +674,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/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff
index f30c04a..b4d5223 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
-@@ -2433,7 +2433,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2444,7 +2444,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 e31c54e..d8f52eb 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
-@@ -2954,8 +2954,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -2952,8 +2952,6 @@ HEADERS += $$WEBKIT_API_HEADERS
  
  !CONFIG(webkit-debug):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 06ff1f8..f6736b0 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,6 +41,8 @@ embedded: SUBDIRS += makeqpf
+@@ -44,6 +44,8 @@ embedded: SUBDIRS += makeqpf
  
  !wince*:!cross_compile:SUBDIRS += qdoc3
  
diff --git a/debian/patches/23_permit_plugins_built_with_future_qt.diff b/debian/patches/23_permit_plugins_built_with_future_qt.diff
index 4debfd6..d59e8b3 100644
--- a/debian/patches/23_permit_plugins_built_with_future_qt.diff
+++ b/debian/patches/23_permit_plugins_built_with_future_qt.diff
@@ -23,7 +23,7 @@ installability and expand of forward binary compatibility beyond the same Qt
 
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -737,7 +737,7 @@ bool QLibraryPrivate::isPlugin(QSettings
+@@ -826,7 +826,7 @@ bool QLibraryPrivate::isPlugin(QSettings
  
      pluginState = IsNotAPlugin; // be pessimistic
  
diff --git a/debian/patches/40_alpha_ice.diff b/debian/patches/40_alpha_ice.diff
index 7f3cb1a..98103f6 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
-@@ -89,12 +89,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();
-@@ -102,6 +97,13 @@ public:
+@@ -98,6 +93,13 @@ public:
      }
  };
  
@@ -36,7 +36,7 @@ Author: Steve Langasek <vorlon at debian.org>
  {
 --- a/src/corelib/tools/qhash.h
 +++ b/src/corelib/tools/qhash.h
-@@ -521,7 +521,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
+@@ -523,7 +523,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
  }
  
  template <class Key, class T>
diff --git a/debian/patches/41_disable_opengl_visibility.diff b/debian/patches/41_disable_opengl_visibility.diff
index fd3b629..341bad7 100644
--- a/debian/patches/41_disable_opengl_visibility.diff
+++ b/debian/patches/41_disable_opengl_visibility.diff
@@ -2,7 +2,7 @@ temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
 
 --- a/src/opengl/opengl.pro
 +++ b/src/opengl/opengl.pro
-@@ -37,6 +37,7 @@ SOURCES	+= qgl.cpp \
+@@ -39,6 +39,7 @@ SOURCES += qgl.cpp \
             qglpaintdevice.cpp \
             qglbuffer.cpp \
  
diff --git a/debian/patches/50_kfreebsd_Q_OS.diff b/debian/patches/50_kfreebsd_Q_OS.diff
index 61f7f2d..c2eec96 100644
--- a/debian/patches/50_kfreebsd_Q_OS.diff
+++ b/debian/patches/50_kfreebsd_Q_OS.diff
@@ -4,7 +4,7 @@ Last-Update: 2010-10-06
 
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
-@@ -221,6 +221,8 @@ namespace QT_NAMESPACE {}
+@@ -227,6 +227,8 @@ namespace QT_NAMESPACE {}
  #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #  define Q_OS_FREEBSD
  #  define Q_OS_BSD4
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index b260c10..3440784 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
-@@ -5466,6 +5466,11 @@ QString &QString::vsprintf(const char* c
+@@ -5517,6 +5517,11 @@ QString &QString::vsprintf(const char* c
      return *this;
  }
  
diff --git a/debian/patches/96_webkit_no_gc_sections.diff b/debian/patches/96_webkit_no_gc_sections.diff
index 94e05b1..35cc494 100644
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@ -9,8 +9,8 @@ Last-Update: 2010-05-31 (mipsel added)
 
 --- a/src/3rdparty/webkit/WebCore/WebCore.pro
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -90,7 +90,7 @@ unix {
- }
+@@ -88,7 +88,7 @@ VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$$
+ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtNetwork
  
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
 -unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
diff --git a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
index 8156f56..aa75f2c 100644
--- a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
+++ b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
@@ -12,7 +12,7 @@ Last-Update: 2010-06-06
 
 --- a/src/corelib/io/qprocess_unix.cpp
 +++ b/src/corelib/io/qprocess_unix.cpp
-@@ -505,6 +505,9 @@ static char **_q_dupEnvironment(const QH
+@@ -524,6 +524,9 @@ static char **_q_dupEnvironment(const QP
  // under QNX RTOS we have to use vfork() when multithreading
  inline pid_t qt_fork()
  {
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index 214efa3..56db4d4 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -7,7 +7,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3013,7 +3013,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3145,7 +3145,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              CFG_HOST_ARCH=x86_64
          fi
          ;;
diff --git a/debian/patches/qtdebug_syslog.patch b/debian/patches/qtdebug_syslog.patch
index 320ad8c..4049cd5 100644
--- a/debian/patches/qtdebug_syslog.patch
+++ b/debian/patches/qtdebug_syslog.patch
@@ -11,16 +11,16 @@ Author: Thiago Macieira <thiago at kde.org>
  #endif
  
  #include <stdio.h>
-@@ -88,6 +89,8 @@
+@@ -87,6 +88,8 @@
+ 
  _LIT(qt_S60Filter, "Series60v?.*.sis");
- _LIT(qt_symbianFilter, "Symbianv*.sis");
  _LIT(qt_symbianSystemInstallDir, "z:\system\install\");
 +#elif defined(Q_OS_UNIX)
 +#include <syslog.h>
  #endif
  
  QT_BEGIN_NAMESPACE
-@@ -2247,6 +2250,27 @@ void qt_message_output(QtMsgType msgType
+@@ -2271,6 +2274,27 @@ void qt_message_output(QtMsgType msgType
  #else
          fprintf(stderr, "%s
", buf);
          fflush(stderr);
@@ -50,7 +50,7 @@ Author: Thiago Macieira <thiago at kde.org>
  
 --- a/src/corelib/kernel/qcoreapplication_p.h
 +++ b/src/corelib/kernel/qcoreapplication_p.h
-@@ -82,6 +82,8 @@ public:
+@@ -86,6 +86,8 @@ public:
      bool sendThroughObjectEventFilters(QObject *, QEvent *);
      bool notify_helper(QObject *, QEvent *);
  
diff --git a/debian/patches/series b/debian/patches/series
index 8826850..79b4625 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,20 +1,20 @@
 # upstream patches
-Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
-Fix_GL_problems_on_stock_1.4_SGX_drivers.patch
-Fixed_missing_text_when_using_static_text_items_in_GL_2_engine.patch
-Update_createwindow_in_qgl_x11egl.patch
-Improve-performance-of-partial-updates-in-raster-win.patch
-Fix_transformIsSimple_in_QGraphicsScene.patch
-Micro-optimization_for_QSpanData.patch
-Some_Optimizations_for_the_gray_raster.patch
-Make_use_of_the_fast_image_paths.patch
-Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
-Prevent_recursion_when_creating_window_surface.patch
-Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
+#Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
+#Fix_GL_problems_on_stock_1.4_SGX_drivers.patch
+#Fixed_missing_text_when_using_static_text_items_in_GL_2_engine.patch
+#Update_createwindow_in_qgl_x11egl.patch
+#Improve-performance-of-partial-updates-in-raster-win.patch
+#Fix_transformIsSimple_in_QGraphicsScene.patch
+#Micro-optimization_for_QSpanData.patch
+#Some_Optimizations_for_the_gray_raster.patch
+#Make_use_of_the_fast_image_paths.patch
+#Add_support_for_QT_USE_DRAG_DISTANCE_env_var.patch
+#Prevent_recursion_when_creating_window_surface.patch
+#Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
 
 # qt-copy patches
-0195-compositing-properties.diff
-0225-invalidate-tabbar-geometry-on-refresh.patch
+#0195-compositing-properties.diff
+#0225-invalidate-tabbar-geometry-on-refresh.patch
 
 # debian patches
 qtdebug_syslog.patch
@@ -30,7 +30,7 @@ buildable_appchooser_states_demos.patch
 16_hide_std_symbols_on_qtwebkit.diff
 18_enable_qt3support_qtwebkit_debug_info.diff
 20_install_qvfb.diff
-21_qt_ia32_library_path.diff
+# TODO 21_qt_ia32_library_path.diff
 23_permit_plugins_built_with_future_qt.diff
 30_webkit_unaligned_access.diff
 40_alpha_ice.diff
@@ -41,7 +41,7 @@ buildable_appchooser_states_demos.patch
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
 92_armel_gcc43_valist_compat.diff
-x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
+# TODO x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
 94_armv6_uname_entry.diff
 96_webkit_no_gc_sections.diff
 99_hppa_bug561203_decrease_failure_rate.diff
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 484faad..3762799 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -7,7 +7,7 @@ Last-Update: 2011-04-27
 
 --- a/configure
 +++ b/configure
-@@ -3053,6 +3053,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
+@@ -3185,6 +3185,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
              ;;
          esac
          ;;

-- 
Qt 4 packaging

More information about the pkg-kde-commits mailing list