openbsd-ports/multimedia/kaffeine/patches/patch-kaffeine_src_kaffeine_cpp

$OpenBSD: patch-kaffeine_src_kaffeine_cpp,v 1.3 2007/06/18 23:24:06 jakemsr Exp $
--- kaffeine/src/kaffeine.cpp.orig	Fri Apr 13 10:54:43 2007
+++ kaffeine/src/kaffeine.cpp	Mon Apr 30 00:16:51 2007
@@ -25,6 +25,8 @@
 
 #include "kaffeine.h"
 
+#undef Bool
+#undef Unsorted
 #include <dcopref.h>
 #include <kkeydialog.h>
 #include <kfiledialog.h>
@@ -87,6 +89,7 @@
 
 #define DEFAULT_PLAYER_PART "xine_part"
 
+#include <X11/Xdefs.h>
 #include <X11/Xlib.h>
 
 #ifdef HAVE_DPMS
- patch a silly test that uses OS specific device names, thus allowing kaffeine to play/rip audio CDs - capitalize KDE in COMMENT - remove extra blank lines in Makefile - use AUTOCONF_VERSION=2.60 so autoconf doesn't complain about a different version having previously been used to create configure - add license marker - sync patches w/update-patches - add expat and fontconfig to WANTLIB, as per lib-depends-check - bsd.port.mk(5) names only `simple' as a valid value for SEPARATE_BUILD, so use `simple' instead of `Yes' - bump PKGNAME audio CD patch OK espie@ rest mostly from and OK brad@ 2007-06-18 19:24:06 -04:00			$OpenBSD: patch-kaffeine_src_kaffeine_cpp,v 1.3 2007/06/18 23:24:06 jakemsr Exp $
			`--- kaffeine/src/kaffeine.cpp.orig Fri Apr 13 10:54:43 2007`
			`+++ kaffeine/src/kaffeine.cpp Mon Apr 30 00:16:51 2007`
update to 0.8.3 2006-12-03 20:20:31 -05:00			`@@ -25,6 +25,8 @@`

			`#include "kaffeine.h"`

			`+#undef Bool`
			`+#undef Unsorted`
			`#include <dcopref.h>`
			`#include <kkeydialog.h>`
			`#include <kfiledialog.h>`
- patch a silly test that uses OS specific device names, thus allowing kaffeine to play/rip audio CDs - capitalize KDE in COMMENT - remove extra blank lines in Makefile - use AUTOCONF_VERSION=2.60 so autoconf doesn't complain about a different version having previously been used to create configure - add license marker - sync patches w/update-patches - add expat and fontconfig to WANTLIB, as per lib-depends-check - bsd.port.mk(5) names only `simple' as a valid value for SEPARATE_BUILD, so use `simple' instead of `Yes' - bump PKGNAME audio CD patch OK espie@ rest mostly from and OK brad@ 2007-06-18 19:24:06 -04:00			`@@ -87,6 +89,7 @@`
fix build for xenocara. Bump pkgname, since I'm not 100% this builds exactly the same. 2007-04-07 12:29:15 -04:00
			`#define DEFAULT_PLAYER_PART "xine_part"`

			`+#include <X11/Xdefs.h>`
			`#include <X11/Xlib.h>`

			`#ifdef HAVE_DPMS`