summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Lohrke <carlo@gentoo.org>2005-04-18 11:06:26 +0000
committerCarsten Lohrke <carlo@gentoo.org>2005-04-18 11:06:26 +0000
commite82279706d7855aab04b78a7939d377b6fc9533a (patch)
tree9effc18a766e6483a4604bdfe1502a9615272bbb /app-cdr
parentjabber-server and not jabberd .... (diff)
downloadhistorical-e82279706d7855aab04b78a7939d377b6fc9533a.tar.gz
historical-e82279706d7855aab04b78a7939d377b6fc9533a.tar.bz2
historical-e82279706d7855aab04b78a7939d377b6fc9533a.zip
fixed patch
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/k3b/ChangeLog6
-rw-r--r--app-cdr/k3b/Manifest4
-rw-r--r--app-cdr/k3b/files/k3b-dvdrip-transcode.patch8
3 files changed, 11 insertions, 7 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index f5205dbce2a7..df6f29dc1351 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-cdr/k3b
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.100 2005/04/15 23:43:19 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.101 2005/04/18 11:06:26 carlo Exp $
+
+ 18 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
+ files/k3b-dvdrip-transcode.patch:
+ ..
15 Apr 2005; Carsten Lohrke <carlo@gentoo.org>
files/k3b-dvdrip-transcode.patch, k3b-0.11.23-r2.ebuild:
diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest
index 53b0d881427a..b19ab97b7dde 100644
--- a/app-cdr/k3b/Manifest
+++ b/app-cdr/k3b/Manifest
@@ -1,6 +1,6 @@
MD5 e5ab5a820b79edb45adbbb99daf8aab6 k3b-0.11.23.ebuild 3103
MD5 cb5adb6127546e24d965148cf362699f k3b-0.11.18.ebuild 3269
-MD5 9866fc318313eca7e043fbc4b719115c ChangeLog 14412
+MD5 3490ad92ac14f6da5c39e9a7cef674dc ChangeLog 14503
MD5 fc2af470dc88829c3752721bbc0e14d8 k3b-0.11.23-r2.ebuild 3296
MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
MD5 e863d7c5a6bc253125a06ba6b230d561 files/k3b-0.11.18-configure-libsamplerate.patch 830
@@ -8,4 +8,4 @@ MD5 fcb8d7651ef3f8e8edbb1407b9b26a87 files/digest-k3b-0.11.23-r2 132
MD5 513df86e2c91f7c1209b63cea7d41b84 files/k3b-0.11.17-noarts.patch 893
MD5 d6b7a5cc59198e0b99b320d118983fd6 files/digest-k3b-0.11.18 132
MD5 fcb8d7651ef3f8e8edbb1407b9b26a87 files/digest-k3b-0.11.23 132
-MD5 605082baffd97610f3e1ab1dfbb4439d files/k3b-dvdrip-transcode.patch 1997
+MD5 5f469d8bb9067596d861b4a9a0a450a1 files/k3b-dvdrip-transcode.patch 1999
diff --git a/app-cdr/k3b/files/k3b-dvdrip-transcode.patch b/app-cdr/k3b/files/k3b-dvdrip-transcode.patch
index a12ccc02716b..652b3cc4fb62 100644
--- a/app-cdr/k3b/files/k3b-dvdrip-transcode.patch
+++ b/app-cdr/k3b/files/k3b-dvdrip-transcode.patch
@@ -1,6 +1,6 @@
-diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip/k3bdvdrippingprocess.cpp
---- k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp 2004-06-02 21:31:41.000000000 +1200
-+++ k3b-0.11.23.new/src/rip/k3bdvdrippingprocess.cpp 2005-04-15 11:21:13.000000000 +1200
+diff -Narup k3b-0.11.23.orig/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp
+--- k3b-0.11.23.orig/src/rip/k3bdvdrippingprocess.cpp 2004-06-02 11:31:41.000000000 +0200
++++ k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp 2005-04-16 13:22:21.000000000 +0200
@@ -83,7 +83,15 @@ void K3bDvdRippingProcess::checkRippingM
m_title = QString::number( (*m_dvd).getTitleNumber() );
if( (*m_dvd).getMaxAngle() == 1 ) {
@@ -29,7 +29,7 @@ diff -Narup k3b-0.11.23/src/rip/k3bdvdrippingprocess.cpp k3b-0.11.23-new/src/rip
+ * This check probably not required any more
+ *
if( m_tccatBin->version >= K3bVersion( 0, 6, 12 ) ) {
- emit infoMessage( i18n("Sorry, K3b does not support ripping Video DVDs with transcode >= 0.6.12 yet."),
+ emit infoMessage( i18n("Sorry, K3b does not support ripping Video DVDs with transcode >= 0.1.12 yet."),
ERROR );
emit finished( false );
return;