prevent crash from po files, thanks to Peter Gaal

Package-Manager: portage-2.1.4.5

4 files changed, 57 insertions, 7 deletions

diff --git a/app-office/rubrica/ChangeLog b/app-office/rubrica/ChangeLog
index 819d4f09607b..5351f8669320 100644
--- a/app-office/rubrica/ChangeLog
+++ b/app-office/rubrica/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/rubrica
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v 1.6 2008/10/13 23:22:38 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/ChangeLog,v 1.7 2008/10/17 18:39:20 opfer Exp $
+
+*rubrica-2.1.6-r1 (17 Oct 2008)
+
+  17 Oct 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/rubrica-2.1.6_url-crash.patch, -rubrica-2.1.6.ebuild,
+  +rubrica-2.1.6-r1.ebuild:
+  prevent crash from po files, thanks to Peter Gaal
 
   13 Oct 2008; Christian Faulhammer <opfer@gentoo.org> rubrica-2.0.2.ebuild:
   change old ebuild to mirror:// system, too. See bug 218657
diff --git a/app-office/rubrica/Manifest b/app-office/rubrica/Manifest
index 1dfae8d5b88f..2d3e256aaa92 100644
--- a/app-office/rubrica/Manifest
+++ b/app-office/rubrica/Manifest
@@ -4,17 +4,18 @@ Hash: SHA1
 AUX hu.po 44927 RMD160 62d619c6f4c8534447e379af709b6fa57142ebb9 SHA1 8c85dd23049c701c70debd497648c47738d65e5b SHA256 23890ff9f6c37ea3ac4f873141137749626cefc54f2b7cbec49d4e035b2f4387
 AUX rubrica-2.1.6_fix-menu-language.patch 18304 RMD160 18b03ef0b4f55064ddf9791535fee8d6b3b10f79 SHA1 804d608ee6df112ac4e4ddf023b9103a658a3a94 SHA256 1ed1b12c7b830cf81858e211ed0136baa069bf7f2e92c1ef109fc4a40535334a
 AUX rubrica-2.1.6_missing-icons.patch 1412 RMD160 3e5c6735e84d80a503d8711eefc7534ca45dd760 SHA1 6d97288a1d9b087baea0bbc475f914545ee979e3 SHA256 28f76998c4ecba14b344559b9c2156297abd8d2c56a40ac66ff660dc15827d52
+AUX rubrica-2.1.6_url-crash.patch 1464 RMD160 ea2e0569eadf589cdb3438682ed5293d9a2c50de SHA1 d4a9dd488b59e4b2c40828bdd56dafb99b07682f SHA256 abcc60a8b80f45ff1019b35a5ea2f80c7038b1b616622b29105656b044f7cd63
 AUX rubrica2.desktop 749 RMD160 6a1219f0d3d5449c64c5b803bc56e50526d81efc SHA1 1f5f7e45948f7e2a41afc1a92124d0f988f38c26 SHA256 f510a6feff6623c5faef51c8260872b285aa776da4db71ac0c40db48c196d017
 DIST rubrica2-2.0.2.tar.bz2 684277 RMD160 38ee4eed9bae99114840a400d9ce515bcc6ddbdf SHA1 d9a3fd8a22ee9db7d69ea9ca61fb1ee6574eb13b SHA256 546ef3e5828e3f4fabe1e4b7294374e8a580e60824dd02257f6026a3ac36eef2
 DIST rubrica2-2.1.6.tar.bz2 710715 RMD160 fedf6cf5236acf337e7cb9f8bfd2916bb2fad66f SHA1 e117b42c43e8ae5fc3e54babb6994adc913504b5 SHA256 4d9462243af4741e3571c9283f5a29ceb85a19c3dc1192148983c235a212dc9d
 EBUILD rubrica-2.0.2.ebuild 655 RMD160 37ae74de045787b406f37e31e7f6eab397c4c95f SHA1 ab90d1fb7f2de2eaf6fe63f18540c55fd9fd1001 SHA256 e929e6f70841e6786c159a0223e43397bb15ed94b0c43aa18dd33ee510aa49d3
