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

[Brian Nelson]

Author: pyro
Date: 2006-06-05 05:18:47 +0000 (Mon, 05 Jun 2006)
New Revision: 3896

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch
Log:
Reverted the alpha patch update since it didn't work.  Let's just fix
the damn compiler instead.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-06-05 03:10:13 UTC (rev 3895)
+++ trunk/packages/qt4-x11/debian/changelog	2006-06-05 05:18:47 UTC (rev 3896)
@@ -1,11 +1,3 @@
-qt4-x11 (4.1.3-2) UNRELEASED; urgency=high
-
-  * debian/patches/17_alpha_ice.dpatch: updated for the current upstream
-    release to fix another occurrence of the alpha ICE in a different
-    location in the code (Closes: #368883) (first attempt)
-
- -- Brian Nelson <pyro at debian.org>  Sun,  4 Jun 2006 13:55:27 -0700
-
 qt4-x11 (4.1.3-1) unstable; urgency=high
 
   * New upstream release

Modified: trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch	2006-06-05 03:10:13 UTC (rev 3895)
+++ trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch	2006-06-05 05:18:47 UTC (rev 3896)
@@ -6,7 +6,7 @@
 @DPATCH@
 diff -urNad qt4-x11-4.1.3~/src/corelib/global/qlibraryinfo.cpp qt4-x11-4.1.3/src/corelib/global/qlibraryinfo.cpp
 --- qt4-x11-4.1.3~/src/corelib/global/qlibraryinfo.cpp	2006-05-14 03:46:59.000000000 -0700
-+++ qt4-x11-4.1.3/src/corelib/global/qlibraryinfo.cpp	2006-06-04 10:51:07.000000000 -0700
++++ qt4-x11-4.1.3/src/corelib/global/qlibraryinfo.cpp	2006-06-03 11:55:29.000000000 -0700
 @@ -47,14 +47,7 @@
  {
  public:
@@ -39,31 +39,9 @@
  QLibrarySettings::QLibrarySettings()
  {
      settings = QLibraryInfoPrivate::findConfiguration();
-diff -urNad qt4-x11-4.1.3~/src/corelib/thread/qthreadstorage.h qt4-x11-4.1.3/src/corelib/thread/qthreadstorage.h
---- qt4-x11-4.1.3~/src/corelib/thread/qthreadstorage.h	2006-05-14 03:46:59.000000000 -0700
-+++ qt4-x11-4.1.3/src/corelib/thread/qthreadstorage.h	2006-06-04 13:46:52.000000000 -0700
-@@ -109,8 +109,7 @@
- 
-     Q_DISABLE_COPY(QThreadStorage)
- 
--    static inline void deleteData(void *x)
--    { delete reinterpret_cast<T&>(x); }
-+    static inline void deleteData(void *x);
- 
- public:
-     inline QThreadStorage() : d(deleteData) { }
-@@ -128,6 +127,8 @@
-     { qThreadStorage_setLocalData(d, &t); }
- };
- 
-+void QThreadStorage::deleteData(void *x) { delete reinterpret_cast<T&>(x); }
-+
- QT_END_HEADER
- 
- #endif // QT_NO_THREAD
 diff -urNad qt4-x11-4.1.3~/src/corelib/tools/qhash.h qt4-x11-4.1.3/src/corelib/tools/qhash.h
 --- qt4-x11-4.1.3~/src/corelib/tools/qhash.h	2006-05-14 03:46:59.000000000 -0700
-+++ qt4-x11-4.1.3/src/corelib/tools/qhash.h	2006-06-04 10:51:07.000000000 -0700
++++ qt4-x11-4.1.3/src/corelib/tools/qhash.h	2006-06-03 11:55:29.000000000 -0700
 @@ -405,7 +405,7 @@
  }