[pkg-kde-commits] rev 2818 - in trunk/packages/qt4-x11/debian: . patches

[Brian Nelson]

Author: pyro
Date: 2006-01-10 17:16:51 +0000 (Tue, 10 Jan 2006)
New Revision: 2818

Added:
   trunk/packages/qt4-x11/debian/patches/15_alpha_ftbfs_fix.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/00list
Log:
  * debian/patches/15_alpha_ftbfs_fix.dpatch: new patch to rename
    q_atomic_test_and_set_release_ptr to q_atomic_test_and_set_ptr, as
    suggested by Isaac Clerencia <isaac at debian.org>, to fix a FTBFS on
    alpha. (Closes: #347353)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-01-10 17:06:00 UTC (rev 2817)
+++ trunk/packages/qt4-x11/debian/changelog	2006-01-10 17:16:51 UTC (rev 2818)
@@ -28,8 +28,13 @@
 
   * Enabled sqlite2 support
 
- -- Brian Nelson <pyro at debian.org>  Mon,  9 Jan 2006 19:37:28 -0800
+  * debian/patches/15_alpha_ftbfs_fix.dpatch: new patch to rename
+    q_atomic_test_and_set_release_ptr to q_atomic_test_and_set_ptr, as
+    suggested by Isaac Clerencia <isaac at debian.org>, to fix a FTBFS on
+    alpha. (Closes: #347353)
 
+ -- Brian Nelson <pyro at debian.org>  Tue, 10 Jan 2006 09:16:28 -0800
+
 qt4-x11 (4.1.0-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2006-01-10 17:06:00 UTC (rev 2817)
+++ trunk/packages/qt4-x11/debian/patches/00list	2006-01-10 17:16:51 UTC (rev 2818)
@@ -3,3 +3,4 @@
 12_mips_atomic_ops
 13_arm_ftbfs_fixes
 14_kfreebsd_build_fix
+15_alpha_ftbfs_fix

Added: trunk/packages/qt4-x11/debian/patches/15_alpha_ftbfs_fix.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/15_alpha_ftbfs_fix.dpatch	2006-01-10 17:06:00 UTC (rev 2817)
+++ trunk/packages/qt4-x11/debian/patches/15_alpha_ftbfs_fix.dpatch	2006-01-10 17:16:51 UTC (rev 2818)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15_alpha_ftbfs_fix.dpatch by Brian Nelson <pyro at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Rename q_atomic_test_and_set_release_ptr to
+## DP: q_atomic_test_and_set_ptr, as suggested by Isaac Clerencia
+## DP: <isaac at debian.org>, to fix a FTBFS on alpha.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.1.0~/src/corelib/arch/alpha/arch/qatomic.h qt4-x11-4.1.0/src/corelib/arch/alpha/arch/qatomic.h
+--- qt4-x11-4.1.0~/src/corelib/arch/alpha/arch/qatomic.h	2005-12-16 03:52:24.000000000 -0800
++++ qt4-x11-4.1.0/src/corelib/arch/alpha/arch/qatomic.h	2006-01-10 09:12:35.000000000 -0800
+@@ -87,7 +87,7 @@
+     return ret;
+ }
+ 
+-inline int q_atomic_test_and_set_release_ptr(volatile void *ptr, void *expected, void *newval)
++inline int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval)
+ {
+     register void *ret;
+     asm volatile("1:\n"


Property changes on: trunk/packages/qt4-x11/debian/patches/15_alpha_ftbfs_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *