Add patch to fix segfault. #292365

Package-Manager: portage-2.2.0_alpha134/cvs/Linux x86_64

4 files changed, 100 insertions, 3 deletions

diff --git a/app-dicts/gjiten/ChangeLog b/app-dicts/gjiten/ChangeLog
index 08956eedbc62..aba0eaad270d 100644
--- a/app-dicts/gjiten/ChangeLog
+++ b/app-dicts/gjiten/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-dicts/gjiten
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/ChangeLog,v 1.22 2012/05/03 02:18:36 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/ChangeLog,v 1.23 2012/10/12 23:55:24 naota Exp $
+
+*gjiten-2.6-r2 (12 Oct 2012)
+
+  12 Oct 2012;  <naota@gentoo.org> +files/gjiten-2.6-pref.patch,
+  +gjiten-2.6-r2.ebuild:
+  Add patch to fix segfault. #292365
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> gjiten-2.3.ebuild,
   gjiten-2.6-r1.ebuild:
@@ -86,4 +92,3 @@
 
   04 Jun 2003; Masatomo Nakano <nakano@gentoo.org> gjiten-2.1.ebuild:
   Initial import as unstable
-
diff --git a/app-dicts/gjiten/Manifest b/app-dicts/gjiten/Manifest
index 0bc542d9be5a..88c17f6f2c55 100644
--- a/app-dicts/gjiten/Manifest
+++ b/app-dicts/gjiten/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gjiten-2.6-pref.patch 295 SHA256 31b78d6926209313c0111bf7355a252ec906ed3be2ff9021fb74625cce9f014b SHA512 6725cf64f2455a5894b5fe98ea9f8541b38763dc5cd25464e5142d2118c99647525903e3648ed5f6cd8eca5aa0489fe71577d6d427e79c6ebfe3ef7fa91748e8 WHIRLPOOL 1dd0b09368ffeb00fa41a30a197b499a7123f35b63c7098f1ec9b2dc9748ec6926702aa269e25870805a6eb575d0e24959415b6924cfdeb6868543a04e094503
 DIST gjiten-2.3.tar.gz 526530 SHA256 b3f30cd066869401c8432de4395a78a582d818920c0528a14de10861aabe0534 SHA512 8f2dbc8b3adafbce086f7311b89bafc68538f67562e7392693cdb4b20b2559fb2164629c3aa1ff9d040b21eb64a19ca6fbcbf683c5758f91b41d2b4e2b6f0da1 WHIRLPOOL 47342f2b2351d01e9c962c83466b6fd71e3f189962991854c7dcf2b9e62fbcb0d14a28face9e30c178fa7f035854459b5a3ac5f965611129bb2638e4a3946a06
 DIST gjiten-2.6.tar.gz 564845 SHA256 f6c0cc69e1e59ed8c3a946a1ee3e4a5e2e1deb16890bfc5f67c055adb10a71dd SHA512 ef56ad2fdcbe9c1b2df59dbb0cb4036ab2cf90e0fa290275b5dbfb0cfe66521231da48dc710a2837bd1d4402cf2bfb219b952a85e0a482062eade316c04e0bfa WHIRLPOOL 857a38294bc8860f9e8be2dd856ed111385a911c872d39f9c64e6c3cf953dd6662c043ef4679e5f956e6ddaed16f4fd3d02d0d5fd45ac1d318ef68a802aee9eb
 EBUILD gjiten-2.3.ebuild 1399 SHA256 9f4839d96655b5f1d87cde7e9e9c74f5884a49da5d717de63d7d92ccf403fc5e SHA512 dd19537b3bc281e339074c1d75ada7b5cc931e045018be70eb59b5b3c2bae27cde5055c3e7ab573e42492b4398b6b8d5ada312b684f0b759277109591eb0d078 WHIRLPOOL cbb290b7d3345e3ee09d0a7672a6750cc8e98bdfb782adf217516b2dee0e90c07486a8b0d0e7b4855ea7ed2bce3c43f99511a97f21fb45d6965875144115dd99
 EBUILD gjiten-2.6-r1.ebuild 1552 SHA256 cb75a3722b1ec2d470fb680d9ff82700673e9dd939fd3b576df37922b88e52ac SHA512 b0d6175e6fb1a4cceca88dd5e05b43b7b3821e27419329822675ebe0ab1b6affc514874729e40f5e1dbd803543664c255a7576483f47712a864a7dcd8c3a915a WHIRLPOOL 3480ca87db7f6cf0f57a3b27efd5d4647439b2b7f6d17c7c1424930438b3057afafbc49dfe9247bb5862e171e6a99d930b709d1e6174de5f9be039106561c799
