summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorDavid Holm <dholm@gentoo.org>2004-06-08 10:41:17 +0000
committerDavid Holm <dholm@gentoo.org>2004-06-08 10:41:17 +0000
commit936956cd8c782bf78a610ff3f6c4709a1665459d (patch)
tree5a2cfbdb6670dc4d74c754817dfe5f6c0ccb5ed0 /x11-wm
parentinitial commit (diff)
downloadhistorical-936956cd8c782bf78a610ff3f6c4709a1665459d.tar.gz
historical-936956cd8c782bf78a610ff3f6c4709a1665459d.tar.bz2
historical-936956cd8c782bf78a610ff3f6c4709a1665459d.zip
Added patch from ikezoe (bug #52860)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/waimea/ChangeLog7
-rw-r--r--x11-wm/waimea/Manifest5
-rw-r--r--x11-wm/waimea/files/waimea-0.5.0-font.patch11
-rw-r--r--x11-wm/waimea/waimea-0.5.0_pre040506.ebuild3
4 files changed, 22 insertions, 4 deletions
diff --git a/x11-wm/waimea/ChangeLog b/x11-wm/waimea/ChangeLog
index b416eb63fce4..28ad09366a75 100644
--- a/x11-wm/waimea/ChangeLog
+++ b/x11-wm/waimea/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-wm/waimea
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/ChangeLog,v 1.22 2004/06/08 03:03:57 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/ChangeLog,v 1.23 2004/06/08 10:41:17 dholm Exp $
+
+ 08 Jun 2004; David Holm <dholm@gentoo.org> +files/waimea-0.5.0-font.patch,
+ waimea-0.5.0_pre040506.ebuild:
+ Added patch from ikezoe <ikezoe at users dot sourceforge dot jp> that fixes a
+ crash related to localisation (bug #52860).
07 Jun 2004; Jason Wever <weeve@gentoo.org> waimea-0.4.0-r1.ebuild:
Stable on sparc.
diff --git a/x11-wm/waimea/Manifest b/x11-wm/waimea/Manifest
index 36ce0f64f968..3c1b328b4abf 100644
--- a/x11-wm/waimea/Manifest
+++ b/x11-wm/waimea/Manifest
@@ -1,11 +1,12 @@
-MD5 a1220a7760284b8899847c548e069cae ChangeLog 2832
MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
MD5 bce0b05642a198e3a69bd98969b81401 waimea-0.3.5.ebuild 1088
MD5 60db97e2f5ba4586c3cf4636a3ae8596 waimea-0.4.0-r1.ebuild 1221
MD5 49678552b134b779a7a4717c1d0f4ab7 waimea-0.4.0.ebuild 989
-MD5 d267c0d5b3b4e4b668acde394e4a3ccb waimea-0.5.0_pre040506.ebuild 1350
+MD5 be7f4eb7232a1a490db0b21a54677509 ChangeLog 3069
+MD5 d8c471f1969fd4f0ef5a32915794646e waimea-0.5.0_pre040506.ebuild 1388
MD5 99a5f21810e1a4df6ae645f27a60203a files/digest-waimea-0.3.5 64
MD5 6c13fc081ff9fe081d3ac0b171118fd6 files/digest-waimea-0.4.0 65
MD5 5be07af92d4d63686b6950ce357c89f7 files/digest-waimea-0.4.0-r1 135
MD5 0758305291041d80fbe400709b949105 files/digest-waimea-0.5.0_pre040506 71
MD5 82e8f766a7716339198e54c6f799964e files/waimea-0.5.0-64bit-clean.patch 420
+MD5 c6c8d4b24a44c45b680bf1c1190de166 files/waimea-0.5.0-font.patch 489
diff --git a/x11-wm/waimea/files/waimea-0.5.0-font.patch b/x11-wm/waimea/files/waimea-0.5.0-font.patch
new file mode 100644
index 000000000000..10c0df49308d
--- /dev/null
+++ b/x11-wm/waimea/files/waimea-0.5.0-font.patch
@@ -0,0 +1,11 @@
+--- waimea-0.5.0_orig/src/Render.cc 2004-04-29 20:17:41.000000000 +0900
++++ waimea-0.5.0/src/Render.cc 2004-06-08 11:56:54.429595664 +0900
+@@ -1589,7 +1589,7 @@
+ font = cairo_current_font(cr);
+ cairo_font_reference (font);
+ }
+-
++ if (!font) return;
+ calc_length(size, size_u, dwo->ws->hdpi, w, &font_size);
+ calc_length(tab_spacing, tab_spacing_u, dwo->ws->hdpi, w, &tab_space);
+ calc_length(line_spacing, line_spacing_u, dwo->ws->vdpi, h, &line_space);
diff --git a/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild b/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild
index ae2addcaca05..020cb979a193 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 Technologies, Inc.
# 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.5 2004/06/05 19:49:05 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild,v 1.6 2004/06/08 10:41:17 dholm Exp $
inherit eutils 64-bit
@@ -27,6 +27,7 @@ src_unpack() {
unpack ${A}
cd ${S}
64-bit && epatch ${FILESDIR}/${MY_P}-64bit-clean.patch
+ epatch ${FILESDIR}/${MY_P}-font.patch
}
src_compile() {