r12377 - in packages/trunk/etw/debian: . patches

[Christoph Egger]

Author: christoph
Date: 2011-05-14 22:09:44 +0000 (Sat, 14 May 2011)
New Revision: 12377

Added:
   packages/trunk/etw/debian/patches/300_kfreebsd.diff
Modified:
   packages/trunk/etw/debian/changelog
   packages/trunk/etw/debian/patches/series
Log:
Add patch for GNU/kFreeBSD

Modified: packages/trunk/etw/debian/changelog
===================================================================
--- packages/trunk/etw/debian/changelog	2011-05-14 21:30:58 UTC (rev 12376)
+++ packages/trunk/etw/debian/changelog	2011-05-14 22:09:44 UTC (rev 12377)
@@ -1,3 +1,10 @@
+etw (3.6+svn140-3) unstable; urgency=low
+
+  * Team upload.
+  * Fix build problem on GNU/kFreeBSD
+
+ -- Christoph Egger <christoph at debian.org>  Sun, 15 May 2011 00:09:13 +0200
+
 etw (3.6+svn140-2) unstable; urgency=low
 
   * 100_pthread_linking.diff: fix pthread linking (Closes: #554332).

Added: packages/trunk/etw/debian/patches/300_kfreebsd.diff
===================================================================
--- packages/trunk/etw/debian/patches/300_kfreebsd.diff	                        (rev 0)
+++ packages/trunk/etw/debian/patches/300_kfreebsd.diff	2011-05-14 22:09:44 UTC (rev 12377)
@@ -0,0 +1,58 @@
+--- etw-3.6+svn140.orig/etw/Makefile
++++ etw-3.6+svn140/etw/Makefile
+@@ -4,7 +4,7 @@
+ 
+ all:
+ 	@case $(SYSTEM) in \
+-	  "Linux") \
++	  "Linux"|*kFreeBSD*) \
+ 	    $(MAKE) -f Makefile.linux $@ \
+ 	    ;; \
+ 	  "Darwin") \
+--- etw-3.6+svn140.orig/etw/etw.c
++++ etw-3.6+svn140/etw/etw.c
+@@ -5,7 +5,7 @@
+ #include "highdirent.h"
+ #include "sound.h"
+ 
+-#if defined(LINUX) || defined(SOLARIS_X86)
++#if defined(__GLIBC__) || defined(SOLARIS_X86)
+ #include <gtk/gtk.h>
+ #include <unistd.h>
+ 
+@@ -392,7 +392,7 @@
+ int errno;
+ #endif
+ 
+-#ifdef linux
++#ifdef __GLIBC__
+ #include "prefix.h"
+ #endif
+ 
+@@ -404,7 +404,7 @@
+ 
+     /* LINUX programs aren't relocatable, except with this trick
+      */
+-#if defined(linux)
++#if defined(__GLIBC__)
+     DIR *l;
+ 
+     if ((l = opendir("newgfx"))) {
+@@ -450,7 +450,7 @@
+     
+     InitStrings();
+ 
+-#if defined(LINUX) || defined(SOLARIS_X86)
++#if defined(__GLIBC__) || defined(SOLARIS_X86)
+     gtk_init(&argc, &argv);
+ #endif
+ 
+@@ -465,7 +465,7 @@
+         }
+     } 
+ 
+-#if defined(LINUX) || defined(SOLARIS_X86)
++#if defined(__GLIBC__) || defined(SOLARIS_X86)
+     /* Find data and temporary directories */
+     {
+         struct passwd *pwd;

Modified: packages/trunk/etw/debian/patches/series
===================================================================
--- packages/trunk/etw/debian/patches/series	2011-05-14 21:30:58 UTC (rev 12376)
+++ packages/trunk/etw/debian/patches/series	2011-05-14 22:09:44 UTC (rev 12377)
@@ -1,3 +1,4 @@
 000_upstream_changelog.diff
 100_pthread_linking.diff
 200_datadir.diff
+300_kfreebsd.diff