-EBUILD rubrica-2.1.6.ebuild 1279 RMD160 cfc6481594d3309bfc073aaa7c57b16b09c61439 SHA1 2f58cb268526157ee29fc7860d2bdc21f42adbc2 SHA256 5649680d51d29485320bdc1080e5cf81635f1116130a639ee5b63ccf710b8ad7
-MISC ChangeLog 1555 RMD160 4f48d1c3dbec9d2a4083b660b0f4a741221e7b4c SHA1 b1dad817864eb942f76641607398c49fb28f822a SHA256 e98c6d53a541a428d93a4b95bb38268de271e9abcdb8c3b8c5859fb718a0be33
+EBUILD rubrica-2.1.6-r1.ebuild 1339 RMD160 d84897c1da8338c28034c311243f34cd8ecb6a60 SHA1 2d7694e15254cae3c3db7660f98fdecf95382d48 SHA256 50a8d827fc183f9e82bd026f8ff96cfb1b2bcc7b607f301595eda3b48491a3af
+MISC ChangeLog 1787 RMD160 dbf14a0b17748571e52494baa97b4a4dfdddad1c SHA1 1de7452bdc3d5db3d3d32be87c0c6433bde0e700 SHA256 d28ef67533f93075343500a54880b49799f4f92cf96a922d245be861f09ef7df
 MISC metadata.xml 266 RMD160 12c327ae00935b4a56f1753d09cd8c0ae9902d4d SHA1 81ad3646fadcd970cc68c7d0593bc3314376ecab SHA256 9cee5ea0186693fcaee30a00688ce095edf5f21a7a99c8fec9b11ae744cd3fe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjz2E4ACgkQNQqtfCuFneOx1QCghwque2BzVQ1euL7lL0c6Sg1J
-IDoAoJ0y9Y5/KS3WvMBYv+Of+c3BqFOS
-=L9il
+iEYEARECAAYFAkj4298ACgkQNQqtfCuFneOpjwCdFmn2SuI4a7Vy6Hw9neTbZoLX
+yvAAmwRe4bVd1B+gNtOnh/C7UKZQrEeh
+=4nfh
 -----END PGP SIGNATURE-----
diff --git a/app-office/rubrica/files/rubrica-2.1.6_url-crash.patch b/app-office/rubrica/files/rubrica-2.1.6_url-crash.patch
new file mode 100644
index 000000000000..97a20f3260af
--- /dev/null
+++ b/app-office/rubrica/files/rubrica-2.1.6_url-crash.patch
@@ -0,0 +1,40 @@
+--- de.po.orig	2008-10-17 20:08:33.000000000 +0200
++++ de.po	2008-10-17 20:10:55.000000000 +0200
+@@ -4,7 +4,7 @@
+ "Project-Id-Version: Rubrica 2.0rc1\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2008-02-09 00:46+0100\n"
+-"PO-Revision-Date: 2008-09-04 01:51+0200\n"
++"PO-Revision-Date: 2008-10-17 20:10+0200\n"
+ "Last-Translator:  Christian Faulhammer <christian@faulhammer.org>\n"
+ "Language-Team: Italian <tp@lists.linux.it>\n"
+ "MIME-Version: 1.0\n"
+@@ -131,7 +131,7 @@
+ #: ../src/app.c:736 ../src/app.c:738
+ #, c-format
+ msgid "Launching %s. Please wait..."
+-msgstr "Lade %s %s.  Bitte warten..."
++msgstr "Lade %s.  Bitte warten..."
+ 
+ #: ../src/app.c:742 ../rubrica2.desktop.in.h:2
+ msgid "Rubrica Addressbook"
+--- fr.po.orig	2008-10-17 20:08:40.000000000 +0200
++++ fr.po	2008-10-17 20:11:17.000000000 +0200
+@@ -4,7 +4,7 @@
+ "Project-Id-Version: Rubrica 2.0.1\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2008-02-09 00:46+0100\n"
+-"PO-Revision-Date: 2008-09-04 12:32+0200\n"
++"PO-Revision-Date: 2008-10-17 20:11+0200\n"
+ "Last-Translator: Julien LESOUEF <julien.lesouef@free.fr>\n"
+ "Language-Team: French <julien.lesouef@free.fr>\n"
+ "MIME-Version: 1.0\n"
+@@ -131,7 +131,7 @@
+ #: ../src/app.c:736 ../src/app.c:738
+ #, c-format
+ msgid "Launching %s. Please wait..."
+-msgstr "Lance %s %s. Patientez s'il vous plaît..."
++msgstr "Lance %s. Patientez s'il vous plaît..."
+ 
+ #: ../src/app.c:742 ../rubrica2.desktop.in.h:2
+ msgid "Rubrica Addressbook"
diff --git a/app-office/rubrica/rubrica-2.1.6.ebuild b/app-office/rubrica/rubrica-2.1.6-r1.ebuild
index 8183c6cd6cdb..f09514312196 100644
--- a/app-office/rubrica/rubrica-2.1.6.ebuild
+++ b/app-office/rubrica/rubrica-2.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6.ebuild,v 1.1 2008/09/12 21:13:56 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/rubrica/rubrica-2.1.6-r1.ebuild,v 1.1 2008/10/17 18:39:20 opfer Exp $
 
 EAPI=1
 
@@ -37,6 +37,8 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}_fix-menu-language.patch"
 	# Missing gnome icons
 	epatch "${FILESDIR}/${P}_missing-icons.patch"
+	cd "${S}/po"
+	epatch "${FILESDIR}/${P}_url-crash.patch"
 }
 
 src_compile() {