diff options
| author |   Wulf Krueger <philantrop@gentoo.org> | 2008-03-28 20:43:18 +0000 |
|---|---|---|
| committer | Wulf Krueger <philantrop@gentoo.org> | 2008-03-28 20:43:18 +0000 |
| commit | 98c56801b9bec78e9ba6edf37875f36b2bd1dbda (patch) | |
| tree | 4f2edf05804cdf60aaf9feab23ba64af33de851d /app-cdr | |
| parent | Adding meta package for GNOME-2.22. gnome-keyring-manager is replaced by seah... (diff) | |
| download | gentoo-2-98c56801b9bec78e9ba6edf37875f36b2bd1dbda.tar.gz gentoo-2-98c56801b9bec78e9ba6edf37875f36b2bd1dbda.tar.bz2 gentoo-2-98c56801b9bec78e9ba6edf37875f36b2bd1dbda.zip | |
Added a patch for gcc 4.3 compatibility as kindly provided by Peter Alfredsen on bug 214272. Added a missing dependency on ffmpeg which fixes bug 207419.
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k9copy/ChangeLog | 7 | ||||
| -rw-r--r-- | app-cdr/k9copy/files/k9copy-1.2.3-gcc43.patch | 22 | ||||
| -rw-r--r-- | app-cdr/k9copy/k9copy-1.2.3.ebuild | 6 |
3 files changed, 32 insertions, 3 deletions
diff --git a/app-cdr/k9copy/ChangeLog b/app-cdr/k9copy/ChangeLog index e36b884e10ba..908b459147fb 100644 --- a/app-cdr/k9copy/ChangeLog +++ b/app-cdr/k9copy/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-cdr/k9copy # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.34 2008/01/20 15:10:53 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/ChangeLog,v 1.35 2008/03/28 20:43:18 philantrop Exp $ + + 28 Mar 2008; Wulf C. Krueger <philantrop@gentoo.org> + +files/k9copy-1.2.3-gcc43.patch, k9copy-1.2.3.ebuild: + Added a patch for gcc 4.3 compatibility as kindly provided by Peter + Alfredsen on bug 214272. Added a missing dependency on ffmpeg. *k9copy-1.2.3 (20 Jan 2008) diff --git a/app-cdr/k9copy/files/k9copy-1.2.3-gcc43.patch b/app-cdr/k9copy/files/k9copy-1.2.3-gcc43.patch new file mode 100644 index 000000000000..3807ea8caa02 --- /dev/null +++ b/app-cdr/k9copy/files/k9copy-1.2.3-gcc43.patch @@ -0,0 +1,22 @@ +diff -up k9copy-1.2.2/k9author/k9avidecode.cpp.gcc43~ k9copy-1.2.2/k9author/k9avidecode.cpp +--- k9copy-1.2.2/k9author/k9avidecode.cpp.gcc43~ 2008-01-13 11:04:31.000000000 +0000 ++++ k9copy-1.2.2/k9author/k9avidecode.cpp 2008-01-13 11:04:31.000000000 +0000 +@@ -9,6 +9,7 @@ + // Copyright: See COPYING file that comes with this distribution + // + // ++#include <stdlib.h> + #include "k9avidecode.h" + #include <ffmpeg/avcodec.h> + #include <qimage.h> +diff -up k9copy-1.2.2/src/k9glwidget.cpp.gcc43~ k9copy-1.2.2/src/k9glwidget.cpp +--- k9copy-1.2.2/src/k9glwidget.cpp.gcc43~ 2008-01-13 11:05:42.000000000 +0000 ++++ k9copy-1.2.2/src/k9glwidget.cpp 2008-01-13 11:05:42.000000000 +0000 +@@ -10,6 +10,7 @@ + // + // + ++#include <stdlib.h> + #include "k9glwidget.h" + + #ifdef HAVE_OPENGL diff --git a/app-cdr/k9copy/k9copy-1.2.3.ebuild b/app-cdr/k9copy/k9copy-1.2.3.ebuild index 171f1a71eaaa..c8b0288215b3 100644 --- a/app-cdr/k9copy/k9copy-1.2.3.ebuild +++ b/app-cdr/k9copy/k9copy-1.2.3.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-cdr/k9copy/k9copy-1.2.3.ebuild,v 1.2 2008/01/21 03:24:08 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k9copy/k9copy-1.2.3.ebuild,v 1.3 2008/03/28 20:43:18 philantrop Exp $ EAPI="1" @@ -24,11 +24,13 @@ DEPEND="media-video/dvdauthor >=app-cdr/k3b-0.12.10 dev-libs/dbus-qt3-old sys-apps/hal + >=media-video/ffmpeg-0.4.9_p20070616 media-video/mplayer" need-kde 3.5 -PATCHES="${FILESDIR}/k9copy-1.2.3-desktop-entry.diff" +PATCHES="${FILESDIR}/${P}-desktop-entry.diff + ${FILESDIR}/${P}-gcc43.patch" pkg_setup() { kde_pkg_setup |