rev 13945 - in trunk/packages/qt4-x11/debian: . patches

Fathi Boudra fabo at alioth.debian.org
Tue Mar 3 16:24:53 UTC 2009 

Author: fabo
Date: 2009-03-03 16:24:53 +0000 (Tue, 03 Mar 2009)
New Revision: 13945

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
   trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
   trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
   trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
   trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
   trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
   trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
   trunk/packages/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff
   trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
   trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
   trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
   trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
   trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff
   trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
   trunk/packages/qt4-x11/debian/patches/21_fix_ppc_build.diff
   trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
   trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
   trunk/packages/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff
   trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
   trunk/packages/qt4-x11/debian/patches/series
   trunk/packages/qt4-x11/debian/rules
Log:
Refresh patches.
Enable changelog install.
Update shlibsversion.
Remove patches:
 - 20_fix_ftbfs_callgrindChildExitCode.diff - Merged upstream.
 - 21_fix_ppc_build.diff - Reverted upstream.
 - 22_fix_qiconvcodec.diff - Merged upstream.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/changelog	2009-03-03 16:24:53 UTC (rev 13945)
@@ -1,3 +1,13 @@
+qt4-x11 (4.5.0-1) UNRELEASED; urgency=low
+
+  * New upstream released.
+  * Remove patches:
+    - 20_fix_ftbfs_callgrindChildExitCode.diff - Merged upstream.
+    - 21_fix_ppc_build.diff - Reverted upstream.
+    - 22_fix_qiconvcodec.diff - Merged upstream.
+
+ -- Fathi Boudra <fabo at debian.org>  Tue, 03 Mar 2009 16:40:52 +0100
+
 qt4-x11 (4.5.0~rc1-2) experimental; urgency=low
 
   * Fix shlibs version. It should be 4.5.0~rc1.

Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -14,7 +14,7 @@
 
 --- a/src/corelib/kernel/qobject.cpp
 +++ b/src/corelib/kernel/qobject.cpp
