rev 3850 - trunk/packages/qt4-x11/debian/patches

[Brian Nelson]

Author: pyro
Date: 2006-06-03 18:59:50 +0000 (Sat, 03 Jun 2006)
New Revision: 3850

Modified:
   trunk/packages/qt4-x11/debian/patches/00list
   trunk/packages/qt4-x11/debian/patches/16_hppa_ldcw_fix.dpatch
   trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch
Log:
Cleaned up, fix 17_alpha_ice patch so that it applies properly


Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2006-06-03 18:12:48 UTC (rev 3849)
+++ trunk/packages/qt4-x11/debian/patches/00list	2006-06-03 18:59:50 UTC (rev 3850)
@@ -3,5 +3,5 @@
 12_mips_atomic_ops
 13_arm_ftbfs_fixes
 14_kfreebsd_build_fix
-16_hppa_ldcw_fix.dpatch
-17_alpha_ice.dpatch
+16_hppa_ldcw_fix
+17_alpha_fix

Modified: trunk/packages/qt4-x11/debian/patches/16_hppa_ldcw_fix.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/16_hppa_ldcw_fix.dpatch	2006-06-03 18:12:48 UTC (rev 3849)
+++ trunk/packages/qt4-x11/debian/patches/16_hppa_ldcw_fix.dpatch	2006-06-03 18:59:50 UTC (rev 3850)
@@ -2,7 +2,7 @@
 ## 15_hppa_ldcw.dpatch by  <lamont at bld-4.mmjgroup.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: patch from Ubuntu to properly support hppa
 
 @DPATCH@
 diff -urNad qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s

Modified: trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch	2006-06-03 18:12:48 UTC (rev 3849)
+++ trunk/packages/qt4-x11/debian/patches/17_alpha_ice.dpatch	2006-06-03 18:59:50 UTC (rev 3850)
@@ -4,25 +4,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -u qt4-x11-4.1.2/debian/changelog qt4-x11-4.1.2/debian/changelog
---- qt4-x11-4.1.2/debian/changelog
-+++ qt4-x11-4.1.2/debian/changelog
-@@ -1,3 +1,11 @@
-+qt4-x11 (4.1.2-2.1) unstable; urgency=low
-+
-+  * Non-maintainer upload.
-+  * Workaround for -fvisibility-inlines-hidden on alpha: break out the
-+    static methods so they're not inlined.  Closes: #368883.
-+
-+ -- Steve Langasek <vorlon at debian.org>  Tue, 30 May 2006 19:56:44 -0700
-+
- qt4-x11 (4.1.2-2) unstable; urgency=low
- 
-   * debian/libqt4-debug-dev.install, debian/libqt4-dev.install: added
-only in patch2:
-unchanged:
---- qt4-x11-4.1.2.orig/src/corelib/global/qlibraryinfo.cpp
-+++ qt4-x11-4.1.2/src/corelib/global/qlibraryinfo.cpp
+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-03 11:55:29.000000000 -0700
 @@ -47,14 +47,7 @@
  {
  public:
@@ -38,8 +22,8 @@
 +    static void cleanup();
      static QSettings *configuration()
      {
-         QLibrarySettings *ls = qt_library_settings();
-@@ -64,6 +57,15 @@
+ #ifdef QT_NO_THREAD
+@@ -75,6 +68,15 @@
      Q_GLOBAL_STATIC(QLibrarySettings, qt_library_settings)
  };
  
@@ -55,11 +39,10 @@
  QLibrarySettings::QLibrarySettings()
  {
      settings = QLibraryInfoPrivate::findConfiguration();
-only in patch2:
-unchanged:
---- qt4-x11-4.1.2.orig/src/corelib/tools/qhash.h
-+++ qt4-x11-4.1.2/src/corelib/tools/qhash.h
-@@ -396,7 +396,7 @@
+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-03 11:55:29.000000000 -0700
+@@ -405,7 +405,7 @@
  }
  
  template <class Key, class T>