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

[Brian Nelson]

Author: pyro
Date: 2006-01-07 15:52:49 +0000 (Sat, 07 Jan 2006)
New Revision: 2760

Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/12_mips_atomic_ops.dpatch
Log:
  * debian/patches/12_mips_atomic_ops.dpatch: Updated patch to account for
    2 new functions, q_atomic_test_and_set_acquire_int and
    q_atomic_test_and_set_release_int, that were added in this release.
    This should again fix the build failures on mips.

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-01-07 01:48:58 UTC (rev 2759)
+++ trunk/packages/qt4-x11/debian/changelog	2006-01-07 15:52:49 UTC (rev 2760)
@@ -1,3 +1,12 @@
+qt4-x11 (4.1.0-2) UNRELEASED; urgency=low
+
+  * debian/patches/12_mips_atomic_ops.dpatch: Updated patch to account for
+    2 new functions, q_atomic_test_and_set_acquire_int and
+    q_atomic_test_and_set_release_int, that were added in this release.
+    This should again fix the build failures on mips.
+
+ -- Brian Nelson <pyro at debian.org>  Sat,  7 Jan 2006 10:52:36 -0500
+
 qt4-x11 (4.1.0-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/qt4-x11/debian/patches/12_mips_atomic_ops.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/12_mips_atomic_ops.dpatch	2006-01-07 01:48:58 UTC (rev 2759)
+++ trunk/packages/qt4-x11/debian/patches/12_mips_atomic_ops.dpatch	2006-01-07 15:52:49 UTC (rev 2760)
@@ -5,9 +5,9 @@
 ## DP: Fix compilation for Linux MIPS-I code.
 
 @DPATCH@
-diff -urNad qt4-x11-4.0.1~/src/corelib/arch/mips/qatomic32.s qt4-x11-4.0.1/src/corelib/arch/mips/qatomic32.s
---- qt4-x11-4.0.1~/src/corelib/arch/mips/qatomic32.s	2005-10-25 23:35:53.000000000 -0700
-+++ qt4-x11-4.0.1/src/corelib/arch/mips/qatomic32.s	2005-10-25 23:52:16.000000000 -0700
+diff -urNad qt4-x11-4.1.0~/src/corelib/arch/mips/qatomic32.s qt4-x11-4.1.0/src/corelib/arch/mips/qatomic32.s
+--- qt4-x11-4.1.0~/src/corelib/arch/mips/qatomic32.s	2005-12-16 06:52:19.000000000 -0500
++++ qt4-x11-4.1.0/src/corelib/arch/mips/qatomic32.s	2006-01-07 10:47:37.000000000 -0500
 @@ -6,10 +6,12 @@
  	.globl	q_atomic_test_and_set_int
  	.ent	q_atomic_test_and_set_int
@@ -22,6 +22,32 @@
  	nop
  	jr   $31
 @@ -21,10 +23,12 @@
+ 	.globl	q_atomic_test_and_set_acquire_int
+ 	.ent	q_atomic_test_and_set_acquire_int
+ q_atomic_test_and_set_acquire_int:
++	.set mips2
+ 1:	ll   $8,0($4)
+ 	bne  $8,$5,2f
+ 	move $2,$6
+ 	sc   $2,0($4)
++	.set mips0
+ 	beqz $2,1b
+ 	nop
+ 	jr   $31
+@@ -38,10 +42,12 @@
+ 	.ent	q_atomic_test_and_set_release_int
+ q_atomic_test_and_set_release_int:
+ 	sync
++	.set mips2
+ 1:	ll   $8,0($4)
+ 	bne  $8,$5,2f
+ 	move $2,$6
+ 	sc   $2,0($4)
++	.set mips0
+ 	beqz $2,1b
+ 	nop
+ 	jr   $31
+@@ -53,10 +59,12 @@
  	.globl	q_atomic_test_and_set_ptr
  	.ent	q_atomic_test_and_set_ptr
  q_atomic_test_and_set_ptr: