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

Brian Nelson pyro at costa.debian.org
Mon Jan 16 18:43:48 UTC 2006


Author: pyro
Date: 2006-01-16 18:43:44 +0000 (Mon, 16 Jan 2006)
New Revision: 2906

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: applied fixes from Isaac
    Clerencia <isaac at debian.org>, as the last patch was not good enough to
    fix the FTBFS bug (Closes: #335831)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-01-16 18:34:05 UTC (rev 2905)
+++ trunk/packages/qt4-x11/debian/changelog	2006-01-16 18:43:44 UTC (rev 2906)
@@ -10,8 +10,12 @@
 
   * Added gif support (Closes: #348092)
 
- -- Brian Nelson <pyro at debian.org>  Sat, 14 Jan 2006 12:11:32 -0800
+  * debian/patches/12_mips_atomic_ops.dpatch: applied fixes from Isaac
+    Clerencia <isaac at debian.org>, as the last patch was not good enough to
+    fix the FTBFS bug (Closes: #335831)
 
+ -- Brian Nelson <pyro at debian.org>  Mon, 16 Jan 2006 10:43:26 -0800
+
 qt4-x11 (4.1.0-2) unstable; urgency=low
 
   * debian/patches/12_mips_atomic_ops.dpatch: Updated patch to account for

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-16 18:34:05 UTC (rev 2905)
+++ trunk/packages/qt4-x11/debian/patches/12_mips_atomic_ops.dpatch	2006-01-16 18:43:44 UTC (rev 2906)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 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
+--- qt4-x11-4.1.0~/src/corelib/arch/mips/qatomic32.s	2005-12-16 03:52:19.000000000 -0800
++++ qt4-x11-4.1.0/src/corelib/arch/mips/qatomic32.s	2006-01-16 10:39:45.000000000 -0800
 @@ -6,10 +6,12 @@
  	.globl	q_atomic_test_and_set_int
  	.ent	q_atomic_test_and_set_int
@@ -21,7 +21,7 @@
  	beqz $2,1b
  	nop
  	jr   $31
-@@ -21,10 +23,12 @@
+@@ -21,6 +23,7 @@
  	.globl	q_atomic_test_and_set_acquire_int
  	.ent	q_atomic_test_and_set_acquire_int
  q_atomic_test_and_set_acquire_int:
@@ -29,16 +29,20 @@
  1:	ll   $8,0($4)
  	bne  $8,$5,2f
  	move $2,$6
- 	sc   $2,0($4)
+@@ -30,6 +33,7 @@
+ 	jr   $31
+ 	nop
+ 2:	sync
 +	.set mips0
- 	beqz $2,1b
- 	nop
  	jr   $31
-@@ -38,10 +42,12 @@
+ 	move $2,$0
+ 	.end	q_atomic_test_and_set_acquire_int
+@@ -37,11 +41,13 @@
+ 	.globl	q_atomic_test_and_set_release_int
  	.ent	q_atomic_test_and_set_release_int
  q_atomic_test_and_set_release_int:
++	.set mips2
  	sync
-+	.set mips2
  1:	ll   $8,0($4)
  	bne  $8,$5,2f
  	move $2,$6




More information about the pkg-kde-commits mailing list