Do not error on warnings (for gcc4 support). Patch from Fedora.

Package-Manager: portage-2.0.51.20-r4

4 files changed, 49 insertions, 11 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/Manifest b/x11-libs/libxklavier/Manifest
index 80ee0eb0f309..f92c8245f6d3 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,16 +1,27 @@
-MD5 71f3ccc569a80608aca93a6ff2c1dc7f ChangeLog 4056
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dc27bb900e2ae46ad6ae658d3da6a2ea ChangeLog 4239
 MD5 5a267a38ce83469d40f7eb2e28de500d libxklavier-1.02.ebuild 941
+MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 11f83de3d100083dec4fa85c3a929f78 libxklavier-1.03.ebuild 949
-MD5 8113cd4dbabec174f47b8767774e5b14 libxklavier-1.04-r1.ebuild 1070
 MD5 ddfe99faedd0be2841fd37eacdc38112 libxklavier-1.04.ebuild 999
-MD5 22f8e44f4a1b8f783a8238cc9c095a1c libxklavier-2.0.ebuild 958
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 8113cd4dbabec174f47b8767774e5b14 libxklavier-1.04-r1.ebuild 1070
+MD5 96a100a385c7bb824e7b547682d22a11 libxklavier-2.0.ebuild 1073
+MD5 554177dc558823391aea91515efb3902 files/sun-keymaps-102.patch 687
+MD5 95f50dc00a9778b6f862c56e0c990b3f files/sun-keymaps.patch 940
 MD5 2ee4cc635af9abc1de963e4d38525430 files/digest-libxklavier-1.02 68
+MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
 MD5 e25e334ceafe0426056d920a3ead52c3 files/digest-libxklavier-1.03 68
 MD5 6b672d420ef40c97961975eb5be760e2 files/digest-libxklavier-1.04 68
 MD5 6b672d420ef40c97961975eb5be760e2 files/digest-libxklavier-1.04-r1 68
-MD5 da5387283d8b989c1809f27825f60310 files/digest-libxklavier-2.0 67
 MD5 31529efcf0188518d362d24a148c74b5 files/libxklavier-1.04-fix_free.patch 301
-MD5 554177dc558823391aea91515efb3902 files/sun-keymaps-102.patch 687
-MD5 95f50dc00a9778b6f862c56e0c990b3f files/sun-keymaps.patch 940
-MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
+MD5 da5387283d8b989c1809f27825f60310 files/digest-libxklavier-2.0 67
+MD5 dd5b95ef05fbd2d67d79ce2053a1f4a2 files/libxklavier-1.14-werror.patch 1189
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCbC+h1ZcsMnZjRyIRArboAJ9rJiTCJUL73WoHZEb+2uSHNL4jMQCdG6y0
+n9cF0auEpcWO/mZq0ByQM5U=
+=1xFm
+-----END PGP SIGNATURE-----
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() {