diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-02-26 23:11:48 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-02-26 23:11:48 +0000 |
| commit | 7b3cc8b3716164e200b635aa9f5a8385b316f2b9 (patch) | |
| tree | 997e8d7cc0be48cbdea210ef2bbbe991db43f6d6 /app-cdr/k9copy/files | |
| parent | depend virtual/jpeg (diff) | |
| download | gentoo-2-7b3cc8b3716164e200b635aa9f5a8385b316f2b9.tar.gz gentoo-2-7b3cc8b3716164e200b635aa9f5a8385b316f2b9.tar.bz2 gentoo-2-7b3cc8b3716164e200b635aa9f5a8385b316f2b9.zip | |
Add upstream patch to fix compilation with kde-4.6, bug 350352
(Portage version: 2.1.9.41/cvs/Linux x86_64)
Diffstat (limited to 'app-cdr/k9copy/files')
| -rw-r--r-- | app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch | 26 | ||||
| -rw-r--r-- | app-cdr/k9copy/files/k9copy-2.3.6-return.patch | 10 |
2 files changed, 10 insertions, 26 deletions
diff --git a/app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch b/app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch deleted file mode 100644 index 093ef01e9869..000000000000 --- a/app-cdr/k9copy/files/k9copy-2.3.5-gcc45.patch +++ /dev/null @@ -1,26 +0,0 @@ -Passing const char * instead of QByteArray to printf - -http://bugs.gentoo.org/show_bug.cgi?id=304755 - -Patch written by Kacper Kowalik <xarthisius.kk@gmail.com> - ---- src/xine/k9xineplayer.cpp -+++ src/xine/k9xineplayer.cpp -@@ -251,7 +251,7 @@ - - if ((vo_port = xine_open_video_driver(xine, - m_vo.toAscii(), XINE_VISUAL_TYPE_X11, (void *) &vis)) == NULL) { -- printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii()); -+ printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii().constData()); - return ; - } - -@@ -270,7 +270,7 @@ - running=false; - m_title=""; - if ((!xine_open(stream, m_mrl.toUtf8())) || (!xine_play(stream, 0, 0))) { -- printf("Unable to open mrl '%s'\n", m_mrl.toUtf8()); -+ printf("Unable to open mrl '%s'\n", m_mrl.toUtf8().constData()); - return ; - } - QTimer::singleShot (500, this, SLOT (updatePosition ())); diff --git a/app-cdr/k9copy/files/k9copy-2.3.6-return.patch b/app-cdr/k9copy/files/k9copy-2.3.6-return.patch new file mode 100644 index 000000000000..86316f30936e --- /dev/null +++ b/app-cdr/k9copy/files/k9copy-2.3.6-return.patch @@ -0,0 +1,10 @@ +--- kde4/src/mpeg2/kdecmpeg2.cpp 2009/11/23 21:58:43 450 ++++ kde4/src/mpeg2/kdecmpeg2.cpp 2011/02/06 20:41:08 561 +@@ -286,6 +286,7 @@ + } + } + } ++ return 0; + } + + void kDecMPEG2::sync() { |