Fix compilation issue (#149159)

(Portage version: 2.1.2_pre1-r3)

6 files changed, 58 insertions, 4 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/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