summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichele Noberasco <s4t4n@gentoo.org>2004-08-26 20:33:11 +0000
committerMichele Noberasco <s4t4n@gentoo.org>2004-08-26 20:33:11 +0000
commit8c693aabc0384fffaf737601fbff0a333df92436 (patch)
tree8770b26fad8533d98b0842b637a10ec6db98ddb7 /x11-plugins
parentClosing #61455 (Manifest recommit) (diff)
downloadgentoo-2-8c693aabc0384fffaf737601fbff0a333df92436.tar.gz
gentoo-2-8c693aabc0384fffaf737601fbff0a333df92436.tar.bz2
gentoo-2-8c693aabc0384fffaf737601fbff0a333df92436.zip
Add trivial patch to make x11-plugins/wmsystray-0.1.1 compile with gcc 3.4.1. Closes #61704. Stable for x86...
Diffstat (limited to 'x11-plugins')
-rw-r--r--x11-plugins/wmsystray/ChangeLog5
-rw-r--r--x11-plugins/wmsystray/files/wmsystray-gcc-3.4.patch10
-rw-r--r--x11-plugins/wmsystray/wmsystray-0.1.1.ebuild10
3 files changed, 22 insertions, 3 deletions
diff --git a/x11-plugins/wmsystray/ChangeLog b/x11-plugins/wmsystray/ChangeLog
index 1c694e385de3..d8ef6e523e8f 100644
--- a/x11-plugins/wmsystray/ChangeLog
+++ b/x11-plugins/wmsystray/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-plugins/wmsystray
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/ChangeLog,v 1.2 2004/07/18 00:43:27 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/ChangeLog,v 1.3 2004/08/26 20:33:11 s4t4n Exp $
+
+ 26 Aug 2004; Michele Noberasco <s4t4n@gentoo.org> wmsystray-0.1.1.ebuild:
+ Add patch to fix #61704. Stable for x86...
18 Jul 2004; David Holm <dholm@gentoo.org> wmsystray-0.1.1.ebuild:
Added to ~ppc.
diff --git a/x11-plugins/wmsystray/files/wmsystray-gcc-3.4.patch b/x11-plugins/wmsystray/files/wmsystray-gcc-3.4.patch
new file mode 100644
index 000000000000..538a7ce0aa6a
--- /dev/null
+++ b/x11-plugins/wmsystray/files/wmsystray-gcc-3.4.patch
@@ -0,0 +1,10 @@
+--- wmsystray/ui.c.orig 2004-08-25 11:14:51.265675224 +0000
++++ wmsystray/ui.c 2004-08-25 11:09:56.676459592 +0000
+@@ -28,6 +28,7 @@
+ int width, height, pos_x, pos_y;
+ Pixmap bg_pixmap;
+ char *bg_data;
++void draw_ui_elements();
+
+ int wmaker = 1;
+ int loop_program = 1;
diff --git a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
index 633cadcf8795..8ee0afe6af4f 100644
--- a/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
+++ b/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild,v 1.2 2004/07/18 00:43:27 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmsystray/wmsystray-0.1.1.ebuild,v 1.3 2004/08/26 20:33:11 s4t4n Exp $
inherit eutils
@@ -15,14 +15,20 @@ RDEPEND=""
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
src_unpack() {
unpack ${A}
cd ${S}
+
+ # Let's honour Gentoo CFLAGS
epatch ${FILESDIR}/${PN}-cflags.patch
+ # Fix for #61704, cannot compile with gcc 3.4.1:
+ # it's a trivial change and does not affect other compilers...
+ epatch ${FILESDIR}/${PN}-gcc-3.4.patch
+
}
src_compile() {