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

[Brian Nelson]

Author: pyro
Date: 2005-12-13 16:24:06 +0000 (Tue, 13 Dec 2005)
New Revision: 2630

Added:
   trunk/packages/qt4-x11/debian/patches/14_kfreebsd_build_fix.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/00list
Log:
  * debian/patches/14_kfreebsd_build_fix.dpatch: new patch from Petr
    Salinger to fix FTBFS on GNU/kFreeBSD (Closes: #343191)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2005-12-13 13:39:02 UTC (rev 2629)
+++ trunk/packages/qt4-x11/debian/changelog	2005-12-13 16:24:06 UTC (rev 2630)
@@ -3,8 +3,11 @@
   * debian/patches/13_arm_gcc4.dpatch: new patch from Jeremy Laine to fix
     FTBFS on arm (Closes: #343176)
 
- -- Brian Nelson <pyro at debian.org>  Tue, 13 Dec 2005 15:37:40 +0200
+  * debian/patches/14_kfreebsd_build_fix.dpatch: new patch from Petr
+    Salinger to fix FTBFS on GNU/kFreeBSD (Closes: #343191)
 
+ -- Brian Nelson <pyro at debian.org>  Tue, 13 Dec 2005 18:21:07 +0200
+
 qt4-x11 (4.0.1-6) unstable; urgency=low
 
   * Added a target to automatically install lintian overrides, stolen from

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2005-12-13 13:39:02 UTC (rev 2629)
+++ trunk/packages/qt4-x11/debian/patches/00list	2005-12-13 16:24:06 UTC (rev 2630)
@@ -2,3 +2,4 @@
 11_launch_assistant-qt4
 12_mips_atomic_ops
 13_arm_gcc4
+14_kfreebsd_build_fix

Added: trunk/packages/qt4-x11/debian/patches/14_kfreebsd_build_fix.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/14_kfreebsd_build_fix.dpatch	2005-12-13 13:39:02 UTC (rev 2629)
+++ trunk/packages/qt4-x11/debian/patches/14_kfreebsd_build_fix.dpatch	2005-12-13 16:24:06 UTC (rev 2630)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14_kfreebsd_build_fix.dpatch by Brian Nelson <pyro at debian.org> by way
+## of Petr Salinger <Petr.Salinger at t-systems.cz>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes FTBFS on GNU/kFreeBSD
+
+ at DPATCH@
+diff -urNad qt4-x11-4.0.1~/src/corelib/global/qglobal.h qt4-x11-4.0.1/src/corelib/global/qglobal.h
+--- qt4-x11-4.0.1~/src/corelib/global/qglobal.h	2005-08-16 11:41:07.000000000 +0300
++++ qt4-x11-4.0.1/src/corelib/global/qglobal.h	2005-12-13 18:19:47.000000000 +0200
+@@ -100,7 +100,7 @@
+ #  define Q_OS_ULTRIX
+ #elif defined(sinix)
+ #  define Q_OS_RELIANT
+-#elif defined(__linux__) || defined(__linux)
++#elif defined(__linux__) || defined(__linux) || defined(__GLIBC__)
+ #  define Q_OS_LINUX
+ #elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #  define Q_OS_FREEBSD


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