rev 4704 - in trunk/packages/qt4-x11/debian: . patches

[Brian Nelson]

Author: pyro
Date: 2006-10-16 21:46:19 +0000 (Mon, 16 Oct 2006)
New Revision: 4704

Added:
   trunk/packages/qt4-x11/debian/patches/19_m68k_inotify_fix.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/00list
Log:
  * debian/patches/19_m68k_inotify_fix.dpatch: new patch to fix FTBFS on
    m68k (Closes: #391902)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-10-16 21:37:59 UTC (rev 4703)
+++ trunk/packages/qt4-x11/debian/changelog	2006-10-16 21:46:19 UTC (rev 4704)
@@ -8,8 +8,11 @@
 
   * Added a bunch of plugins and their debugging symbols to be installed
 
- -- Brian Nelson <pyro at debian.org>  Mon, 16 Oct 2006 17:35:25 -0400
+  * debian/patches/19_m68k_inotify_fix.dpatch: new patch to fix FTBFS on
+    m68k (Closes: #391902)
 
+ -- Brian Nelson <pyro at debian.org>  Mon, 16 Oct 2006 17:40:48 -0400
+
 qt4-x11 (4.2.0-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2006-10-16 21:37:59 UTC (rev 4703)
+++ trunk/packages/qt4-x11/debian/patches/00list	2006-10-16 21:46:19 UTC (rev 4704)
@@ -6,3 +6,4 @@
 16_hppa_ldcw_fix
 17_alpha_ice
 18_disable_opengl_visibility
+19_m68k_inotify_fix

Added: trunk/packages/qt4-x11/debian/patches/19_m68k_inotify_fix.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/19_m68k_inotify_fix.dpatch	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/19_m68k_inotify_fix.dpatch	2006-10-16 21:46:19 UTC (rev 4704)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 19_m68k_inotify_fix.dpatch by Brian Nelson <pyro at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: From Roman Zippel <zippel at linux-m68k.org>: These defines are
+## DP: taken from the m68k tree, they should appear like this soon also
+## DP: in the upstream source.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.2.0~/src/corelib/io/qfilesystemwatcher_inotify.cpp qt4-x11-4.2.0/src/corelib/io/qfilesystemwatcher_inotify.cpp
+--- qt4-x11-4.2.0~/src/corelib/io/qfilesystemwatcher_inotify.cpp	2006-09-29 10:44:58.000000000 -0400
++++ qt4-x11-4.2.0/src/corelib/io/qfilesystemwatcher_inotify.cpp	2006-10-16 17:38:56.000000000 -0400
+@@ -84,6 +84,10 @@
+ # define __NR_inotify_init      284
+ # define __NR_inotify_add_watch 285
+ # define __NR_inotify_rm_watch  286
++#elif defined (__mc68000__)
++# define __NR_inotify_init      284
++# define __NR_inotify_add_watch 285
++# define __NR_inotify_rm_watch  286
+ #else
+ # error "This architecture is not supported. Please talk to qt-bugs at trolltech.com"
+ #endif


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