Fix compilation issue (#149159)

Package-Manager: portage-2.1.2_pre1-r3

7 files changed, 86 insertions, 24 deletions

diff --git a/kde-misc/metabar/ChangeLog b/kde-misc/metabar/ChangeLog
index 7edd9eacb076..ca5a0b6014a1 100644
--- a/kde-misc/metabar/ChangeLog
+++ b/kde-misc/metabar/ChangeLog
@@ -1,8 +1,15 @@
 # ChangeLog for kde-misc/metabar
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/metabar/ChangeLog,v 1.7 2006/05/30 01:40:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/metabar/ChangeLog,v 1.8 2006/09/28 17:19:35 troll Exp $
 
-  30 May 2006; Diego Pettenò <flameeyes@gentoo.org> metabar-0.7.ebuild:
+  28 Sep 2006; Przemysław Maciąg <troll@gentoo.org>
+  +files/metabar-0.8-fix-esc-bug.patch, +files/metabar-desktop_file.patch,
+  metabar-0.8.ebuild:
+  Patch to fix compilation issues. Fix #149159, thx to Mike Pagano and Fabian
+  Wolf.
+  Patch for missing polish translation in desktop files.
+
+  30 May 2006; Diego Pettenò <flameeyes@gentoo.org> metabar-0.7.ebuild:
   Make sure aRTs is required.
 
   21 Feb 2006; Carsten Lohrke <carlo@gentoo.org> metabar-0.7.ebuild,
@@ -28,5 +35,5 @@
   05 Apr 2005; Gregorio Guidi <greg_g@gentoo.org> +metadata.xml,
   +metabar-0.7.ebuild:
   Initial import (#83227). Ebuild proposed by Gleb Litvjak
-  <soundblaster@aircom.lv> and Dennis Nienhüser <fragfred@gmx.de>.
+  <soundblaster@aircom.lv> and Dennis NienhĂźser <fragfred@gmx.de>.
 
diff --git a/kde-misc/metabar/Manifest b/kde-misc/metabar/Manifest
index 1af95c1219f8..803aef065705 100644
--- a/kde-misc/metabar/Manifest
+++ b/kde-misc/metabar/Manifest
@@ -1,34 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST metabar-0.7.tar.gz 639194
-DIST metabar-0.8.tar.gz 899870
+AUX metabar-0.8-fix-esc-bug.patch 536 RMD160 ff03191fdf756591c9188baf76a7974d91523a7e SHA1 129e67d663de1f67c819df44634bee4049913d1c SHA256 093731a70cab7c4609318919c1432af1ea9518c14b85541d019491c838ead496
+MD5 9d1f775c5745ac47cf2c887b18074395 files/metabar-0.8-fix-esc-bug.patch 536
+RMD160 ff03191fdf756591c9188baf76a7974d91523a7e files/metabar-0.8-fix-esc-bug.patch 536
+SHA256 093731a70cab7c4609318919c1432af1ea9518c14b85541d019491c838ead496 files/metabar-0.8-fix-esc-bug.patch 536
+AUX metabar-desktop_file.patch 1099 RMD160 b8397f0ce77593187da01ba9bab563427f6adeb7 SHA1 5c2dea9200e8d757e2fc0737715764b75d1032eb SHA256 7a01bb160006a7113d52677def2aeaa0eb229d4251c7e07a4ae5610cf167dcc5
+MD5 02cde18d1dd68dcedf864a94a2a595ae files/metabar-desktop_file.patch 1099
+RMD160 b8397f0ce77593187da01ba9bab563427f6adeb7 files/metabar-desktop_file.patch 1099
+SHA256 7a01bb160006a7113d52677def2aeaa0eb229d4251c7e07a4ae5610cf167dcc5 files/metabar-desktop_file.patch 1099
+DIST metabar-0.7.tar.gz 639194 RMD160 76ad3cbcca409b32c1d341a05cf7409029a68f49 SHA1 886637f946eb3ad520200f1d2b4a4e9d09677296 SHA256 9a48e6996ae50254761f93d2d20f6c69883046ad653eb6ec3041782518d5d1b0
+DIST metabar-0.8.tar.gz 899870 RMD160 fee1dc51e6d4f682dd113079b596c20e7989cb68 SHA1 e1490357ff7a9c52079790b3f267003444625449 SHA256 0256944e1a37446c146ce06909271e91fbb8bd982e1042fbf735aecab228d301
 EBUILD metabar-0.7.ebuild 747 RMD160 cb23a9f9c16b474eb082e2eb5f1e119793535f70 SHA1 4513c562dc4964b9e58f441546c76e0edd4a83ca SHA256 0f0560e4139814cecc0585d4e4f5f6836a290036d7b707969f018371b00a3235
 MD5 3152afa97350c940e2322395c214bf40 metabar-0.7.ebuild 747
 RMD160 cb23a9f9c16b474eb082e2eb5f1e119793535f70 metabar-0.7.ebuild 747
 SHA256 0f0560e4139814cecc0585d4e4f5f6836a290036d7b707969f018371b00a3235 metabar-0.7.ebuild 747
-EBUILD metabar-0.8.ebuild 728 RMD160 5cd4dc194f0877c9320d7da31c9f1a73cbc20f0f SHA1 e75106b3cbffa89fde2245f2ed66c0646b004461 SHA256 7ed0c158f23198eb573cf15500328b5bf07df1ab5a051d4239aa5615b463a4cb
-MD5 39067675a0abff1c2250cf87f4096abf metabar-0.8.ebuild 728
-RMD160 5cd4dc194f0877c9320d7da31c9f1a73cbc20f0f metabar-0.8.ebuild 728
-SHA256 7ed0c158f23198eb573cf15500328b5bf07df1ab5a051d4239aa5615b463a4cb metabar-0.8.ebuild 728
-MISC ChangeLog 1100 RMD160 9b05e4c86d53d06f59b6e45759bb7f95825c6892 SHA1 e81f1aa832344ff89294825df6d748b3ae6815e3 SHA256 dc2f1c7fcb3e7c2a9562c566e4a748fbb132dea61f34fe6cd3f714ece1aa0fbd
-MD5 abf7cc1f633553c9dc734ff60029006f ChangeLog 1100
-RMD160 9b05e4c86d53d06f59b6e45759bb7f95825c6892 ChangeLog 1100
-SHA256 dc2f1c7fcb3e7c2a9562c566e4a748fbb132dea61f34fe6cd3f714ece1aa0fbd ChangeLog 1100
+EBUILD metabar-0.8.ebuild 857 RMD160 a7cd3de90fdf771cb652af892e07f6ca98e2116a SHA1 92ac58138dfd890623b8992c181ae5e52ebdd454 SHA256 8ff6bfc21d3600d8cff77d5ac7972d264f9e1503310d05c8a6d8ef51e666dc4c
+MD5 e9685e4afb32ac5021b04a613e128020 metabar-0.8.ebuild 857
+RMD160 a7cd3de90fdf771cb652af892e07f6ca98e2116a metabar-0.8.ebuild 857
+SHA256 8ff6bfc21d3600d8cff77d5ac7972d264f9e1503310d05c8a6d8ef51e666dc4c metabar-0.8.ebuild 857
+MISC ChangeLog 1395 RMD160 b89e03c2a32284f8919650acd00a2a5e63c8d97b SHA1 4580f5beed31a040c1640628f3e9a264dd0404fe SHA256 79bb986db95e363527d6a1e3589b62cab8ce9cbea9348b7ec4514bf091124b49
+MD5 df63518d52a88a96e75a927b5e700631 ChangeLog 1395
+RMD160 b89e03c2a32284f8919650acd00a2a5e63c8d97b ChangeLog 1395
+SHA256 79bb986db95e363527d6a1e3589b62cab8ce9cbea9348b7ec4514bf091124b49 ChangeLog 1395
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
-MD5 e7ca82d62ed7be0b7a72c7c6fad010f2 files/digest-metabar-0.7 63
-RMD160 5d72426469acdee105c124344de5b1e05e76e754 files/digest-metabar-0.7 63
-SHA256 e9e2a6db28859551faa5c6a3c4deccacdf55cef482f62632488646628f5f44a2 files/digest-metabar-0.7 63
-MD5 f72587cee0737f72b18ad3eff6f06608 files/digest-metabar-0.8 63
-RMD160 75507b45b423a994b3bb1c8802e40ca8a5bdc0d1 files/digest-metabar-0.8 63
-SHA256 c70082a5c38631f6a34c973a15615bc58fdc08b3b581fde381e5961b92965211 files/digest-metabar-0.8 63
+MD5 bcb437905aa00d090d11a75639888eed files/digest-metabar-0.7 235
+RMD160 39f2c70c0cd8ff5e418acc998cdd7c51cff5245b files/digest-metabar-0.7 235
+SHA256 1a62963385e96762ed2ba31cedacd9604ec6f9d881e4717ff3ccf4ec7b083ba0 files/digest-metabar-0.7 235
+MD5 07e8ed2300ecdaf6ca813b92469d47de files/digest-metabar-0.8 235
+RMD160 f987087f682fc9cd83c6bf6684728f6ab48b834c files/digest-metabar-0.8 235
+SHA256 31ae81134318340a90bb0d31ff044aaa881584ce4c8485b450830184da9f558b files/digest-metabar-0.8 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFEe6KkAiZjviIA2XgRAoDvAKCQlBxjjJvq1HW/iqAvNHx94ER/CACfe5lu
-heU6eqQcO2PvrZMPsR+c0XE=
-=89Pe
+iD8DBQFFHB/8exDpKttj3ykRAtffAJ4x6i4Uo82so1YbGqeXrWLANfLf1wCeLPsW
+ARqKJ37GyLs1yHuue1m3de4=
+=atOy
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/metabar/files/digest-metabar-0.7 b/kde-misc/metabar/files/digest-metabar-0.7
index ffdd464a46ba..09faffdef06f 100644
--- a/kde-misc/metabar/files/digest-metabar-0.7
+++ b/kde-misc/metabar/files/digest-metabar-0.7
@@ -1 +1,3 @@
 MD5 4f43f62b831e343e8598e9d130c21699 metabar-0.7.tar.gz 639194
+RMD160 76ad3cbcca409b32c1d341a05cf7409029a68f49 metabar-0.7.tar.gz 639194
+SHA256 9a48e6996ae50254761f93d2d20f6c69883046ad653eb6ec3041782518d5d1b0 metabar-0.7.tar.gz 639194
diff --git a/kde-misc/metabar/files/digest-metabar-0.8 b/kde-misc/metabar/files/digest-metabar-0.8
index 1fe0ad657fe2..a4fa1c3cd44c 100644
--- a/kde-misc/metabar/files/digest-metabar-0.8
+++ b/kde-misc/metabar/files/digest-metabar-0.8
@@ -1 +1,3 @@
 MD5 8ddbc76b4ab70eeab37cfb414cc3465b metabar-0.8.tar.gz 899870
+RMD160 fee1dc51e6d4f682dd113079b596c20e7989cb68 metabar-0.8.tar.gz 899870
+SHA256 0256944e1a37446c146ce06909271e91fbb8bd982e1042fbf735aecab228d301 metabar-0.8.tar.gz 899870
diff --git a/kde-misc/metabar/files/metabar-0.8-fix-esc-bug.patch b/kde-misc/metabar/files/metabar-0.8-fix-esc-bug.patch
new file mode 100644
index 000000000000..71eb2843fc36
--- /dev/null
+++ b/kde-misc/metabar/files/metabar-0.8-fix-esc-bug.patch
@@ -0,0 +1,11 @@
+--- src/metabarwidget.cpp.orig	2006-09-27 20:54:15.000000000 -0400
++++ src/metabarwidget.cpp	2006-09-27 20:54:38.000000000 -0400
+@@ -369,7 +369,7 @@
+       
+         DOM::DOMString innerHTML;
+         innerHTML += QString("<ul style=\"width: %1px; height: %1px\">").arg(image.width(), image.height());
+-        innerHTML += "<object class=\preview\" type=\"";
++        innerHTML += "<object class=\"preview\" type=\"";
+         innerHTML += item->mimetype();
+         innerHTML += "\" data=\"";
+         innerHTML += item->url().url();
diff --git a/kde-misc/metabar/files/metabar-desktop_file.patch b/kde-misc/metabar/files/metabar-desktop_file.patch
new file mode 100644
index 000000000000..24a395723fa8
--- /dev/null
+++ b/kde-misc/metabar/files/metabar-desktop_file.patch
@@ -0,0 +1,24 @@
+--- metabar/src/metabar.desktop.orig	2005-04-06 15:49:04.000000000 +0000
++++ metabar/src/metabar.desktop	2005-04-06 15:49:58.000000000 +0000
+@@ -9,6 +9,7 @@
+ Comment[fr]=Un module externe pour le panneau de navigation de Konqueror nommé Metabar
+ Comment[it]=Un plugin per la navigazione in konqueror chiamato Metabar
+ Comment[nl]=Een konqueror navigatiepaneel-plugin met de naam Metabar
++Comment[pl]=Panel nawigacyjny dla Konquerora nazwany Metabar
+ Comment[pt]=Um 'plugin' do painel de navegação do konqueror chamado Metabar
+ Comment[pt_BR]=Um plugin de painel de navegação do konqueror chamado Metabar
+ Comment[ru]=Модуль панели навигации konqueror Metabar
+--- metabar/src/metabar_add.desktop.orig	2005-04-06 15:49:11.000000000 +0000
++++ metabar/src/metabar_add.desktop	2005-04-06 15:50:31.000000000 +0000
+@@ -1,9 +1,11 @@
+ [Desktop Entry]
+ Comment=A konqueror navigation panel plugin called Metabar
++Comment[pl]=Panel nawigacyjny dla Konquerora nazwany Metabar
+ Encoding=UTF-8
+ Icon=metabar
+ Name=Metabar
+ Name[de]=Metabar
++Name[pl]=Metabar
+ Open=false
+ Type=Link
+ URL=
diff --git a/kde-misc/metabar/metabar-0.8.ebuild b/kde-misc/metabar/metabar-0.8.ebuild
index 1c7593b000b0..22ac98f7058a 100644
--- a/kde-misc/metabar/metabar-0.8.ebuild
+++ b/kde-misc/metabar/metabar-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/metabar/metabar-0.8.ebuild,v 1.3 2006/02/21 18:25:05 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/metabar/metabar-0.8.ebuild,v 1.4 2006/09/28 17:19:35 troll Exp $
 
 inherit kde
 
@@ -20,6 +20,14 @@ need-kde 3.3
 
 S="${WORKDIR}/${PN}"
 
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-esc-bug.patch
+	epatch ${FILESDIR}/${PN}-desktop_file.patch
+}
+
 pkg_postinst()
 {
 	echo