diff options
| author |   Mamoru Komachi <usata@gentoo.org> | 2005-04-06 14:19:42 +0000 |
|---|---|---|
| committer | Mamoru Komachi <usata@gentoo.org> | 2005-04-06 14:19:42 +0000 |
| commit | 9ca12c124f8923afc3d2dc37dc16509353e046db (patch) | |
| tree | 4b9cb8c02b706e13ad95c4a10338708c3ba061e6 /x11-wm/waimea | |
| parent | Revision bump; updated completion function to ignore *~. Keeping keywords. (diff) | |
| download | gentoo-2-9ca12c124f8923afc3d2dc37dc16509353e046db.tar.gz gentoo-2-9ca12c124f8923afc3d2dc37dc16509353e046db.tar.bz2 gentoo-2-9ca12c124f8923afc3d2dc37dc16509353e046db.zip | |
Fixed when compiled with cairo-3. Thanks to Francisco José Cañizares Santofimia <telefrancisco@lycos.es>; bug #80977.
(Portage version: 2.0.51.19)
Diffstat (limited to 'x11-wm/waimea')
| -rw-r--r-- | x11-wm/waimea/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-wm/waimea/files/waimea-0.5.0-includes.patch | 53 | ||||
| -rw-r--r-- | x11-wm/waimea/waimea-0.5.0_pre040506.ebuild | 7 |
3 files changed, 64 insertions, 3 deletions
diff --git a/x11-wm/waimea/ChangeLog b/x11-wm/waimea/ChangeLog index 08c2b8f5fc78..ae69a0dd014d 100644 --- a/x11-wm/waimea/ChangeLog +++ b/x11-wm/waimea/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-wm/waimea # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/ChangeLog,v 1.25 2005/04/06 13:50:41 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/ChangeLog,v 1.26 2005/04/06 14:19:42 usata Exp $ + + 06 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> + +files/waimea-0.5.0-includes.patch, waimea-0.5.0_pre040506.ebuild: + Fixed when compiled with cairo-3. Thanks to Francisco José Cañizares + Santofimia <telefrancisco@lycos.es>; bug #80977. 06 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> waimea-0.4.0-r1.ebuild: Checks if imlib2 is built with X USE flag enabled. This closes bug #86496. diff --git a/x11-wm/waimea/files/waimea-0.5.0-includes.patch b/x11-wm/waimea/files/waimea-0.5.0-includes.patch new file mode 100644 index 000000000000..e547deed9114 --- /dev/null +++ b/x11-wm/waimea/files/waimea-0.5.0-includes.patch @@ -0,0 +1,53 @@ +--- Event.cc.old 2005-03-25 03:47:08.000000000 +0100 ++++ src/Event.cc 2005-03-25 03:39:07.000000000 +0100 +@@ -31,6 +31,8 @@ + #include <cairo-features.h> + #undef CAIRO_HAS_XCB_SURFACE + #include <cairo.h> ++ ++#include <cairo-xlib.h> + + #ifdef SHAPE + # include <X11/extensions/shape.h> +--- Render.cc.old 2005-03-25 03:47:19.000000000 +0100 ++++ src/Render.cc 2005-03-25 03:39:13.000000000 +0100 +@@ -30,6 +30,7 @@ + # include <string.h> + #endif // STDC_HEADERS + ++#include <cairo-xlib.h> + #ifdef HAVE_LIBGEN_H + # include <libgen.h> + #else +--- Screen.cc.old 2005-03-25 03:47:32.000000000 +0100 ++++ src/Screen.cc 2005-03-25 03:39:18.000000000 +0100 +@@ -53,6 +53,8 @@ + #ifdef HAVE_ERRNO_H + # include <errno.h> + #endif // HAVE_ERRNO_H ++ ++#include <cairo-xlib.h> + + } + +--- Style.cc.old 2005-03-25 03:47:47.000000000 +0100 ++++ src/Style.cc 2005-03-25 03:39:23.000000000 +0100 +@@ -26,6 +26,8 @@ + extern "C" { + #include <X11/Xlib.h> + ++#include <cairo-xlib.h> ++ + #ifdef STDC_HEADERS + # include <stdlib.h> + # include <string.h> +--- Waimea.cc.old 2005-03-25 03:46:56.000000000 +0100 ++++ src/Waimea.cc 2005-03-25 03:41:20.000000000 +0100 +@@ -28,6 +28,7 @@ + #include <X11/Xlib.h> + #include <X11/Xutil.h> + #include <X11/Xlocale.h> ++#include <X11/extensions/Xrender.h> + + #include <cairo-features.h> + #undef CAIRO_HAS_XCB_SURFACE diff --git a/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild b/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild index 604d43b67b40..fb3dff9f9feb 100644 --- a/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild +++ b/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild,v 1.7 2004/06/24 23:45:49 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild,v 1.8 2005/04/06 14:19:42 usata Exp $ inherit eutils 64-bit @@ -28,6 +28,9 @@ src_unpack() { cd ${S} 64-bit && epatch ${FILESDIR}/${MY_P}-64bit-clean.patch epatch ${FILESDIR}/${MY_P}-font.patch + if has_version '>=x11-libs/cairo-0.3' ; then + epatch ${FILESDIR}/${MY_P}-includes.patch + fi } src_compile() { |