-@@ -988,9 +988,18 @@ void QObject::setObjectName(const QStrin
+@@ -993,9 +993,18 @@ void QObject::setObjectName(const QStrin
  {
      Q_D(QObject);
      d->objectName = name;
@@ -35,7 +35,7 @@
      QObject::child is compat but needs to call itself recursively,
 --- a/src/corelib/kernel/qobject_p.h
 +++ b/src/corelib/kernel/qobject_p.h
-@@ -139,6 +139,9 @@ public:
+@@ -144,6 +144,9 @@ public:
      mutable quint32 connectedSignals;
  
      QString objectName;
@@ -47,7 +47,7 @@
      struct Connection
 --- a/src/gui/kernel/qwidget_p.h
 +++ b/src/gui/kernel/qwidget_p.h
-@@ -355,6 +355,7 @@ public:
+@@ -360,6 +360,7 @@ public:
  
  #if defined(Q_WS_X11)
      void setWindowRole();
@@ -57,7 +57,7 @@
      void x11UpdateIsOpaque();
 --- a/src/gui/kernel/qwidget_x11.cpp
 +++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -761,13 +761,17 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -765,13 +765,17 @@ void QWidgetPrivate::create_sys(WId wind
          data.fstrut_dirty = 1;
  
          // declare the widget's window role
@@ -81,7 +81,7 @@
          }
  
          // set client leader property
-@@ -2733,6 +2737,17 @@ void QWidgetPrivate::setWindowRole()
+@@ -2737,6 +2741,17 @@ void QWidgetPrivate::setWindowRole()
                      (unsigned char *)windowRole.constData(), windowRole.length());
  }
  

Modified: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -9,7 +9,7 @@
 
 --- a/src/gui/kernel/qwidget_x11.cpp
 +++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -702,6 +702,11 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -706,6 +706,11 @@ void QWidgetPrivate::create_sys(WId wind
          Q_ASSERT(id);
          XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
                                  &wsa);
@@ -21,7 +21,7 @@
      } else if (topLevel && !desktop) {        // top-level widget
          if (!X11->wm_client_leader)
              create_wm_client_leader();
-@@ -752,13 +757,21 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -756,13 +761,21 @@ void QWidgetPrivate::create_sys(WId wind
          // set EWMH window types
          setNetWmWindowTypes();
  
@@ -45,7 +45,7 @@
  
          // declare the widget's window role
          QByteArray windowRole;
-@@ -778,10 +791,6 @@ void QWidgetPrivate::create_sys(WId wind
+@@ -782,10 +795,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);

Modified: trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/0209-prevent-qt-mixing.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -15,7 +15,7 @@
 
 --- a/src/corelib/kernel/qobject_p.h
 +++ b/src/corelib/kernel/qobject_p.h
-@@ -78,7 +78,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPO
+@@ -83,7 +83,9 @@ extern QSignalSpyCallbackSet Q_CORE_EXPO
  
  inline QObjectData::~QObjectData() {}
  

Modified: trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/0225-invalidate-tabbar-geometry-on-refresh.patch	2009-03-03 16:24:53 UTC (rev 13945)
@@ -21,7 +21,7 @@
 
 --- a/src/gui/widgets/qtabbar.cpp
 +++ b/src/gui/widgets/qtabbar.cpp
-@@ -673,8 +673,8 @@ void QTabBarPrivate::refresh()
+@@ -678,8 +678,8 @@ void QTabBarPrivate::refresh()
          layoutTabs();
          makeVisible(currentIndex);
          q->update();

Modified: trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/0234-fix-mysql-threaded.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -9,7 +9,7 @@
 
 --- a/src/sql/drivers/mysql/qsql_mysql.cpp
 +++ b/src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -1252,6 +1252,10 @@ bool QMYSQLDriver::open(const QString& d
+@@ -1257,6 +1257,10 @@ bool QMYSQLDriver::open(const QString& d
      d->preparedQuerysEnabled = false;
  #endif
  
@@ -20,7 +20,7 @@
      setOpen(true);
      setOpenError(false);
      return true;
-@@ -1260,6 +1264,9 @@ bool QMYSQLDriver::open(const QString& d
+@@ -1265,6 +1269,9 @@ bool QMYSQLDriver::open(const QString& d
  void QMYSQLDriver::close()
  {
      if (isOpen()) {

Modified: trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/0245-fix-randr-changes-detecting.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -9,7 +9,7 @@
 
 --- a/src/gui/kernel/qapplication_x11.cpp
 +++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -3339,11 +3339,11 @@ int QApplication::x11ProcessEvent(XEvent
+@@ -3350,11 +3350,11 @@ int QApplication::x11ProcessEvent(XEvent
          QSize oldSize(w->size());
          w->data->crect.setWidth(DisplayWidth(X11->display, scr));
          w->data->crect.setHeight(DisplayHeight(X11->display, scr));

Modified: trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/0255-qtreeview-selection-columns-hidden.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -31,7 +31,7 @@
 
 --- a/src/gui/itemviews/qtreeview.cpp
 +++ b/src/gui/itemviews/qtreeview.cpp
-@@ -3526,7 +3526,7 @@ QList<QPair<int, int> > QTreeViewPrivate
+@@ -3532,7 +3532,7 @@ QList<QPair<int, int> > QTreeViewPrivate
      current.first = -2; // -1 is not enough because -1+1 = 0
      current.second = -2;
      foreach (int logicalColumn, logicalIndexes) {

Modified: trunk/packages/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/0273-odbc-64bit-compile.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -5,7 +5,7 @@
 
 --- a/src/sql/drivers/odbc/qsql_odbc.cpp
 +++ b/src/sql/drivers/odbc/qsql_odbc.cpp
-@@ -64,13 +64,13 @@ QT_BEGIN_NAMESPACE
+@@ -69,13 +69,13 @@ QT_BEGIN_NAMESPACE
  #endif
  
  // newer platform SDKs use SQLLEN instead of SQLINTEGER

Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -1,6 +1,6 @@
 --- a/demos/qtdemo/menumanager.cpp
 +++ b/demos/qtdemo/menumanager.cpp
-@@ -284,7 +284,7 @@ void MenuManager::showDocInAssistant(con
+@@ -289,7 +289,7 @@ void MenuManager::showDocInAssistant(con
      if (this->assistantProcess.state() != QProcess::Running){
          QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
  #if !defined(Q_OS_MAC)
@@ -11,7 +11,7 @@
  #endif
 --- a/tools/designer/src/designer/assistantclient.cpp
 +++ b/tools/designer/src/designer/assistantclient.cpp
-@@ -109,7 +109,7 @@ QString AssistantClient::binary()
+@@ -114,7 +114,7 @@ QString AssistantClient::binary()
  {
      QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
  #if !defined(Q_OS_MAC)

Modified: trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -4,7 +4,7 @@
 
 --- a/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
 +++ b/tools/qdbus/qdbuscpp2xml/qdbuscpp2xml.cpp
-@@ -391,7 +391,7 @@ int main(int argc, char **argv)
+@@ -396,7 +396,7 @@ int main(int argc, char **argv)
          else {
              // run moc on this file
              QProcess proc;

Modified: trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -2,7 +2,7 @@
 
 --- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
 +++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -663,7 +663,7 @@ namespace qdesigner_internal
+@@ -668,7 +668,7 @@ namespace qdesigner_internal
          binary += QDir::separator();
          switch (mode) {
          case UIC_GenerateCode:

Modified: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -57,7 +57,7 @@
      if [ "$VERBOSE" = "yes" ]; then
 --- a/configure
 +++ b/configure
-@@ -3935,7 +3935,7 @@ END {
+@@ -3923,7 +3923,7 @@ END {
  }
  
  # build qmake
@@ -66,7 +66,7 @@
      echo "Creating qmake. Please wait..."
  
      OLD_QCONFIG_H=
-@@ -6511,8 +6511,8 @@ QMAKE_ABSOLUTE_SOURCE_ROOT = \$\$QT_SOUR
+@@ -6499,8 +6499,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 @@
  QMAKE_UIC3       = \$\$QT_BUILD_TREE/bin/uic3
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
-@@ -6861,11 +6861,11 @@ EXEC=""
+@@ -6849,11 +6849,11 @@ EXEC=""
  #-------------------------------------------------------------------------------
  
  echo "Finding project files. Please wait..."
@@ -91,7 +91,7 @@
  fi
  
  # .projects      -> projects to process
-@@ -7038,7 +7038,7 @@ for file in .projects .projects.3; do
+@@ -7026,7 +7026,7 @@ for file in .projects .projects.3; do
              echo "  for $a\c"
          fi
  

Modified: trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/15_fix_qmake_makefile_generation.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -1,6 +1,6 @@
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -2329,7 +2329,7 @@ MakefileGenerator::writeSubTargets(QText
+@@ -2334,7 +2334,7 @@ MakefileGenerator::writeSubTargets(QText
  
          QString mkfile = subtarget->makefile;
          if(!in_directory.isEmpty())

Modified: trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/17_add_postgresql_8.3_support.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -2,7 +2,7 @@
 
 --- a/src/sql/drivers/psql/qsql_psql.cpp
 +++ b/src/sql/drivers/psql/qsql_psql.cpp
-@@ -632,9 +632,12 @@ static QPSQLDriver::Protocol getPSQLVers
+@@ -637,9 +637,12 @@ static QPSQLDriver::Protocol getPSQLVers
                      serverVersion = QPSQLDriver::Version81;
                      break;
                  case 2:
@@ -16,7 +16,7 @@
                  }
                  break;
              default:
-@@ -915,6 +918,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons
+@@ -920,6 +923,7 @@ QSqlIndex QPSQLDriver::primaryIndex(cons
      case QPSQLDriver::Version8:
      case QPSQLDriver::Version81:
      case QPSQLDriver::Version82:
@@ -24,7 +24,7 @@
          stmt = QLatin1String("SELECT pg_attribute.attname, pg_attribute.atttypid::int, "
                  "pg_class.relname "
                  "FROM pg_attribute, pg_class "
-@@ -988,6 +992,7 @@ QSqlRecord QPSQLDriver::record(const QSt
+@@ -993,6 +997,7 @@ QSqlRecord QPSQLDriver::record(const QSt
      case QPSQLDriver::Version8:
      case QPSQLDriver::Version81:
      case QPSQLDriver::Version82:
@@ -34,7 +34,7 @@
                  "pg_attrdef.adsrc "
 --- a/src/sql/drivers/psql/qsql_psql.h
 +++ b/src/sql/drivers/psql/qsql_psql.h
-@@ -99,7 +99,8 @@ public:
+@@ -104,7 +104,8 @@ public:
          Version74 = 10,
          Version8 = 11,
          Version81 = 12,

Modified: trunk/packages/qt4-x11/debian/patches/21_fix_ppc_build.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/21_fix_ppc_build.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/21_fix_ppc_build.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -1,6 +1,6 @@
 --- a/src/corelib/arch/qatomic_powerpc.h
 +++ b/src/corelib/arch/qatomic_powerpc.h
-@@ -188,7 +188,7 @@ inline bool QBasicAtomicInt::testAndSetR
+@@ -193,7 +193,7 @@ inline bool QBasicAtomicInt::testAndSetR
                   "lwarx  %[result]," _Q_VALUE "\n"
                   "xor.   %[result], %[result], %[expectedValue]\n"
                   "bne    $+12\n"

Modified: trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -1,6 +1,6 @@
 --- a/src/corelib/global/qlibraryinfo.cpp
 +++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -71,14 +71,7 @@ class QLibraryInfoPrivate
+@@ -76,14 +76,7 @@ class QLibraryInfoPrivate
  {
  public:
      static QSettings *findConfiguration();
@@ -16,7 +16,7 @@
      static QSettings *configuration()
      {
  #ifdef QT_NO_THREAD
-@@ -97,6 +90,15 @@ public:
+@@ -102,6 +95,15 @@ public:
      }
  };
  
@@ -34,7 +34,7 @@
      settings = QLibraryInfoPrivate::findConfiguration();
 --- a/src/corelib/tools/qhash.h
 +++ b/src/corelib/tools/qhash.h
-@@ -492,7 +492,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
+@@ -497,7 +497,7 @@ Q_INLINE_TEMPLATE void QHash<Key, T>::de
  }
  
  template <class Key, class T>

Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -4,7 +4,7 @@
 
 --- a/src/corelib/global/qglobal.h
 +++ b/src/corelib/global/qglobal.h
-@@ -208,6 +208,12 @@ namespace QT_NAMESPACE {}
+@@ -213,6 +213,12 @@ namespace QT_NAMESPACE {}
  #  define Q_OS_RELIANT
  #elif defined(__linux__) || defined(__linux)
  #  define Q_OS_LINUX
@@ -17,7 +17,7 @@
  #elif defined(__FreeBSD__) || defined(__DragonFly__)
  #  define Q_OS_FREEBSD
  #  define Q_OS_BSD4
-@@ -228,8 +234,6 @@ namespace QT_NAMESPACE {}
+@@ -233,8 +239,6 @@ namespace QT_NAMESPACE {}
  #  define Q_OS_AIX
  #elif defined(__Lynx__)
  #  define Q_OS_LYNX
@@ -28,7 +28,7 @@
  #elif defined(__QNXNTO__)
 --- a/src/corelib/plugin/qlibrary.cpp
 +++ b/src/corelib/plugin/qlibrary.cpp
-@@ -285,13 +285,13 @@ static bool qt_parse_pattern(const char 
+@@ -290,13 +290,13 @@ static bool qt_parse_pattern(const char 
  
  #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) && !defined(QT_NO_PLUGIN_CHECK)
  
@@ -46,7 +46,7 @@
                               const char *pattern, ulong p_len)
 --- a/src/corelib/tools/qlocale.cpp
 +++ b/src/corelib/tools/qlocale.cpp
-@@ -73,7 +73,7 @@ QT_END_NAMESPACE
+@@ -78,7 +78,7 @@ QT_END_NAMESPACE
  #include <qdebug.h>
  #include <time.h>
  
@@ -55,7 +55,7 @@
  #    include <fenv.h>
  #endif
  
-@@ -6536,7 +6536,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6541,7 +6541,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
      _control87(MCW_EM, MCW_EM);
  #endif
  
@@ -64,7 +64,7 @@
      fenv_t envp;
      feholdexcept(&envp);
  #endif
-@@ -6552,7 +6552,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
+@@ -6557,7 +6557,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, in
  #endif //_M_X64
  #endif //Q_OS_WIN
  

Modified: trunk/packages/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/71_hppa_unaligned_access_fix_458133.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -4,7 +4,7 @@
 
 --- a/src/3rdparty/sha1/sha1.cpp
 +++ b/src/3rdparty/sha1/sha1.cpp
-@@ -144,10 +144,10 @@ static inline void sha1ProcessChunk(Sha1
+@@ -149,10 +149,10 @@ static inline void sha1ProcessChunk(Sha1
      quint32 d = state->h3;
      quint32 e = state->h4;
  
@@ -18,7 +18,7 @@
  
      for (int i = 0; i < 16; ++i)
          chunk->words[i] = qFromBigEndian(chunk->words[i]);
-@@ -183,7 +183,7 @@ static inline void sha1ProcessChunk(Sha1
+@@ -188,7 +188,7 @@ static inline void sha1ProcessChunk(Sha1
      // Wipe variables
  #ifdef SHA1_WIPE_VARIABLES
      a = b = c = d = e = 0;

Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff	2009-03-03 16:24:53 UTC (rev 13945)
@@ -2,7 +2,7 @@
 
 --- a/src/corelib/io/qfsfileengine_unix.cpp
 +++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -59,6 +59,10 @@
+@@ -64,6 +64,10 @@
  
  QT_BEGIN_NAMESPACE
  

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/patches/series	2009-03-03 16:24:53 UTC (rev 13945)
@@ -24,9 +24,6 @@
 17_add_postgresql_8.3_support.diff
 18_enable_qt3support_qtwebkit_debug_info.diff
 19_install_qdoc3.diff
-20_fix_ftbfs_callgrindChildExitCode.diff
-21_fix_ppc_build.diff
-22_fix_qiconvcodec.diff
 30_webkit_unaligned_access.diff
 40_alpha_ice.diff
 41_disable_opengl_visibility.diff

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2009-03-03 16:10:04 UTC (rev 13944)
+++ trunk/packages/qt4-x11/debian/rules	2009-03-03 16:24:53 UTC (rev 13945)
@@ -28,7 +28,7 @@
 # Shlibs of the current upstream version
 #DEB_DH_MAKESHLIBS_ARGS_ALL := -V
 # Specific shlibs version
-SHLIBSVERSION := 4.5.0~rc1
+SHLIBSVERSION := 4.5.0
 $(foreach libpkg,$(filter-out %-dev %-dbg,$(filter lib%,$(DEB_ARCH_PACKAGES))),$(eval DEB_DH_MAKESHLIBS_ARGS_$(libpkg) := -V'$(libpkg) (>= $(SHLIBSVERSION))'))
 
 DEB_DH_STRIP_ARGS_libqt4-dbg := --exclude=.debug
@@ -36,7 +36,7 @@
 DEB_DH_SHLIBDEPS_ARGS_ALL := --exclude=.debug
 
 # Disable for rc
-#DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
+DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
 
 DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT

More information about the pkg-kde-commits mailing list