add patch

5 files changed, 72 insertions, 2 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 2729efae3b84..e6bf78991b08 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.26 2004/11/11 11:15:14 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.27 2004/11/29 22:17:03 foser Exp $
+
+*libxklavier-1.04-r1 (29 Nov 2004)
+
+  29 Nov 2004; foser <foser@gentoo.org> libxklavier-1.04-r1.ebuild :
+  Add patch to work around freeing a static var (#70633)
+  Thanks to Serge Ivanchenko for the patch
 
   11 Nov 2004; Mike Gardiner <obz@gentoo.org> libxklavier-1.03.ebuild:
   Keyworded ppc for GNOME 2.8
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 9dda120ba2bd..0b16b668acfa 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,11 +1,14 @@
 MD5 f786be419de4c363ed225d154ca47481 libxklavier-1.04.ebuild 999
 MD5 156eea38d1d9d193236bd0ad5382b4fc libxklavier-1.03.ebuild 946
-MD5 ff999683df48dcd9de2965fbf469b6b9 ChangeLog 2824
+MD5 fabe9efe19ff0581026d2595277e261a ChangeLog 3032
 MD5 a2e8157decae3b5185adeac8034185ed libxklavier-1.02.ebuild 941
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 3067d2cae626f2c57e0dec79b783895f libxklavier-1.04-r1.ebuild 1078
+MD5 31529efcf0188518d362d24a148c74b5 files/libxklavier-1.04-fix_free.patch 301
 MD5 95f50dc00a9778b6f862c56e0c990b3f files/sun-keymaps.patch 940
 MD5 10d8c674e282f71c1dd0e11903e86e7d files/sun.xml 4572
 MD5 554177dc558823391aea91515efb3902 files/sun-keymaps-102.patch 687
 MD5 2ee4cc635af9abc1de963e4d38525430 files/digest-libxklavier-1.02 68
 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
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-1.04-r1 b/x11-libs/libxklavier/files/digest-libxklavier-1.04-r1
new file mode 100644
index 000000000000..843fee0e7219
--- /dev/null
+++ b/x11-libs/libxklavier/files/digest-libxklavier-1.04-r1
@@ -0,0 +1 @@
+MD5 322078ad3681465f69a65c0758c74460 libxklavier-1.04.tar.gz 422337
diff --git a/x11-libs/libxklavier/files/libxklavier-1.04-fix_free.patch b/x11-libs/libxklavier/files/libxklavier-1.04-fix_free.patch
new file mode 100644
index 000000000000..1b4d07761858
--- /dev/null
+++ b/x11-libs/libxklavier/files/libxklavier-1.04-fix_free.patch
@@ -0,0 +1,11 @@
+--- libxklavier-1.04/libxklavier/xklavier_config_i18n.c.orig	2004-11-16 15:56:37.472228000 -0500
++++ libxklavier-1.04/libxklavier/xklavier_config_i18n.c	2004-11-16 15:58:02.971230176 -0500
+@@ -148,7 +148,7 @@
+ 
+   iconv_close( converter );
+ 
+-  return converted;
++  return strdup(converted);
+ }
+ 
+ /*
diff --git a/x11-libs/libxklavier/libxklavier-1.04-r1.ebuild b/x11-libs/libxklavier/libxklavier-1.04-r1.ebuild
new file mode 100644
index 000000000000..49fd2417d524
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-1.04-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.04-r1.ebuild,v 1.1 2004/11/29 22:17:03 foser Exp $
+
+inherit eutils
+
+DESCRIPTION="High level XKB library"
+HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
+SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/x11
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	use sparc && epatch "${FILESDIR}/sun-keymaps-102.patch"
+
+	# don't free a static var (#70633)
+	epatch ${FILESDIR}/${P}-fix_free.patch
+
+}
+
+src_compile() {
+
+	econf --with-xkb_base=/usr/X11R6/lib/X11/xkb \
+		$(use_enable doc doxygen) || die
+	emake || die "emake failed"
+
+}
+
+src_install() {
+
+	einstall || die
+	insinto /usr/share/libxklavier
+	use sparc && doins "${FILESDIR}/sun.xml"
+	dodoc AUTHORS CREDITS ChangeLog NEWS README
+
+}