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

Fathi Boudra fboudra-guest at alioth.debian.org
Sun Oct 7 05:46:00 UTC 2007 

Author: fboudra-guest
Date: 2007-10-07 05:45:59 +0000 (Sun, 07 Oct 2007)
New Revision: 7353

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff
   trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
   trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
   trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
   trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
   trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
   trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
   trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff
   trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
   trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff
   trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff
   trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
   trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
   trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff
   trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
   trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
   trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.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/06_qtdemo_destdir.diff
   trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
   trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
   trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
   trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
   trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
   trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
   trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
   trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff
   trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
   trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff
   trunk/packages/qt4-x11/debian/patches/series
   trunk/packages/qt4-x11/debian/rules
Log:
* Use quilt -p ab.
* Add dot to make ana happy.
* 07 patch is a debian patch.
* Uniform style in rules.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/changelog	2007-10-07 05:45:59 UTC (rev 7353)
@@ -26,8 +26,8 @@
   * Fix qt4-config menu section. (Closes: 444896)
 
   [Sune Vuorela]
-  * Have strict interdependencies between packages with a shlibs.local file
-    (Closing: #438746)
+  * Have strict interdependencies between packages with a shlibs.local file.
+    (Closes: #438746)
   * Don't trust uname in generating the qt build key. This has bitten us in
     qt3, but will soon bite us in qt4 as qt4 becomes more popular.
 

Modified: trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -6,8 +6,8 @@
 
 various fixes to get Qt 4.3 without hundreds of warnings compiling
 
---- qt4-x11-4.3.2.orig/config.tests/unix/endian.test
-+++ qt4-x11-4.3.2/config.tests/unix/endian.test
+--- a/config.tests/unix/endian.test
++++ b/config.tests/unix/endian.test
 @@ -30,6 +30,7 @@
      [ "$VERBOSE" = "yes" ] && echo "    Found 'MostSignificantByteFirst' in binary"
      ENDIAN="BIG"
@@ -16,8 +16,8 @@
  
  # done
  if [ "$ENDIAN" = "LITTLE" ]; then
---- qt4-x11-4.3.2.orig/config.tests/unix/glib/glib.cpp
-+++ qt4-x11-4.3.2/config.tests/unix/glib/glib.cpp
+--- a/config.tests/unix/glib/glib.cpp
++++ b/config.tests/unix/glib/glib.cpp
 @@ -6,7 +6,7 @@
  {
      GMainContext *context;
@@ -27,8 +27,8 @@
      if (!g_thread_supported())
          g_thread_init(NULL);
      context = g_main_context_default();
---- qt4-x11-4.3.2.orig/src/corelib/codecs/qtextcodec.cpp
-+++ qt4-x11-4.3.2/src/corelib/codecs/qtextcodec.cpp
+--- a/src/corelib/codecs/qtextcodec.cpp
++++ b/src/corelib/codecs/qtextcodec.cpp
 @@ -432,7 +432,7 @@
              localeMapper = checkForCodec(lang);
  
@@ -38,8 +38,8 @@
              localeMapper = checkForCodec("ISO 8859-15");
  
          // 6. guess locale from ctype unless ctype is "C"
---- qt4-x11-4.3.2.orig/src/corelib/io/qtextstream.cpp
-+++ qt4-x11-4.3.2/src/corelib/io/qtextstream.cpp
+--- a/src/corelib/io/qtextstream.cpp
++++ b/src/corelib/io/qtextstream.cpp
 @@ -553,8 +553,8 @@
      if (!codec || autoDetectUnicode) {
          autoDetectUnicode = false;
@@ -51,8 +51,8 @@
              codec = QTextCodec::codecForName("UTF-16");
          } else if (!codec) {
              codec = QTextCodec::codecForLocale();
---- qt4-x11-4.3.2.orig/src/corelib/io/qurl.cpp
-+++ qt4-x11-4.3.2/src/corelib/io/qurl.cpp
+--- a/src/corelib/io/qurl.cpp
++++ b/src/corelib/io/qurl.cpp
 @@ -4741,9 +4741,9 @@
      if (include.isEmpty()) {
          for (int i = 0; i < len; ++i) {
@@ -79,8 +79,8 @@
                  || c == 0x2D // -
                  || c == 0x2E // .
                  || c == 0x5F // _
---- qt4-x11-4.3.2.orig/src/corelib/tools/qlocale.cpp
-+++ qt4-x11-4.3.2/src/corelib/tools/qlocale.cpp
+--- a/src/corelib/tools/qlocale.cpp
++++ b/src/corelib/tools/qlocale.cpp
 @@ -2609,8 +2609,8 @@
  
          QChar c1 = format.at(i);
@@ -92,8 +92,8 @@
              return true;
  
          ++i;
---- qt4-x11-4.3.2.orig/src/gui/kernel/qapplication.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qapplication.cpp
+--- a/src/gui/kernel/qapplication.cpp
++++ b/src/gui/kernel/qapplication.cpp
 @@ -2036,11 +2036,11 @@
  #ifndef QT_NO_TRANSLATION
  static bool qt_detectRTLLanguage()
@@ -108,8 +108,8 @@
  }
  #endif
  
---- qt4-x11-4.3.2.orig/src/gui/kernel/qkeymapper_x11.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qkeymapper_x11.cpp
+--- a/src/gui/kernel/qkeymapper_x11.cpp
++++ b/src/gui/kernel/qkeymapper_x11.cpp
 @@ -1330,8 +1330,8 @@
          }
  
@@ -121,8 +121,8 @@
                  directionKeyEvent = Qt::Key_Direction_L;
              } else if (keysym == XK_Shift_R && directionKeyEvent == XK_Control_R ||
                         keysym == XK_Control_R && directionKeyEvent == XK_Shift_R) {
---- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qwidget.cpp
+--- a/src/gui/kernel/qwidget.cpp
++++ b/src/gui/kernel/qwidget.cpp
 @@ -1872,7 +1872,7 @@
  
              for (int i = 0; i < pd->children.size(); ++i) {
@@ -140,8 +140,8 @@
              }
          } else {
              q->create();
---- qt4-x11-4.3.2.orig/src/gui/painting/qregion_unix.cpp
-+++ qt4-x11-4.3.2/src/gui/painting/qregion_unix.cpp
+--- a/src/gui/painting/qregion_unix.cpp
++++ b/src/gui/painting/qregion_unix.cpp
 @@ -1944,7 +1944,7 @@
          else
              --isInside;
@@ -151,8 +151,8 @@
              pWETE->nextWETE = AET;
              pWETE = AET;
              inside = !inside;
---- qt4-x11-4.3.2.orig/src/tools/uic/driver.cpp
-+++ qt4-x11-4.3.2/src/tools/uic/driver.cpp
+--- a/src/tools/uic/driver.cpp
++++ b/src/tools/uic/driver.cpp
 @@ -175,7 +175,7 @@
  
  static bool isAnsiCCharacter(const QChar& c)

Modified: trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -7,8 +7,8 @@
 in big user environments, getgrgid_r() needs more memory than sysconf() returns.
 Try a bit harder.
 
---- qt4-x11-4.3.2.orig/src/corelib/io/qfsfileengine_unix.cpp
-+++ qt4-x11-4.3.2/src/corelib/io/qfsfileengine_unix.cpp
+--- a/src/corelib/io/qfsfileengine_unix.cpp
++++ b/src/corelib/io/qfsfileengine_unix.cpp
 @@ -845,9 +845,16 @@
      } else if (own == OwnerGroup) {
          struct group *gr = 0;

Modified: trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -6,8 +6,8 @@
 
 fix s390(x) build
 
---- qt4-x11-4.3.2.orig/src/corelib/arch/qatomic_s390.h
-+++ qt4-x11-4.3.2/src/corelib/arch/qatomic_s390.h
+--- a/src/corelib/arch/qatomic_s390.h
++++ b/src/corelib/arch/qatomic_s390.h
 @@ -197,10 +197,20 @@
  #endif
  }

Modified: trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -6,8 +6,8 @@
 
 fix various obvious memory leaks etc
 
---- qt4-x11-4.3.2.orig/src/gui/painting/qimagescale.cpp
-+++ qt4-x11-4.3.2/src/gui/painting/qimagescale.cpp
+--- a/src/gui/painting/qimagescale.cpp
++++ b/src/gui/painting/qimagescale.cpp
 @@ -1020,6 +1020,7 @@
      buffer = QImage(dw, dh, src.format());
      if (buffer.isNull()) {
@@ -16,8 +16,8 @@
          return QImage();
      }
  
---- qt4-x11-4.3.2.orig/src/svg/qsvghandler.cpp
-+++ qt4-x11-4.3.2/src/svg/qsvghandler.cpp
+--- a/src/svg/qsvghandler.cpp
++++ b/src/svg/qsvghandler.cpp
 @@ -1144,15 +1144,9 @@
          if (!size.isEmpty()) {
              QSvgHandler::LengthType type;

Modified: trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -6,8 +6,8 @@
 
 This patch adds Qt support for new window types used for compositing.
 
---- qt4-x11-4.3.2.orig/src/gui/kernel/qapplication_x11.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qapplication_x11.cpp
+--- a/src/gui/kernel/qapplication_x11.cpp
++++ b/src/gui/kernel/qapplication_x11.cpp
 @@ -214,6 +214,11 @@
      "_NET_WM_WINDOW_TYPE_SPLASH\0"
      "_NET_WM_WINDOW_TYPE_TOOLBAR\0"
@@ -20,8 +20,8 @@
  
      "_KDE_NET_WM_FRAME_STRUT\0"
  
---- qt4-x11-4.3.2.orig/src/gui/kernel/qdnd_x11.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qdnd_x11.cpp
+--- a/src/gui/kernel/qdnd_x11.cpp
++++ b/src/gui/kernel/qdnd_x11.cpp
 @@ -270,6 +270,7 @@
          QWidget(QApplication::desktop()->screen(screen),
                  Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
@@ -46,8 +46,8 @@
  
      willDrop = false;
  
---- qt4-x11-4.3.2.orig/src/gui/kernel/qt_x11_p.h
-+++ qt4-x11-4.3.2/src/gui/kernel/qt_x11_p.h
+--- a/src/gui/kernel/qt_x11_p.h
++++ b/src/gui/kernel/qt_x11_p.h
 @@ -530,6 +530,11 @@
          _NET_WM_WINDOW_TYPE_SPLASH,
          _NET_WM_WINDOW_TYPE_TOOLBAR,
@@ -60,8 +60,8 @@
  
          _KDE_NET_WM_FRAME_STRUT,
  
---- qt4-x11-4.3.2.orig/src/gui/kernel/qtooltip.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qtooltip.cpp
+--- a/src/gui/kernel/qtooltip.cpp
++++ b/src/gui/kernel/qtooltip.cpp
 @@ -149,6 +149,9 @@
      setMouseTracking(true);
      fadingOut = false;
@@ -94,8 +94,8 @@
          QTipLabel::instance->setTipRect(w, rect);
          QTipLabel::instance->placeTip(pos, w);
          QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label"));
---- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget.h
-+++ qt4-x11-4.3.2/src/gui/kernel/qwidget.h
+--- a/src/gui/kernel/qwidget.h
++++ b/src/gui/kernel/qwidget.h
 @@ -354,6 +354,19 @@
  
      void setWindowOpacity(qreal level);
@@ -116,8 +116,8 @@
  
      bool isWindowModified() const;
  #ifndef QT_NO_TOOLTIP
---- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_x11.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qwidget_x11.cpp
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
 @@ -562,10 +562,6 @@
      }
  #endif // QT_NO_XRENDER
@@ -255,8 +255,8 @@
  /*!
      Frees up window system resources. Destroys the widget window if \a
      destroyWindow is true.
---- qt4-x11-4.3.2.orig/src/gui/widgets/qcombobox.cpp
-+++ qt4-x11-4.3.2/src/gui/widgets/qcombobox.cpp
+--- a/src/gui/widgets/qcombobox.cpp
++++ b/src/gui/widgets/qcombobox.cpp
 @@ -333,6 +333,10 @@
              combo->update();
          }
@@ -268,8 +268,8 @@
  }
  
  void QComboBoxPrivateContainer::leaveEvent(QEvent *)
---- qt4-x11-4.3.2.orig/src/gui/widgets/qmenu.cpp
-+++ qt4-x11-4.3.2/src/gui/widgets/qmenu.cpp
+--- a/src/gui/widgets/qmenu.cpp
++++ b/src/gui/widgets/qmenu.cpp
 @@ -99,6 +99,9 @@
      QTornOffMenu(QMenu *p) : QMenu(*(new QTornOffMenuPrivate(p)))
      {

Modified: trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -8,8 +8,8 @@
 work with some window types (needed basically by the #0178 qt-copy patch).
 It is not a proper solution, waiting for TT to come up with something.
 
---- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_x11.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qwidget_x11.cpp
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
 @@ -1650,7 +1650,7 @@
          do_size_hints(q, extra);
  

Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -34,8 +34,8 @@
 QObjectPrivate already has a virtual dtor I think adding another virtual for 
 handling the QWidget-related functionality from QtCore is fine.
 
---- qt4-x11-4.3.2.orig/src/corelib/kernel/qobject.cpp
-+++ qt4-x11-4.3.2/src/corelib/kernel/qobject.cpp
+--- a/src/corelib/kernel/qobject.cpp
++++ b/src/corelib/kernel/qobject.cpp
 @@ -1008,9 +1008,18 @@
  {
      Q_D(QObject);
@@ -55,8 +55,8 @@
  #ifdef QT3_SUPPORT
  /*! \internal
      QObject::child is compat but needs to call itself recursively,
---- qt4-x11-4.3.2.orig/src/corelib/kernel/qobject_p.h
-+++ qt4-x11-4.3.2/src/corelib/kernel/qobject_p.h
+--- a/src/corelib/kernel/qobject_p.h
++++ b/src/corelib/kernel/qobject_p.h
 @@ -139,6 +139,9 @@
      mutable quint32 connectedSignals;
  
@@ -67,8 +67,8 @@
  };
  
  class QSemaphore;
---- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_p.h
-+++ qt4-x11-4.3.2/src/gui/kernel/qwidget_p.h
+--- a/src/gui/kernel/qwidget_p.h
++++ b/src/gui/kernel/qwidget_p.h
 @@ -309,6 +309,7 @@
  
  #if defined(Q_WS_X11)
@@ -77,8 +77,8 @@
      void sendStartupMessage(const char *message) const;
  #endif
  
---- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_x11.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qwidget_x11.cpp
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
 @@ -671,11 +671,8 @@
          // when we create a toplevel widget, the frame strut should be dirty
          data.fstrut_dirty = 1;

Modified: trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -8,8 +8,8 @@
 None of them seem to be exceptionally bad, but its better safe
 than sorry.
 
---- qt4-x11-4.3.2.orig/src/corelib/global/qglobal.h
-+++ qt4-x11-4.3.2/src/corelib/global/qglobal.h
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
 @@ -1276,8 +1276,16 @@
  #ifdef QT3_SUPPORT
  Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
@@ -29,8 +29,8 @@
  
  #if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM)
  #define QT_NO_DEBUG_STREAM
---- qt4-x11-4.3.2.orig/src/corelib/tools/qbytearray.h
-+++ qt4-x11-4.3.2/src/corelib/tools/qbytearray.h
+--- a/src/corelib/tools/qbytearray.h
++++ b/src/corelib/tools/qbytearray.h
 @@ -86,8 +86,16 @@
  Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
  
@@ -50,8 +50,8 @@
  
  #ifdef QT3_SUPPORT
  inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
---- qt4-x11-4.3.2.orig/src/gui/painting/qprintengine_pdf_p.h
-+++ qt4-x11-4.3.2/src/gui/painting/qprintengine_pdf_p.h
+--- a/src/gui/painting/qprintengine_pdf_p.h
++++ b/src/gui/painting/qprintengine_pdf_p.h
 @@ -163,7 +163,11 @@
      void writePage();
  
@@ -65,8 +65,8 @@
      inline void write(const QByteArray &data) {
          stream->writeRawData(data.constData(), data.size());
          streampos += data.size();
---- qt4-x11-4.3.2.orig/src/qt3support/tools/q3cstring.h
-+++ qt4-x11-4.3.2/src/qt3support/tools/q3cstring.h
+--- a/src/qt3support/tools/q3cstring.h
++++ b/src/qt3support/tools/q3cstring.h
 @@ -72,7 +72,11 @@
      }
  
@@ -80,8 +80,8 @@
  
      Q3CString        left(uint len)  const { return QByteArray::left(len); }
      Q3CString        right(uint len) const { return QByteArray::right(len); }
---- qt4-x11-4.3.2.orig/tools/linguist/shared/profileevaluator.h
-+++ qt4-x11-4.3.2/tools/linguist/shared/profileevaluator.h
+--- a/tools/linguist/shared/profileevaluator.h
++++ b/tools/linguist/shared/profileevaluator.h
 @@ -103,7 +103,11 @@
  
  private:
@@ -95,8 +95,8 @@
      QString expandVariableReferences(const QString &value);
      QString evaluateExpandFunction(const QByteArray &func, const QString &arguments);
  
---- qt4-x11-4.3.2.orig/tools/qtestlib/src/qtest_global.h
-+++ qt4-x11-4.3.2/tools/qtestlib/src/qtest_global.h
+--- a/tools/qtestlib/src/qtest_global.h
++++ b/tools/qtestlib/src/qtest_global.h
 @@ -74,7 +74,11 @@
      enum SkipMode { SkipSingle = 1, SkipAll = 2 };
      enum TestFailMode { Abort = 1, Continue = 2 };

Modified: trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -15,8 +15,8 @@
 
 This patch should be considered temporary until TT has a better fix.
 
---- qt4-x11-4.3.2.orig/src/gui/text/qfont.cpp
-+++ qt4-x11-4.3.2/src/gui/text/qfont.cpp
+--- a/src/gui/text/qfont.cpp
++++ b/src/gui/text/qfont.cpp
 @@ -2093,7 +2093,6 @@
  {
      QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
@@ -33,8 +33,8 @@
      return engine->fontDef.fixedPitch;
  }
  
---- qt4-x11-4.3.2.orig/src/gui/text/qfont_p.h
-+++ qt4-x11-4.3.2/src/gui/text/qfont_p.h
+--- a/src/gui/text/qfont_p.h
++++ b/src/gui/text/qfont_p.h
 @@ -66,9 +66,7 @@
            styleStrategy(QFont::PreferDefault), styleHint(QFont::AnyStyle),
            weight(50), fixedPitch(false), style(QFont::StyleNormal), stretch(100),

Modified: trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -13,8 +13,8 @@
 Detected by qca2 plugins code that uses QtCrypto/QtCrypto
 Thanks to Thiago to find proper syntax
 
---- qt4-x11-4.3.2.orig/src/tools/moc/preprocessor.cpp
-+++ qt4-x11-4.3.2/src/tools/moc/preprocessor.cpp
+--- a/src/tools/moc/preprocessor.cpp
++++ b/src/tools/moc/preprocessor.cpp
 @@ -768,7 +768,7 @@
              QFileInfo fi;
              if (local)

Modified: trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -9,8 +9,8 @@
 When qcombobox was transform to popupmenu when toolbar with combobox is too small
 we used this slot to update combobox. (now it's updated)
 
---- qt4-x11-4.3.2.orig/src/qt3support/widgets/q3toolbar.cpp
-+++ qt4-x11-4.3.2/src/qt3support/widgets/q3toolbar.cpp
+--- a/src/qt3support/widgets/q3toolbar.cpp
++++ b/src/qt3support/widgets/q3toolbar.cpp
 @@ -667,7 +667,7 @@
                      Q3PopupMenu *cp = new Q3PopupMenu(d->extensionPopup);
                      cp->setEnabled(c->isEnabled());

Modified: trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -9,8 +9,8 @@
 widget is drawn correctly). Please let me know if QListView is not
 the only culprit. (QTreeView was fixed by TT already.)
 
---- qt4-x11-4.3.2.orig/src/gui/itemviews/qlistview.cpp
-+++ qt4-x11-4.3.2/src/gui/itemviews/qlistview.cpp
+--- a/src/gui/itemviews/qlistview.cpp
++++ b/src/gui/itemviews/qlistview.cpp
 @@ -1071,7 +1071,7 @@
                  option.state &= ~QStyle::State_Enabled;
                  cg = QPalette::Disabled;

Modified: trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -7,8 +7,8 @@
 QItemDelegate that resulted in inactive colors being used for widgets
 in active windows.
 
---- qt4-x11-4.3.2.orig/src/gui/itemviews/qitemdelegate.cpp
-+++ qt4-x11-4.3.2/src/gui/itemviews/qitemdelegate.cpp
+--- a/src/gui/itemviews/qitemdelegate.cpp
++++ b/src/gui/itemviews/qitemdelegate.cpp
 @@ -635,10 +635,10 @@
  
      QPen pen = painter->pen();

Modified: trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -7,8 +7,8 @@
 This patch fixes a division by zero that happens on the QTreeView widget
 if the ScrollPerPixel scroll mode is set.
 
---- qt4-x11-4.3.2.orig/src/gui/itemviews/qtreeview.cpp
-+++ qt4-x11-4.3.2/src/gui/itemviews/qtreeview.cpp
+--- a/src/gui/itemviews/qtreeview.cpp
++++ b/src/gui/itemviews/qtreeview.cpp
 @@ -2983,6 +2983,9 @@
      }
      // ScrollMode == ScrollPerPixel

Modified: trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -5,8 +5,8 @@
 
 Allows drag and drop to work without pressing the shift key for itemviews that use InternalMove.
 
---- qt4-x11-4.3.2.orig/src/gui/itemviews/qabstractitemview.cpp
-+++ qt4-x11-4.3.2/src/gui/itemviews/qabstractitemview.cpp
+--- a/src/gui/itemviews/qabstractitemview.cpp
++++ b/src/gui/itemviews/qabstractitemview.cpp
 @@ -2968,7 +2968,7 @@
  
  #ifndef QT_NO_DRAGANDDROP
@@ -25,8 +25,8 @@
              d->clearOrRemove();
      }
  }
---- qt4-x11-4.3.2.orig/src/gui/itemviews/qlistview.cpp
-+++ qt4-x11-4.3.2/src/gui/itemviews/qlistview.cpp
+--- a/src/gui/itemviews/qlistview.cpp
++++ b/src/gui/itemviews/qlistview.cpp
 @@ -992,7 +992,7 @@
                  d->dynamicListView->draggedItems.push_back(*it);
          QDrag *drag = new QDrag(this);

Modified: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -7,8 +7,8 @@
 tooltip, combobox, etc.) also have more window properties like WM_CLASS,
 so they can be used when compositing.
 
---- qt4-x11-4.3.2.orig/src/gui/kernel/qwidget_x11.cpp
-+++ qt4-x11-4.3.2/src/gui/kernel/qwidget_x11.cpp
+--- a/src/gui/kernel/qwidget_x11.cpp
++++ b/src/gui/kernel/qwidget_x11.cpp
 @@ -616,7 +616,11 @@
          wsa.save_under = True;
          XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,

Modified: trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/01_qmake_for_debian.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -3,8 +3,8 @@
 Ensures qmake generates Makefiles that use the -qt4 tools and that use
 recursively link against all indirectly-used libraries.
 
---- qt4-x11-4.3.2.orig/mkspecs/common/linux.conf
-+++ qt4-x11-4.3.2/mkspecs/common/linux.conf
+--- a/mkspecs/common/linux.conf
++++ b/mkspecs/common/linux.conf
 @@ -23,8 +23,8 @@
  QMAKE_LIBS_OPENGL_QT  = -lGL
  QMAKE_LIBS_THREAD     = -lpthread
@@ -16,8 +16,8 @@
  
  QMAKE_AR              = ar cqs
  QMAKE_RANLIB          =
---- qt4-x11-4.3.2.orig/mkspecs/linux-g++/qmake.conf
-+++ qt4-x11-4.3.2/mkspecs/linux-g++/qmake.conf
+--- a/mkspecs/linux-g++/qmake.conf
++++ b/mkspecs/linux-g++/qmake.conf
 @@ -4,8 +4,9 @@
  
  MAKEFILE_GENERATOR	= UNIX

Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -1,7 +1,7 @@
 author: Brian Nelson <pyro at debian.org>
 
---- qt4-x11-4.3.2.orig/tools/assistant/lib/qassistantclient.cpp
-+++ qt4-x11-4.3.2/tools/assistant/lib/qassistantclient.cpp
+--- a/tools/assistant/lib/qassistantclient.cpp
++++ b/tools/assistant/lib/qassistantclient.cpp
 @@ -187,11 +187,11 @@
      : QObject( parent ), host ( QLatin1String("localhost") )
  {

Modified: trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -2,8 +2,8 @@
 
 Ensure the Qt4 version of moc is launched.
 
---- qt4-x11-4.3.2.orig/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
-+++ qt4-x11-4.3.2/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+--- a/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
++++ b/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
 @@ -391,7 +391,7 @@
          else {
              // run moc on this file

Modified: trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -1,7 +1,7 @@
 author: Fathi Boudra <fboudra at free.fr>
 
---- qt4-x11-4.3.2.orig/tools/designer/src/lib/shared/qdesigner_utils.cpp
-+++ qt4-x11-4.3.2/tools/designer/src/lib/shared/qdesigner_utils.cpp
+--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
++++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
 @@ -133,7 +133,7 @@
          binary += QDir::separator();
          switch (mode) {

Modified: trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/05_append_qt4_target.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -1,7 +1,7 @@
 author: Fathi Boudra <fboudra at free.fr>
 
---- qt4-x11-4.3.2.orig/config.tests/unix/compile.test
-+++ qt4-x11-4.3.2/config.tests/unix/compile.test
+--- a/config.tests/unix/compile.test
++++ b/config.tests/unix/compile.test
 @@ -51,7 +51,7 @@
  cd "$OUTDIR/$TEST"
  
@@ -11,8 +11,8 @@
  
  if [ "$VERBOSE" = "yes" ]; then
      make
---- qt4-x11-4.3.2.orig/config.tests/unix/doubleformat.test
-+++ qt4-x11-4.3.2/config.tests/unix/doubleformat.test
+--- a/config.tests/unix/doubleformat.test
++++ b/config.tests/unix/doubleformat.test
 @@ -10,7 +10,7 @@
  
  # build and run a test program
@@ -22,8 +22,8 @@
  cd "$OUTDIR/config.tests/unix/doubleformat"
  
  DOUBLEFORMAT="UNKNOWN"
---- qt4-x11-4.3.2.orig/config.tests/unix/endian.test
-+++ qt4-x11-4.3.2/config.tests/unix/endian.test
+--- a/config.tests/unix/endian.test
++++ b/config.tests/unix/endian.test
 @@ -10,7 +10,7 @@
  
  # build and run a test program
@@ -33,8 +33,8 @@
  cd "$OUTDIR/config.tests/unix/endian"
  
  ENDIAN="UNKNOWN"
---- qt4-x11-4.3.2.orig/config.tests/unix/ptrsize.test
-+++ qt4-x11-4.3.2/config.tests/unix/ptrsize.test
+--- a/config.tests/unix/ptrsize.test
++++ b/config.tests/unix/ptrsize.test
 @@ -10,7 +10,7 @@
  
  # build and run a test program
@@ -44,8 +44,8 @@
  cd "$OUTDIR/config.tests/unix/ptrsize"
  
  if [ "$VERBOSE" = "yes" ]; then
---- qt4-x11-4.3.2.orig/config.tests/x11/notype.test
-+++ qt4-x11-4.3.2/config.tests/x11/notype.test
+--- a/config.tests/x11/notype.test
++++ b/config.tests/x11/notype.test
 @@ -27,7 +27,7 @@
      NOTYPE=yes
  
@@ -55,8 +55,8 @@
      cd "$OUTDIR/config.tests/x11/notype"
  
      if [ "$VERBOSE" = "yes" ]; then
---- qt4-x11-4.3.2.orig/configure
-+++ qt4-x11-4.3.2/configure
+--- a/configure
++++ b/configure
 @@ -3517,7 +3517,7 @@
  }
  
@@ -100,8 +100,8 @@
  	QMAKE_ARGS="$QMAKE_SWITCHES $QMAKE_SPEC_ARGS"
          if [ "$file" = ".projects.3" ]; then
              if echo '\c' | grep '\c' >/dev/null; then
---- qt4-x11-4.3.2.orig/projects.pro
-+++ qt4-x11-4.3.2/projects.pro
+--- a/projects.pro
++++ b/projects.pro
 @@ -118,7 +118,7 @@
  win32 {
     qmake.files=$$QT_BUILD_TREE/bin/qmake.exe
@@ -111,8 +111,8 @@
  }
  INSTALLS += qmake
  
---- qt4-x11-4.3.2.orig/qmake/Makefile.unix
-+++ qt4-x11-4.3.2/qmake/Makefile.unix
+--- a/qmake/Makefile.unix
++++ b/qmake/Makefile.unix
 @@ -90,17 +90,17 @@
  
  CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
@@ -135,8 +135,8 @@
  
  depend:
  	makedepend -D__MAKEDEPEND__ $(CPPFLAGS) $(DEPEND_SRC)
---- qt4-x11-4.3.2.orig/src/tools/moc/moc.pro
-+++ qt4-x11-4.3.2/src/tools/moc/moc.pro
+--- a/src/tools/moc/moc.pro
++++ b/src/tools/moc/moc.pro
 @@ -1,5 +1,5 @@
  TEMPLATE	= app
 -TARGET		= moc
@@ -144,8 +144,8 @@
  
  CONFIG 	       += console qtinc
  CONFIG         -= qt
---- qt4-x11-4.3.2.orig/src/tools/uic/uic.pro
-+++ qt4-x11-4.3.2/src/tools/uic/uic.pro
+--- a/src/tools/uic/uic.pro
++++ b/src/tools/uic/uic.pro
 @@ -9,7 +9,7 @@
  
  unix:!contains(QT_CONFIG, zlib):LIBS        += -lz
@@ -155,8 +155,8 @@
  DESTDIR = ../../../bin
  
  DEFINES	       += QT_BOOTSTRAPPED QT_UIC QT_LITE_UNICODE QT_NO_DATASTREAM \
---- qt4-x11-4.3.2.orig/tools/assistant/assistant.pro
-+++ qt4-x11-4.3.2/tools/assistant/assistant.pro
+--- a/tools/assistant/assistant.pro
++++ b/tools/assistant/assistant.pro
 @@ -2,7 +2,7 @@
  
  TEMPLATE = app
@@ -166,8 +166,8 @@
  
  CONFIG += qt warn_on
  
---- qt4-x11-4.3.2.orig/tools/designer/src/designer/designer.pro
-+++ qt4-x11-4.3.2/tools/designer/src/designer/designer.pro
+--- a/tools/designer/src/designer/designer.pro
++++ b/tools/designer/src/designer/designer.pro
 @@ -25,7 +25,7 @@
      DEFINES += QT_DESIGNER_STATIC
  }
@@ -177,8 +177,8 @@
  
  include($$QT_SOURCE_TREE/tools/shared/fontpanel/fontpanel.pri)
  
---- qt4-x11-4.3.2.orig/tools/linguist/linguist/linguist.pro
-+++ qt4-x11-4.3.2/tools/linguist/linguist/linguist.pro
+--- a/tools/linguist/linguist/linguist.pro
++++ b/tools/linguist/linguist/linguist.pro
 @@ -50,7 +50,7 @@
  DEFINES        += QT_KEYWORDS
  
@@ -188,8 +188,8 @@
  
  win32:RC_FILE        = linguist.rc
  
---- qt4-x11-4.3.2.orig/tools/linguist/lrelease/lrelease.pro
-+++ qt4-x11-4.3.2/tools/linguist/lrelease/lrelease.pro
+--- a/tools/linguist/lrelease/lrelease.pro
++++ b/tools/linguist/lrelease/lrelease.pro
 @@ -29,7 +29,7 @@
  SOURCES += $$PROPARSERPATH/proitems.cpp \
          $$PROPARSERPATH/proreader.cpp
@@ -199,8 +199,8 @@
  INCLUDEPATH     += ../shared
  DESTDIR         = ../../../bin
  
---- qt4-x11-4.3.2.orig/tools/linguist/lupdate/lupdate.pro
-+++ qt4-x11-4.3.2/tools/linguist/lupdate/lupdate.pro
+--- a/tools/linguist/lupdate/lupdate.pro
++++ b/tools/linguist/lupdate/lupdate.pro
 @@ -39,7 +39,7 @@
          $$PROPARSERPATH/proreader.cpp
  
@@ -210,8 +210,8 @@
  INCLUDEPATH     += ../shared
  DESTDIR          = ../../../bin
  
---- qt4-x11-4.3.2.orig/tools/qtconfig/qtconfig.pro
-+++ qt4-x11-4.3.2/tools/qtconfig/qtconfig.pro
+--- a/tools/qtconfig/qtconfig.pro
++++ b/tools/qtconfig/qtconfig.pro
 @@ -16,7 +16,7 @@
  RESOURCES    = qtconfig.qrc
  

Modified: trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/06_qtdemo_destdir.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -2,8 +2,8 @@
 
 Fix qtdemo destdir.
 
---- qt4-x11-4.3.2.orig/demos/arthurplugin/arthurplugin.pro
-+++ qt4-x11-4.3.2/demos/arthurplugin/arthurplugin.pro
+--- a/demos/arthurplugin/arthurplugin.pro
++++ b/demos/arthurplugin/arthurplugin.pro
 @@ -3,7 +3,7 @@
  
  CONFIG      += designer plugin debug_and_release
@@ -13,8 +13,8 @@
  
  contains(QT_CONFIG, opengl) {
  	DEFINES += QT_OPENGL_SUPPORT
---- qt4-x11-4.3.2.orig/demos/qtdemo/qtdemo.pro
-+++ qt4-x11-4.3.2/demos/qtdemo/qtdemo.pro
+--- a/demos/qtdemo/qtdemo.pro
++++ b/demos/qtdemo/qtdemo.pro
 @@ -1,6 +1,6 @@
  CONFIG += assistant x11inc
  TARGET = qtdemo

Modified: trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/20_mips_atomic_ops.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -2,8 +2,8 @@
 
 Fix compilation for Linux MIPS-I code.
 
---- qt4-x11-4.3.2.orig/src/corelib/arch/mips/qatomic32.s
-+++ qt4-x11-4.3.2/src/corelib/arch/mips/qatomic32.s
+--- a/src/corelib/arch/mips/qatomic32.s
++++ b/src/corelib/arch/mips/qatomic32.s
 @@ -6,10 +6,12 @@
  	.globl	q_atomic_test_and_set_int
  	.ent	q_atomic_test_and_set_int

Modified: trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -2,8 +2,8 @@
 
 Fix arm FTBFS.
 
---- qt4-x11-4.3.2.orig/tools/qtestlib/src/qtestcase.h
-+++ qt4-x11-4.3.2/tools/qtestlib/src/qtestcase.h
+--- a/tools/qtestlib/src/qtestcase.h
++++ b/tools/qtestlib/src/qtestcase.h
 @@ -210,7 +210,7 @@
      template <typename T1, typename T2>
      bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);

Modified: trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -2,8 +2,8 @@
 
 Add support for EABI ARM platforms to Qt.
 
---- qt4-x11-4.3.2.orig/src/corelib/global/qglobal.h
-+++ qt4-x11-4.3.2/src/corelib/global/qglobal.h
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
 @@ -331,7 +331,7 @@
  #  if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
  #    define Q_BROKEN_DEBUG_STREAM

Modified: trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -1,5 +1,5 @@
---- qt4-x11-4.3.2.orig/src/corelib/global/qlibraryinfo.cpp
-+++ qt4-x11-4.3.2/src/corelib/global/qlibraryinfo.cpp
+--- a/src/corelib/global/qlibraryinfo.cpp
++++ b/src/corelib/global/qlibraryinfo.cpp
 @@ -69,14 +69,7 @@
  {
  public:
@@ -32,8 +32,8 @@
  QLibrarySettings::QLibrarySettings()
  {
      settings = QLibraryInfoPrivate::findConfiguration();
---- qt4-x11-4.3.2.orig/src/corelib/tools/qhash.h
-+++ qt4-x11-4.3.2/src/corelib/tools/qhash.h
+--- a/src/corelib/tools/qhash.h
++++ b/src/corelib/tools/qhash.h
 @@ -479,7 +479,7 @@
  }
  

Modified: trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/41_disable_opengl_visibility.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -1,7 +1,7 @@
 temporary fix because of alpha, has to be dropped as soon as gcc's bug is fixed.
 
---- qt4-x11-4.3.2.orig/src/opengl/opengl.pro
-+++ qt4-x11-4.3.2/src/opengl/opengl.pro
+--- a/src/opengl/opengl.pro
++++ b/src/opengl/opengl.pro
 @@ -5,6 +5,7 @@
  win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
  solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2

Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -2,8 +2,8 @@
 
 Fixes FTBFS on GNU/kFreeBSD by creating new Q_OS_GLIBC.
 
---- qt4-x11-4.3.2.orig/src/corelib/global/qglobal.h
-+++ qt4-x11-4.3.2/src/corelib/global/qglobal.h
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
 @@ -125,6 +125,12 @@
  #  define Q_OS_RELIANT
  #elif defined(__linux__) || defined(__linux)
@@ -26,8 +26,8 @@
  #elif defined(__DGUX__)
  #  define Q_OS_DGUX
  #elif defined(__QNXNTO__)
---- qt4-x11-4.3.2.orig/src/corelib/plugin/qlibrary.cpp
-+++ qt4-x11-4.3.2/src/corelib/plugin/qlibrary.cpp
+--- a/src/corelib/plugin/qlibrary.cpp
++++ b/src/corelib/plugin/qlibrary.cpp
 @@ -293,11 +293,11 @@
  
  #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
@@ -42,8 +42,8 @@
  
  static long qt_find_pattern(const char *s, ulong s_len,
                               const char *pattern, ulong p_len)
---- qt4-x11-4.3.2.orig/src/corelib/tools/qlocale.cpp
-+++ qt4-x11-4.3.2/src/corelib/tools/qlocale.cpp
+--- a/src/corelib/tools/qlocale.cpp
++++ b/src/corelib/tools/qlocale.cpp
 @@ -63,7 +63,7 @@
  #include <qdebug.h>
  #include <time.h>

Modified: trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -3,8 +3,8 @@
 From Roman Zippel <zippel at linux-m68k.org>: These defines are taken from the
 m68k tree, they should appear like this soon also in the upstream source.
 
---- qt4-x11-4.3.2.orig/src/corelib/io/qfilesystemwatcher_inotify.cpp
-+++ qt4-x11-4.3.2/src/corelib/io/qfilesystemwatcher_inotify.cpp
+--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
++++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
 @@ -103,6 +103,10 @@
  # define __NR_inotify_init      269
  # define __NR_inotify_add_watch 270

Modified: trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/70_hppa_ldcw_fix.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -2,8 +2,8 @@
 
 patch from Ubuntu to properly support hppa.
 
---- qt4-x11-4.3.2.orig/src/corelib/arch/parisc/q_ldcw.s
-+++ qt4-x11-4.3.2/src/corelib/arch/parisc/q_ldcw.s
+--- a/src/corelib/arch/parisc/q_ldcw.s
++++ b/src/corelib/arch/parisc/q_ldcw.s
 @@ -1,17 +1,7 @@
 -	.SPACE $PRIVATE$
 -	.SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31

Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -1,7 +1,7 @@
 author: Brian Nelson <pyro at debian.org>
 
---- qt4-x11-4.3.2.orig/src/corelib/io/qfsfileengine_unix.cpp
-+++ qt4-x11-4.3.2/src/corelib/io/qfsfileengine_unix.cpp
+--- a/src/corelib/io/qfsfileengine_unix.cpp
++++ b/src/corelib/io/qfsfileengine_unix.cpp
 @@ -55,6 +55,10 @@
  # include <private/qcore_mac_p.h>
  #endif

Modified: trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/90_qmake_cxxflags_fpermissive.diff	2007-10-07 05:45:59 UTC (rev 7353)
@@ -1,7 +1,7 @@
 author: Matthias Klose <doko at debian.org>
 
---- qt4-x11-4.3.2.orig/mkspecs/common/g++.conf
-+++ qt4-x11-4.3.2/mkspecs/common/g++.conf
+--- a/mkspecs/common/g++.conf
++++ b/mkspecs/common/g++.conf
 @@ -17,7 +17,7 @@
  QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
  

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/patches/series	2007-10-07 05:45:59 UTC (rev 7353)
@@ -1,5 +1,4 @@
 # qt-copy patches
-07_trust_dpkg-arch_over_uname-m.diff
 0163-fix-gcc43-support.diff
 0167-fix-group-reading.diff
 0175-fix-s390-qatomic.diff
@@ -24,6 +23,7 @@
 04_launch_uic-qt4.diff
 05_append_qt4_target.diff
 06_qtdemo_destdir.diff
+07_trust_dpkg-arch_over_uname-m.diff
 20_mips_atomic_ops.diff
 30_arm_ftbfs_fixes.diff
 31_arm_eabi_fix.diff

Modified: trunk/packages/qt4-x11/debian/rules
===================================================================
--- trunk/packages/qt4-x11/debian/rules	2007-10-06 18:17:43 UTC (rev 7352)
+++ trunk/packages/qt4-x11/debian/rules	2007-10-07 05:45:59 UTC (rev 7353)
@@ -6,6 +6,7 @@
 export CXXFLAGS := -fpermissive
 
 QTVERSION := $(shell ls changes-* | cut -f2 -d '-')
+CURRENTVERSION := $(shell head -1 debian/changelog  | sed 's/[^(]*(\([^)]*\)).*/\1/')
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
@@ -28,8 +29,6 @@
 
 DEB_INSTALL_CHANGELOGS_ALL := changes-$(QTVERSION)
 
-CURRENTVERSION := $(shell head -1 debian/changelog  | sed 's/[^(]*(\([^)]*\)).*/\1/')
-
 DEB_INSTALL_DOCS_ALL := GPL_EXCEPTION_ADDENDUM.TXT
 
 ifeq ($(DEB_HOST_ARCH),arm)
@@ -117,7 +116,7 @@
 
 	rm -rf lib/ plugins/ mkspecs/glibc-g++
 
-	# cleaning up after hppa tests
+	# clean up after hppa tests
 	rm -rf debian/hppa-tmp
 
 	find bin/ config.tests/ qmake/ -exec file {} \; | grep ELF | sed 's/:.*//'  | xargs rm -f
@@ -127,7 +126,8 @@
 	                -o -name Makefile.Debug -print0 \
 	                -o -name Makefile.Release -print0 \
 	                | xargs -0r rm -f
-	#we generate this on build:
+
+	# generate on build
 	rm -f debian/shlibs.local
 
 PKGCONFIGDIR := $(DEB_DESTDIR)/usr/lib/pkgconfig
@@ -183,7 +183,7 @@
 	    debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
         fi
 
-#generating shlibs local files
+# Generate shlibs local files
 $(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%
 	if test -e debian/$(cdbs_curpkg)/DEBIAN/shlibs ; then \
 		sed 's/>=[^)]*/= $(CURRENTVERSION)/' debian/$(cdbs_curpkg)/DEBIAN/shlibs >> debian/shlibs.local ;\

More information about the pkg-kde-commits mailing list