summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2005-04-24 23:41:19 +0000
committerMartin Schlemmer <azarah@gentoo.org>2005-04-24 23:41:19 +0000
commitd99ba0a43863593e3d8b78df45886397e1a01e3e (patch)
tree1d3f07de864fa8fcf9d07bddf3be6278a6d4bc3d /x11-libs/libxklavier
parentcleaning (diff)
downloadgentoo-2-d99ba0a43863593e3d8b78df45886397e1a01e3e.tar.gz
gentoo-2-d99ba0a43863593e3d8b78df45886397e1a01e3e.tar.bz2
gentoo-2-d99ba0a43863593e3d8b78df45886397e1a01e3e.zip
Do not error on warnings (for gcc4 support). Patch from Fedora.
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'x11-libs/libxklavier')
-rw-r--r--x11-libs/libxklavier/ChangeLog6
-rw-r--r--x11-libs/libxklavier/files/libxklavier-1.14-werror.patch22
-rw-r--r--x11-libs/libxklavier/libxklavier-2.0.ebuild5
3 files changed, 30 insertions, 3 deletions
diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index fbf74ed7ae0e..3632597f2c55 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-libs/libxklavier
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.37 2005/04/09 13:34:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.38 2005/04/24 23:41:19 azarah Exp $
+
+ 24 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+ +files/libxklavier-1.14-werror.patch, libxklavier-2.0.ebuild:
+ Do not error on warnings (for gcc4 support). Patch from Fedora.
09 Apr 2005; Markus Rothe <corsair@gentoo.org> libxklavier-1.04-r1.ebuild:
Stable on ppc64
diff --git a/x11-libs/libxklavier/files/libxklavier-1.14-werror.patch b/x11-libs/libxklavier/files/libxklavier-1.14-werror.patch
new file mode 100644
index 000000000000..0a575adf0ac2
--- /dev/null
+++ b/x11-libs/libxklavier/files/libxklavier-1.14-werror.patch
@@ -0,0 +1,22 @@
+--- libxklavier-1.14/libxklavier/Makefile.am.werror 2005-02-01 11:24:34.684925000 -0500
++++ libxklavier-1.14/libxklavier/Makefile.am 2005-02-01 11:24:44.044556000 -0500
+@@ -14,7 +14,7 @@
+ ENABLE_XMM_SUPPORT_CFLAG = -DDISABLE_XMM_SUPPORT=1
+ endif
+
+-AM_CFLAGS=-Wall -Werror -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
++AM_CFLAGS=-Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+ -I. -I$(includedir) $(XML_CFLAGS) -I$(x_includes) -I$(top_srcdir) \
+ $(XKB_HEADERS_PRESENT_CFLAG) \
+ $(ENABLE_XKB_SUPPORT_CFLAG) \
+--- libxklavier-1.14/libxklavier/Makefile.in.werror 2005-02-01 11:25:24.981578000 -0500
++++ libxklavier-1.14/libxklavier/Makefile.in 2005-02-01 11:25:35.528023000 -0500
+@@ -205,7 +205,7 @@
+ @ENABLE_XKB_SUPPORT_TRUE@ENABLE_XKB_SUPPORT_CFLAG = -DENABLE_XKB_SUPPORT=1
+ @ENABLE_XMM_SUPPORT_FALSE@ENABLE_XMM_SUPPORT_CFLAG = -DDISABLE_XMM_SUPPORT=1
+ @ENABLE_XMM_SUPPORT_TRUE@ENABLE_XMM_SUPPORT_CFLAG = -DENABLE_XMM_SUPPORT=1
+-AM_CFLAGS = -Wall -Werror -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
++AM_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+ -I. -I$(includedir) $(XML_CFLAGS) -I$(x_includes) -I$(top_srcdir) \
+ $(XKB_HEADERS_PRESENT_CFLAG) \
+ $(ENABLE_XKB_SUPPORT_CFLAG) \
diff --git a/x11-libs/libxklavier/libxklavier-2.0.ebuild b/x11-libs/libxklavier/libxklavier-2.0.ebuild
index 5ddf4449845a..56d3f91d6e26 100644
--- a/x11-libs/libxklavier/libxklavier-2.0.ebuild
+++ b/x11-libs/libxklavier/libxklavier-2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.0.ebuild,v 1.3 2005/03/11 20:24:45 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.0.ebuild,v 1.4 2005/04/24 23:41:19 azarah Exp $
inherit eutils
@@ -25,7 +25,8 @@ src_unpack() {
unpack ${A}
cd ${S}
-
+ # Do not error on warnings (for gcc4 support). Patch from Fedora.
+ epatch ${FILESDIR}/libxklavier-1.14-werror.patch
}
src_compile() {