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

Brian Nelson pyro at costa.debian.org
Wed Oct 26 07:12:16 UTC 2005


Author: pyro
Date: 2005-10-26 07:12:13 +0000 (Wed, 26 Oct 2005)
New Revision: 2122

Added:
   trunk/packages/qt4-x11/debian/patches/12_mips_atomic_ops.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/00list
Log:
  * Added a patch from Thiemo Seufer to fix the FTBFS on mips/mipsel
    (Closes: #335831)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2005-10-25 22:17:25 UTC (rev 2121)
+++ trunk/packages/qt4-x11/debian/changelog	2005-10-26 07:12:13 UTC (rev 2122)
@@ -2,8 +2,11 @@
 
   * debian/control: changed qt4-designer's section to "devel"
 
- -- Brian Nelson <pyro at debian.org>  Fri, 21 Oct 2005 09:23:20 -0700
+  * Added a patch from Thiemo Seufer to fix the FTBFS on mips/mipsel
+    (Closes: #335831)
 
+ -- Brian Nelson <pyro at debian.org>  Tue, 25 Oct 2005 23:12:41 -0700
+
 qt4-x11 (4.0.1-3) unstable; urgency=low
 
   * debian/libqt4-core.install: only install the non-debug codecs, since

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2005-10-25 22:17:25 UTC (rev 2121)
+++ trunk/packages/qt4-x11/debian/patches/00list	2005-10-26 07:12:13 UTC (rev 2122)
@@ -1,2 +1,3 @@
 10_qmake_use_qt4_tools
 11_launch_assistant-qt4
+12_mips_atomic_ops

Added: trunk/packages/qt4-x11/debian/patches/12_mips_atomic_ops.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/12_mips_atomic_ops.dpatch	2005-10-25 22:17:25 UTC (rev 2121)
+++ trunk/packages/qt4-x11/debian/patches/12_mips_atomic_ops.dpatch	2005-10-26 07:12:13 UTC (rev 2122)
@@ -0,0 +1,36 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12_mips_atomic_ops.dpatch by Thiemo Seufer <ths at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix compilation for Linux MIPS-I code.
+
+ at 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
+@@ -6,10 +6,12 @@
+ 	.globl	q_atomic_test_and_set_int
+ 	.ent	q_atomic_test_and_set_int
+ q_atomic_test_and_set_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
+@@ -21,10 +23,12 @@
+ 	.globl	q_atomic_test_and_set_ptr
+ 	.ent	q_atomic_test_and_set_ptr
+ q_atomic_test_and_set_ptr:
++	.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




More information about the pkg-kde-commits mailing list