[Pkg-kde-commits] rev 1722 - trunk/packages/qt-x11-free/debian/patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-09-06 20:18:33 +0000 (Tue, 06 Sep 2005)
New Revision: 1722

Modified:
   trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
Log:
Fix this patch, as in people/chrsmrtn, not to clobber symlinks.


Modified: trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch	2005-09-06 20:18:05 UTC (rev 1721)
+++ trunk/packages/qt-x11-free/debian/patches/15_unify_declarations_glibc.dpatch	2005-09-06 20:18:33 UTC (rev 1722)
@@ -70,27 +70,6 @@
  #elif defined(__DGUX__)
  #  define Q_OS_DGUX
  #elif defined(__QNXNTO__)
-diff -ur qt-x11-free-3.2.3.old/include/qglobal.h qt-x11-free-3.2.3/include/qglobal.h
---- qt-x11-free-3.2.3.old/include/qglobal.h	2003-11-10 11:21:38.000000000 +0100
-+++ qt-x11-free-3.2.3/include/qglobal.h	2004-08-05 00:40:23.000000000 +0200
-@@ -112,7 +112,7 @@
- #  define Q_OS_ULTRIX
- #elif defined(sinix)
- #  define Q_OS_RELIANT
--#elif defined(__linux__) || defined(__linux)
-+#elif defined(__linux__) || defined(__linux) || defined(__GNU__) || defined(__GLIBC__)
- #  define Q_OS_LINUX
- #elif defined(__FreeBSD__)
- #  define Q_OS_FREEBSD
-@@ -134,8 +134,6 @@
- #  define Q_OS_AIX
- #elif defined(__Lynx__)
- #  define Q_OS_LYNX
--#elif defined(__GNU_HURD__)
--#  define Q_OS_HURD
- #elif defined(__DGUX__)
- #  define Q_OS_DGUX
- #elif defined(__QNXNTO__)
 diff -ur qt-x11-free-3.2.3.old/src/tools/qglobal.h qt-x11-free-3.2.3/src/tools/qglobal.h
 --- qt-x11-free-3.2.3.old/src/tools/qglobal.h	2003-11-10 11:21:38.000000000 +0100
 +++ qt-x11-free-3.2.3/src/tools/qglobal.h	2004-08-05 00:40:23.000000000 +0200