summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2006-11-09 17:30:12 +0000
committerAlexis Ballier <aballier@gentoo.org>2006-11-09 17:30:12 +0000
commit4c661470ad027efc76dbe2b6702e2f30dbbe46b4 (patch)
treef0ae97d551c6094a22e42f3608623f7127ce1c28
parentMake ebuild also depend on unshield when no DVB_CARD is defined and all are i... (diff)
downloadgentoo-2-4c661470ad027efc76dbe2b6702e2f30dbbe46b4.tar.gz
gentoo-2-4c661470ad027efc76dbe2b6702e2f30dbbe46b4.tar.bz2
gentoo-2-4c661470ad027efc76dbe2b6702e2f30dbbe46b4.zip
KDE 3.5 compatibility compile fix, patch by Matteo Azzali <mattepiu@gentoo.org>, closing bug #135432
(Portage version: 2.1.2_rc1-r5)
-rw-r--r--media-video/kmenc15/ChangeLog9
-rw-r--r--media-video/kmenc15/files/digest-kmenc15-0.032
-rw-r--r--media-video/kmenc15/files/digest-kmenc15-0.042
-rw-r--r--media-video/kmenc15/files/kmenc15-wcondiff.diff11
-rw-r--r--media-video/kmenc15/kmenc15-0.04.ebuild5
5 files changed, 25 insertions, 4 deletions
diff --git a/media-video/kmenc15/ChangeLog b/media-video/kmenc15/ChangeLog
index 5908a7678cc2..e1b585cc3b57 100644
--- a/media-video/kmenc15/ChangeLog
+++ b/media-video/kmenc15/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-video/kmenc15
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmenc15/ChangeLog,v 1.4 2005/11/07 10:02:38 flameeyes Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmenc15/ChangeLog,v 1.5 2006/11/09 17:30:12 aballier Exp $
+
+ 09 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+ +files/kmenc15-wcondiff.diff, kmenc15-0.04.ebuild:
+ KDE 3.5 compatibility compile fix, patch by Matteo Azzali
+ <mattepiu@gentoo.org>, closing bug #135432
07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> kmenc15-0.03.ebuild,
kmenc15-0.04.ebuild:
diff --git a/media-video/kmenc15/files/digest-kmenc15-0.03 b/media-video/kmenc15/files/digest-kmenc15-0.03
index ed9d3b06f242..757504516469 100644
--- a/media-video/kmenc15/files/digest-kmenc15-0.03
+++ b/media-video/kmenc15/files/digest-kmenc15-0.03
@@ -1 +1,3 @@
MD5 986ae4b4b9d96a373af0541c93296769 kmenc15-0.03.tar.bz2 175445
+RMD160 f1c83a80fcc0bb3c859993d29a2855061e2fb104 kmenc15-0.03.tar.bz2 175445
+SHA256 9df8c626822890dea97e3833a64b3659a02b2472a4da5a2a2eaea28b8e532cb2 kmenc15-0.03.tar.bz2 175445
diff --git a/media-video/kmenc15/files/digest-kmenc15-0.04 b/media-video/kmenc15/files/digest-kmenc15-0.04
index 27ad41a1957f..f0459fb21772 100644
--- a/media-video/kmenc15/files/digest-kmenc15-0.04
+++ b/media-video/kmenc15/files/digest-kmenc15-0.04
@@ -1 +1,3 @@
MD5 64e46a32cd055516b9d82f60836eefcb kmenc15-0.04.tar.bz2 177358
+RMD160 2a65f517a467713df5dc77d4fe48c9943bd2cd79 kmenc15-0.04.tar.bz2 177358
+SHA256 31eb0d96b7b29ed9b94ebbc79ad71485800e823168739987e5cd6f52400392e4 kmenc15-0.04.tar.bz2 177358
diff --git a/media-video/kmenc15/files/kmenc15-wcondiff.diff b/media-video/kmenc15/files/kmenc15-wcondiff.diff
new file mode 100644
index 000000000000..8ee6f3d6688f
--- /dev/null
+++ b/media-video/kmenc15/files/kmenc15-wcondiff.diff
@@ -0,0 +1,11 @@
+--- wcon.diff.orig 2006-06-06 01:51:59.000000000 +0200
++++ wcon.diff 2006-06-06 02:08:58.000000000 +0200
+@@ -1,5 +1,8 @@
+ --- wcon.cpp 2004-10-23 19:48:53.000000000 +0200
+ +++ wcon.cpp 2004-10-23 19:49:20.000000000 +0200
++@@ -44,1 +44,1 @@
++-#include "khtmlpart.h"
+++#include "khtml_part.h"
+ @@ -500,1 +500,1 @@
+ - qsv_lavcLayout = new QGridLayout( qsv_lavc, 1, 1, 0, 0, "qsv_lavcLayout");
+ + qsv_lavcLayout = new QGridLayout( qsv_lavc->viewport(), 1, 1, 0, 0, "qsv_lavcLayout");
diff --git a/media-video/kmenc15/kmenc15-0.04.ebuild b/media-video/kmenc15/kmenc15-0.04.ebuild
index 92b316f8f27f..654adc3dd079 100644
--- a/media-video/kmenc15/kmenc15-0.04.ebuild
+++ b/media-video/kmenc15/kmenc15-0.04.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kmenc15/kmenc15-0.04.ebuild,v 1.3 2005/11/07 10:02:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kmenc15/kmenc15-0.04.ebuild,v 1.4 2006/11/09 17:30:12 aballier Exp $
inherit eutils kde
@@ -14,6 +14,7 @@ DEPEND="media-video/mplayer"
IUSE=""
src_compile() {
+ epatch "${FILESDIR}/${PN}-wcondiff.diff"
emake || die
}