From: Pacho Ramos Date: Fri, 30 Apr 2010 07:39:16 +0000 (+0000) Subject: Fix bug #289348 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=816eeca735cf3154e9058e8c5a829ad99acab48f;p=gentoo.git Fix bug #289348 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog index 1b319da645b1..e8e8624661a3 100644 --- a/gnome-extra/gucharmap/ChangeLog +++ b/gnome-extra/gucharmap/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-extra/gucharmap # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.133 2010/02/24 23:00:04 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.134 2010/04/30 07:39:16 pacho Exp $ + + 30 Apr 2010; Pacho Ramos gucharmap-2.26.3.1.ebuild, + +files/gucharmap-2.26.3.1-en_GB.patch, gucharmap-2.28.2.ebuild: + Fix British English documentation translation (bug #289348 reported by + Markus Meier) with upstream patch. Also thanks to Daniel Schömer for + finding the problem. This is fixed upstream in > 2.30.1 versions. 24 Feb 2010; Gilles Dartiguelongue -gucharmap-2.24.3.ebuild, -gucharmap-2.28.1.ebuild: diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest index bbab4325ae41..a1cafa38175c 100644 --- a/gnome-extra/gucharmap/Manifest +++ b/gnome-extra/gucharmap/Manifest @@ -1,16 +1,17 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX gucharmap-2.26.3.1-en_GB.patch 5432 RMD160 861e46a2acbdf5969abab5d0bc060db0ae9f5532 SHA1 e4dfeb45832a6d23fe40d223d4089ebd9e9e8f21 SHA256 0aad791836091352be441de39cda4394303009ec70ddfa731f4bee8f8e4d575a DIST gucharmap-2.26.3.1.tar.bz2 3059234 RMD160 c63615a6cea8fcccc24ae3df84bb2ee367edbd94 SHA1 ba31edb66224791f183c9e4e1827b6a1216b9d60 SHA256 4dc5406543b93068a9cb9debdd3be96cd28301ce8c8562ba8fcfefca2f1fb2ff DIST gucharmap-2.28.2.tar.bz2 3071897 RMD160 bd8aa698e2b0ae230787c36e3b1d5145b243d784 SHA1 55bf3107b2abec8919c8ef98aadd5574607ad3a4 SHA256 52987a32ee962f9670c8c46a90a7e37d218aeb60e39957ca400fbd5f514d8328 -EBUILD gucharmap-2.26.3.1.ebuild 1100 RMD160 8b83666028a062f8d52e465320eca6e63372d68f SHA1 eb84728dc41e9f1f3d6065264ede8d140cd57aba SHA256 eea7bb461899c90d033569feb4f7f05590cc0c83edfe0a1b72775448f3dbb5c3 -EBUILD gucharmap-2.28.2.ebuild 1216 RMD160 a66d5808b780d3de9b133046a9055667dec434d3 SHA1 1e0d09d946970b9a4375b929f452a9568be8aa49 SHA256 57ec2c3f3b804c1e448d0008536aeeb738f2f11a13bc2f3c803772b4d1137e01 -MISC ChangeLog 16488 RMD160 2ff1ef2ca511cbe43562afdca2e232797c85ece3 SHA1 067f74a3e930a518c955e7c7bb4ca0a8a47d4516 SHA256 fd5764235c0786cc8f0f220e4e373d08639bd4b3736d5592fa70ad3aaae791e6 +EBUILD gucharmap-2.26.3.1.ebuild 1259 RMD160 495e9d7564e00ab37412155753590830b8afb69c SHA1 dbf0f772f6ac5d5a513ee9df581c79cee60a6054 SHA256 fe06f9653ac5337f2cf7420f5d9da688c1bcf95dde638fa2ef7dc4211330f584 +EBUILD gucharmap-2.28.2.ebuild 1374 RMD160 148e7fb9f34ed39eba50073466d4113b08c7452f SHA1 d237d7d12e97c57ba10a6442c3c7639d50119b4b SHA256 4332565128cb155e4c897dfd9b7ab35ea34f6d772d2e119083cf4094e6a7be42 +MISC ChangeLog 16843 RMD160 9f89dbc8203985d3ec796ea45127d1311431989f SHA1 e0c236278e514981da8842f18fb9de5277e98690 SHA256 6df288ca9f877de6377386254707b4eecedbeca9616be33913fb8124771f9f6d MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAkuFr4UACgkQ1fmVwcYIWAannACglo2kdFi5afn1FLfcoKv9ULP/ -Py4An1ebz5XRWicvBysKWKCw8RHXeIrQ -=i6/v +iEYEARECAAYFAkvaiSoACgkQCaWpQKGI+9QsagCfX5w+FTyKQ/qn1rX/znvhDkWW +zo4An1WI0S5prKhE+fB5IFY7Rm3Z9L1h +=V+k4 -----END PGP SIGNATURE----- diff --git a/gnome-extra/gucharmap/files/gucharmap-2.26.3.1-en_GB.patch b/gnome-extra/gucharmap/files/gucharmap-2.26.3.1-en_GB.patch new file mode 100644 index 000000000000..e2de0bcb6452 --- /dev/null +++ b/gnome-extra/gucharmap/files/gucharmap-2.26.3.1-en_GB.patch @@ -0,0 +1,105 @@ +From 0678ea071136813176a0a9f860eb225e436c5951 Mon Sep 17 00:00:00 2001 +From: Philip Withnall +Date: Thu, 29 Apr 2010 23:52:40 +0000 +Subject: Fixed British English documentation translation + +--- +diff --git a/help/en_GB/en_GB.po b/help/en_GB/en_GB.po +index 1043376..7613b63 100644 +--- a/help/en_GB/en_GB.po ++++ b/help/en_GB/en_GB.po +@@ -2,7 +2,7 @@ msgid "" + msgstr "" + "Project-Id-Version: gucharmap\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2009-03-01 17:31+0000\n" ++"POT-Creation-Date: 2010-03-27 20:03+0000\n" + "PO-Revision-Date: 2007-02-17 12:25-0000\n" + "Last-Translator: Philip Withnall \n" + "Language-Team: British English \n" +@@ -514,8 +514,8 @@ msgid "" + "guimenu>Paste, or press shortcut key " + "CtrlV." + msgstr "" +-"Switch to your application and choose EditPasteCtrlV." ++"Switch to your application and choose CtrlV" ++"EditPaste." + + #: C/gucharmap.xml:345(para) + msgid "" +@@ -549,9 +549,8 @@ msgid "" + "menuchoice>, or press shortcut key CtrlF. The Find dialog opens." + msgstr "" +-"Choose SearchFind" +-"CtrlF. The Find dialogue opens." ++"Choose CtrlF" ++"SearchFind. The Find dialogue opens." + + #: C/gucharmap.xml:367(para) + msgid "Enter text to search for in the Search field." +@@ -593,8 +592,8 @@ msgid "" + "CtrlG." + msgstr "" + "Click Next to find the next matching character. " +-"Alternatively, choose SearchFind " +-"NextCtrlG." ++"Alternatively, choose CtrlG" ++"SearchFind Next." + + #: C/gucharmap.xml:387(para) + msgid "" +@@ -605,9 +604,9 @@ msgid "" + "keycap>." + msgstr "" + "Click Previous to find the previous matching " +-"character. Alternatively, choose SearchFind Previous" +-"ShiftCtrlG." ++"character. Alternatively, choose " ++"ShiftCtrlGSearchFind Previous." + + #: C/gucharmap.xml:397(title) + msgid "To Browse Through all Characters" +@@ -852,9 +851,9 @@ msgid "" + "box, or press shortcut key Ctrl+." + msgstr "" +-"To increase the font size, choose ViewZoom InCtrl" +-"+, or use the zoom spin " ++"To increase the font size, choose Ctrl" ++"+ViewZoom In, or use the zoom spin " + "box." + + #: C/gucharmap.xml:590(para) +@@ -864,9 +863,9 @@ msgid "" + "spin box, or press shortcut key Ctrl-." + msgstr "" +-"To decrease the font size, choose ViewZoom OutCtrl" +-"-, or use the zoom " ++"To decrease the font size, choose Ctrl" ++"-ViewZoom Out, or use the zoom " + "spin box." + + #: C/gucharmap.xml:596(para) +@@ -875,8 +874,8 @@ msgid "" + "guimenu>Normal Size, or press " + "shortcut key Ctrl=." + msgstr "" +-"To display normal font size, choose ViewNormal SizeCtrl=." ++"To display normal font size, choose Ctrl=" ++"ViewNormal Size." + + #: C/gucharmap.xml:602(para) + msgid "To magnify the selected character, hold Shift." +-- +cgit v0.8.3.1 diff --git a/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild b/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild index 4935ac70fe07..d7ac3c406343 100644 --- a/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild +++ b/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild,v 1.9 2010/01/18 00:15:35 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.26.3.1.ebuild,v 1.10 2010/04/30 07:39:16 pacho Exp $ -inherit gnome2 +inherit gnome2 eutils DESCRIPTION="Unicode character map viewer" HOMEPAGE="http://gucharmap.sourceforge.net/" @@ -36,3 +36,9 @@ pkg_setup() { $(use_enable cjk unihan) $(use_enable python python-bindings)" } + +src_unpack() { + gnome2_src_unpack + # Fix British English documentation translation (bug #289348) + epatch "${FILESDIR}/${PN}-2.26.3.1-en_GB.patch" +} diff --git a/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild b/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild index 3a74e253dd04..9ea1ae31e48d 100644 --- a/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild +++ b/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild,v 1.1 2009/12/23 23:30:22 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.28.2.ebuild,v 1.2 2010/04/30 07:39:16 pacho Exp $ -inherit gnome2 +inherit gnome2 eutils DESCRIPTION="Unicode character map viewer" HOMEPAGE="http://gucharmap.sourceforge.net/" @@ -41,3 +41,9 @@ src_install() { gnome2_src_install find "${D}" -name "*.la" -delete || die "remove of la files failed" } + +src_unpack() { + gnome2_src_unpack + # Fix British English documentation translation (bug #289348) + epatch "${FILESDIR}/${PN}-2.26.3.1-en_GB.patch" +}