-MISC ChangeLog 2962 SHA256 c5db2dacc0b81f20b7c24d59b1b56758b48f02b9606f6e00678943aecad5906e SHA512 f5426eb9f82d9cb79008493a8774c481bae1db8dd3ab405bf7e35d491f1211ef84bc12f442f526731c6f7462f3dc259b66eeba1844d3a5cef8ea357a7fb57947 WHIRLPOOL 2526b2299a013c1617372b8c6325eaaa067bc34643c835da34ea1421ebe8dca6c4affdd7433c9ff89189e4a926445fbb970f271e8b34d4ca4edba13216a4432b
+EBUILD gjiten-2.6-r2.ebuild 1589 SHA256 dbba82bdd17cf9a5c4143fed2a8dd8a9d88ec074c81f4e4494c535e6525f1a52 SHA512 386bcead1e5c0880c4a4112a8beed8b9288ba7f170675e3d0ead7fb5da8ab7fa62376070fb6445d5e5416b508ff10f625e42ae549fcd2d75558813afa3e04f39 WHIRLPOOL d6ba31ae942dc0030a693e72c4077b66aa9c1c7886c13c771e17099da628b0cffe98b54b9319de6b7f9a08cbd67f0a8c78666af30050cda4f0ec68bb0e5786ee
+MISC ChangeLog 3118 SHA256 151c4f16df2458d1e1096410a5be1a17fd61eb70a9e13b023cac1a6c5bd1e712 SHA512 e23d34731cb92dec8c30e4406a2e1ab7a344c89b0c60488ecdba8fde9ec71d8fca2ed88a9a5ed5a4507b0238ca2f138f90ed57eb694c617a69bdc4adf1ef97a6 WHIRLPOOL d182c073604b9de62ae5a19eb45ea843443cd4d405ac42c9e393205d9018e31fe0b146f392222da1f530014263167d8181d24affd21528a472d12967b1fb848b
 MISC metadata.xml 378 SHA256 6704ee5210709c9bc43d9957f857da009c85a81c3344e33d075a94d26be11fd7 SHA512 a9392361da3e137b48bfc4807b8dcb8a85cf8416ecdf698acba3a215437acf3ed413b1a898608025ef4a843b0d8aa96f42b6a5ce7a029c7731223c10485c8eff WHIRLPOOL 1aa52785ce94bcff5b572f55b5d91f4e195d5f7d0683d8843e329551cfd55cecba166590c631cf1690cd8da646332063e9f65aad08447fa1a08c7402f7b27776
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCAAGBQJQeK30AAoJEDYO1FT4VRUUlBQP/A+g2WcMRTKBiUl20vHoL4qw
+A2EJxk93dExRz/LQw6SJ3lc2WmEI9MNMuk8A5fDMo73IPTT4X76PX3NZ8esI26uU
+BvhS3TNKn8xt3HnE/0lbDncvvRqbCkE7rg5bi2zz12OPfP5E40nOulVzlTn637xT
+howeToo6jWY020Dm2fhZtOklBldF0UsYaaufEQ3ujPJxowPaGS+gMhD6TKPiAVF8
+rr0HvX1p/P+kQNhLWpiWzD2NeyqJytweiQdEstSmxCtUyAD8xsPtugaViT3SvWcJ
+mnOysyLYjAYI+rmwVP81yJ77iIOI6Rrly7ssLsAqJ1k4J6KaRJSjX6Ud7/P5nynJ
+LgpTcZ17fcXOi/FYHyhwBU0rJnRefoam0IFWsN42akYp6rtb9WgtLN7pYYXCgPj8
+iRmxllr47KBTVzWI7Jdh4yNFyHfCWYIVi/gPCt3HHSraQVM+1+2OmMLF9y4NRAR9
+LRpc/XqEmiRMQ6M8f6XcWcqSsY93BzWjxTVYGyuu2t28kyJzVU1jkLpOCNwIIQDF
+yZDTc2UptItzInwjCyG/0ftW2O2xK9cy+vmcLv+6R7fXct6F1xI+0zPZXThtXkmV
+0IbbOZJYzYp8Nw1Xx7cMVqOYhpzhY9SIGzZC4B6jFfA2qpEzgCyN1We5q98wa8ai
+5cBjwNNLqPaLwxC0SwH9
+=nVVX
+-----END PGP SIGNATURE-----
diff --git a/app-dicts/gjiten/files/gjiten-2.6-pref.patch b/app-dicts/gjiten/files/gjiten-2.6-pref.patch
new file mode 100644
index 000000000000..f06d833e87c3
--- /dev/null
+++ b/app-dicts/gjiten/files/gjiten-2.6-pref.patch
@@ -0,0 +1,13 @@
+diff --git a/src/pref.c b/src/pref.c
+index 9c5e07d..6c0e13d 100644
+--- a/src/pref.c
++++ b/src/pref.c
+@@ -271,7 +271,7 @@ static void up_dict(GtkWidget *button) {
+ 			gtk_list_store_swap(GTK_LIST_STORE(model), &iter, &tmpiter);
+ 		}
+ 	}
+-	g_free(treepath);
++	gtk_tree_path_free(treepath);
+ }
+ 
+ 
diff --git a/app-dicts/gjiten/gjiten-2.6-r2.ebuild b/app-dicts/gjiten/gjiten-2.6-r2.ebuild
new file mode 100644
index 000000000000..aefa32251e53
--- /dev/null
+++ b/app-dicts/gjiten/gjiten-2.6-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gjiten/gjiten-2.6-r2.ebuild,v 1.1 2012/10/12 23:55:24 naota Exp $
+
+EAPI=2
+inherit autotools eutils gnome2
+
+DESCRIPTION="A Japanese dictionary program for Gnome"
+HOMEPAGE="http://gjiten.sourceforge.net/"
+SRC_URI="http://gjiten.sourceforge.net/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND=">=gnome-base/libgnome-2.2
+	>=gnome-base/libgnomeui-2.2
+	>=gnome-base/libglade-2"
+DEPEND="${RDEPEND}
+	app-text/rarian
+	dev-util/intltool
+	app-text/xmlto
+	app-text/docbook-xml-dtd:4.1.2
+	virtual/pkgconfig"
+
+DOCS="AUTHORS BUGS ChangeLog NEWS README TODO"
+
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${P}-pref.patch
+	# bug #124631
+	intltoolize --copy --automake --force || die "intltoolize failed"
+	AM_OPTS="--foreign" eautoreconf
+}
+
+pkg_postinst() {
+	elog
+	elog "Dictionary files are necessary in order for"
+	elog "Gjiten to function."
+	elog
+	elog "Download dictionary files from:"
+	elog "http://ftp.cc.monash.edu.au/pub/nihongo/00INDEX.html#dic_fil"
+	elog "You need kanjidic and edict at a minimum.  Dictionary files"
+	elog "must be converted to UTF-8 format - check the Gjiten help"
+	elog "and README files for details."
+	elog
+	elog "A shell script is available from "
+	elog "the Gjiten homepage(${HOMEPAGE}) to"
+	elog "download and convert the dictionary files, but you need"
+	elog "to put the files in /usr/share/gjiten after running the script."
+	elog
+
+	gnome2_pkg_postinst
+}