[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-5-10-g8c0114b

Fathi Boudra fabo at alioth.debian.org
Tue Jun 8 08:14:29 UTC 2010 

The following commit has been merged in the master branch:
commit af2da382ee7425bfe87fc9dd506e67ef9cad6741
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Jun 8 11:10:48 2010 +0300

    Refresh patches
---
 debian/patches/0180-window-role.diff               |    6 +++---
 debian/patches/0195-compositing-properties.diff    |    6 +++---
 debian/patches/0216-allow-isystem-for-headers.diff |    4 ++--
 ...225-invalidate-tabbar-geometry-on-refresh.patch |    2 +-
 debian/patches/08_configure_quilt_compat.diff      |    2 +-
 debian/patches/09_qmake_lflags_as-needed.diff      |    2 +-
 debian/patches/10_config_tests_fixes.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 +-
 debian/patches/50_kfreebsd_build_fix.diff          |    4 ++--
 debian/patches/81_hurd_architecture.diff           |    2 +-
 debian/patches/82_hurd_SA_SIGINFO.diff             |    2 +-
 debian/patches/92_armel_gcc43_valist_compat.diff   |    2 +-
 debian/patches/96_webkit_no_gc_sections.diff       |    2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/debian/patches/0180-window-role.diff b/debian/patches/0180-window-role.diff
index 29833f5..17ba167 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
-@@ -693,6 +693,7 @@ public:
+@@ -696,6 +696,7 @@ public:
      static QWidget *keyboardGrabber;
  
      void setWindowRole();
@@ -62,7 +62,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
      void x11UpdateIsOpaque();
 --- a/src/gui/kernel/qwidget_x11.cpp
 +++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -825,13 +825,17 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -824,13 +824,17 @@ void QWidgetPrivate::create_sys(WId wind
          data.fstrut_dirty = 1;
  
          // declare the widget's window role
@@ -86,7 +86,7 @@ Trolltech task ID : 168283 (status: "fixed" for Qt 4.4.0, but effectively refuse
          }
  
          // set client leader property
-@@ -2917,6 +2921,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2916,6 +2920,17 @@ void QWidgetPrivate::setWindowRole()
      XChangeProperty(X11->display, q->internalWinId(),
                      ATOM(WM_WINDOW_ROLE), XA_STRING, 8, PropModeReplace,
                      (unsigned char *)windowRole.constData(), windowRole.length());
diff --git a/debian/patches/0195-compositing-properties.diff b/debian/patches/0195-compositing-properties.diff
index bc4b36e..38aa986 100644
--- a/debian/patches/0195-compositing-properties.diff
+++ b/debian/patches/0195-compositing-properties.diff
@@ -13,7 +13,7 @@ bugs.kde.org number : none
 
 --- a/src/gui/kernel/qwidget_x11.cpp
 +++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -763,6 +763,11 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -762,6 +762,11 @@ void QWidgetPrivate::create_sys(WId wind
          Q_ASSERT(id);
          XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                  &wsa);
@@ -25,7 +25,7 @@ bugs.kde.org number : none
      } else if (topLevel && !desktop) {        // top-level widget
          if (!X11->wm_client_leader)
              create_wm_client_leader();
-@@ -816,13 +821,21 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -815,13 +820,21 @@ void QWidgetPrivate::create_sys(WId wind
          // set EWMH window types
          setNetWmWindowTypes();
  
@@ -49,7 +49,7 @@ bugs.kde.org number : none
  
          // declare the widget's window role
          QByteArray windowRole;
-@@ -842,10 +855,6 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -841,10 +854,6 @@ void QWidgetPrivate::create_sys(WId wind
          XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
                          XA_WINDOW, 32, PropModeReplace,
                          (unsigned char *)&X11->wm_client_leader, 1);
diff --git a/debian/patches/0216-allow-isystem-for-headers.diff b/debian/patches/0216-allow-isystem-for-headers.diff
index 016941f..d3472c1 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
-@@ -1029,6 +1029,11 @@ while [ "$#" -gt 0 ]; do
+@@ -1031,6 +1031,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
-@@ -2047,6 +2052,9 @@ while [ "$#" -gt 0 ]; do
+@@ -2049,6 +2054,9 @@ while [ "$#" -gt 0 ]; do
      add_ipath)
          I_FLAGS="$I_FLAGS -I\"${VAL}\""
          ;;
diff --git a/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch b/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
index b35ceac..063196e 100644
--- a/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
+++ b/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
@@ -30,7 +30,7 @@ bugs.kde.org number : 159014
 
 --- a/src/gui/widgets/qtabbar.cpp
 +++ b/src/gui/widgets/qtabbar.cpp
-@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
+@@ -717,8 +717,8 @@ void QTabBarPrivate::refresh()
          layoutTabs();
          makeVisible(currentIndex);
          q->update();
diff --git a/debian/patches/08_configure_quilt_compat.diff b/debian/patches/08_configure_quilt_compat.diff
index 5f51a7d..1b4cb5a 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
-@@ -7658,7 +7658,7 @@ fi
+@@ -7644,7 +7644,7 @@ fi
  # .projects.3    -> the rest
  rm -f .projects .projects.1 .projects.2 .projects.3
  
diff --git a/debian/patches/09_qmake_lflags_as-needed.diff b/debian/patches/09_qmake_lflags_as-needed.diff
index d8f001b..901a848 100644
--- a/debian/patches/09_qmake_lflags_as-needed.diff
+++ b/debian/patches/09_qmake_lflags_as-needed.diff
@@ -5,7 +5,7 @@ Bug reported to Trolltech.
 
 --- a/configure
 +++ b/configure
-@@ -648,6 +648,8 @@ mkdir -p "$outpath/config.tests"
+@@ -650,6 +650,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/10_config_tests_fixes.diff b/debian/patches/10_config_tests_fixes.diff
index 44588af..13c1277 100644
--- a/debian/patches/10_config_tests_fixes.diff
+++ b/debian/patches/10_config_tests_fixes.diff
@@ -12,7 +12,7 @@ Author: Fathi Boudra <fabo at debian.org>
 +LIBS += -lfbclient
 --- a/src/sql/drivers/drivers.pri
 +++ b/src/sql/drivers/drivers.pri
-@@ -93,7 +93,7 @@ contains(sql-drivers, ibase) {
+@@ -94,7 +94,7 @@ contains(sql-drivers, ibase) {
      HEADERS += drivers/ibase/qsql_ibase.h
      SOURCES += drivers/ibase/qsql_ibase.cpp
      
diff --git a/debian/patches/12_add_nostrip_for_debug_packages.diff b/debian/patches/12_add_nostrip_for_debug_packages.diff
index 936f572..f61b8dd 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
-@@ -649,6 +649,7 @@ rm -f "$outpath/config.tests/.qmake.cach
+@@ -651,6 +651,7 @@ rm -f "$outpath/config.tests/.qmake.cach
  cp "$QMAKE_VARS_FILE" "$outpath/config.tests/.qmake.cache"
  
  QMakeVar add QMAKE_LFLAGS -Wl,--as-needed
diff --git a/debian/patches/15_fix_qmake_makefile_generation.diff b/debian/patches/15_fix_qmake_makefile_generation.diff
index c8fad2f..0d96937 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
-@@ -2396,7 +2396,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2410,7 +2410,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 44cdb54..3fac5ba 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
-@@ -3392,8 +3392,6 @@ HEADERS += $$WEBKIT_API_HEADERS
+@@ -3399,8 +3399,6 @@ HEADERS += $$WEBKIT_API_HEADERS
  CONFIG(QTDIR_build):isEqual(QT_MAJOR_VERSION, 4):greaterThan(QT_MINOR_VERSION, 4) {
      # start with 4.5
      # 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 a83b676..1034068 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
-@@ -33,5 +33,7 @@ embedded: SUBDIRS += makeqpf
+@@ -34,5 +34,7 @@ embedded: SUBDIRS += makeqpf
  
  !wince*:!cross_compile:SUBDIRS += qdoc3
  
diff --git a/debian/patches/50_kfreebsd_build_fix.diff b/debian/patches/50_kfreebsd_build_fix.diff
index fdb4eee..17a0b81 100644
--- a/debian/patches/50_kfreebsd_build_fix.diff
+++ b/debian/patches/50_kfreebsd_build_fix.diff
@@ -55,7 +55,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
  #    include <fenv.h>
  #endif
  
-@@ -6537,7 +6537,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6538,7 +6538,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
      _control87(MCW_EM, MCW_EM);
  #endif
  
@@ -64,7 +64,7 @@ Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
      fenv_t envp;
      feholdexcept(&envp);
  #endif
-@@ -6553,7 +6553,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6554,7 +6554,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
  #endif //_M_X64
  #endif //Q_OS_WIN
  
diff --git a/debian/patches/81_hurd_architecture.diff b/debian/patches/81_hurd_architecture.diff
index 355b270..061948e 100644
--- a/debian/patches/81_hurd_architecture.diff
+++ b/debian/patches/81_hurd_architecture.diff
@@ -6,7 +6,7 @@ Author: Pino Toscano <pino at kde.org>
 Forwarded: http://bugreports.qt.nokia.com/browse/QTBUG-7803
 --- a/configure
 +++ b/configure
-@@ -2723,6 +2723,17 @@ fi
+@@ -2725,6 +2725,17 @@ fi
  
  if [ -z "${CFG_HOST_ARCH}" ]; then
      case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
diff --git a/debian/patches/82_hurd_SA_SIGINFO.diff b/debian/patches/82_hurd_SA_SIGINFO.diff
index 43eb894..d506800 100644
--- a/debian/patches/82_hurd_SA_SIGINFO.diff
+++ b/debian/patches/82_hurd_SA_SIGINFO.diff
@@ -4,7 +4,7 @@ Author: Pino Toscano <pino at kde.org>
 Forwarded: http://bugreports.qt.nokia.com/browse/QTBUG-7805
 --- a/src/testlib/qtestcase.cpp
 +++ b/src/testlib/qtestcase.cpp
-@@ -1521,7 +1521,11 @@ FatalSignalHandler::FatalSignalHandler()
+@@ -1541,7 +1541,11 @@ FatalSignalHandler::FatalSignalHandler()
  #ifndef Q_WS_QWS
          // Don't overwrite any non-default handlers
          // however, we need to replace the default QWS handlers
diff --git a/debian/patches/92_armel_gcc43_valist_compat.diff b/debian/patches/92_armel_gcc43_valist_compat.diff
index acd3e28..d5d217a 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
-@@ -5289,6 +5289,11 @@ QString &QString::vsprintf(const char* c
+@@ -5300,6 +5300,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 cb0c57f..a1f12b3 100644
--- a/debian/patches/96_webkit_no_gc_sections.diff
+++ b/debian/patches/96_webkit_no_gc_sections.diff
@@ -9,7 +9,7 @@ Last-Update: 2010-05-31 (mipsel added)
 
 --- a/src/3rdparty/webkit/WebCore/WebCore.pro
 +++ b/src/3rdparty/webkit/WebCore/WebCore.pro
-@@ -63,7 +63,7 @@ unix {
+@@ -66,7 +66,7 @@ unix {
  }
  
  unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 

-- 
Qt 4 Debian packaging

More information about the pkg-kde-commits mailing list