diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:37:58 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2007-02-05 12:37:58 +0000 |
| commit | 8024176e2b7b2c278766836214d0871d9eb3e977 (patch) | |
| tree | 3be6ebe5512e0f3326f2c255584870acda3d3ecd /kde-base | |
| parent | Stable on sparc wrt #165335 (diff) | |
| download | gentoo-2-8024176e2b7b2c278766836214d0871d9eb3e977.tar.gz gentoo-2-8024176e2b7b2c278766836214d0871d9eb3e977.tar.bz2 gentoo-2-8024176e2b7b2c278766836214d0871d9eb3e977.zip | |
Remove unneeded patches.
(Portage version: 2.1.2-r7)
Diffstat (limited to 'kde-base')
5 files changed, 8 insertions, 72 deletions
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog index 2502e7c7717b..475445263b47 100644 --- a/kde-base/kdemultimedia/ChangeLog +++ b/kde-base/kdemultimedia/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdemultimedia # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.240 2007/02/04 18:04:57 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.241 2007/02/05 12:37:58 flameeyes Exp $ + + 05 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> + -files/juk-3.5.2-do_not_use_gstreamer-0.10.diff, + -files/juk-3.5.2-filerename.diff, + -files/artsplugin-akode-3.5.2-memleak.patch, + -files/kdemultimedia-64bit.patch: + Remove unneeded patches. 04 Feb 2007; Jeroen Roovers <jer@gentoo.org> kdemultimedia-3.5.6.ebuild: Marked ~hppa. diff --git a/kde-base/kdemultimedia/files/artsplugin-akode-3.5.2-memleak.patch b/kde-base/kdemultimedia/files/artsplugin-akode-3.5.2-memleak.patch deleted file mode 100644 index 6852e3f7ad3c..000000000000 --- a/kde-base/kdemultimedia/files/artsplugin-akode-3.5.2-memleak.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur kdemultimedia-3.5.1/akode_artsplugin/akodePlayObject_impl.cpp kdemultimedia-3.5.1-2/akode_artsplugin/akodePlayObject_impl.cpp ---- kdemultimedia-3.5.1/akode_artsplugin/akodePlayObject_impl.cpp 2005-09-10 18:20:04.000000000 +1000 -+++ kdemultimedia-3.5.1-2/akode_artsplugin/akodePlayObject_impl.cpp 2006-03-01 10:54:32.000000000 +1000 -@@ -83,6 +83,8 @@ - akodePlayObject_impl::~akodePlayObject_impl() - { - unload(); -+ -+ delete m_packetQueue; - } - - bool akodePlayObject_impl::loadPlugin(const string &plugin) -@@ -219,10 +221,9 @@ - delete bufferedDecoder; - bufferedDecoder = 0; - } --#else -- delete frameDecoder -- frameDecoder = 0; - #endif -+ delete frameDecoder; -+ frameDecoder = 0; - decoder = 0; - if (buffer != inBuffer) - delete inBuffer; diff --git a/kde-base/kdemultimedia/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff b/kde-base/kdemultimedia/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff deleted file mode 100644 index fcc5afd0799c..000000000000 --- a/kde-base/kdemultimedia/files/juk-3.5.2-do_not_use_gstreamer-0.10.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- juk/configure.in.in.orig 2006-04-06 20:28:55.000000000 +0200 -+++ juk/configure.in.in 2006-04-06 20:29:33.000000000 +0200 -@@ -59,9 +59,9 @@ - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 - export PKG_CONFIG_ALLOW_SYSTEM_LIBS - -- GST_MAJORMINOR=0.10 -- GST_REQ=0.10.0 -- GST_VERSION=10 -+ GST_MAJORMINOR=0.8 -+ GST_REQ=0.8.0 -+ GST_VERSION=8 - - PKG_CHECK_MODULES(GST, \ - gstreamer-$GST_MAJORMINOR >= $GST_REQ, \ diff --git a/kde-base/kdemultimedia/files/juk-3.5.2-filerename.diff b/kde-base/kdemultimedia/files/juk-3.5.2-filerename.diff deleted file mode 100644 index 6a2d66d332b0..000000000000 --- a/kde-base/kdemultimedia/files/juk-3.5.2-filerename.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- juk/tagrenameroptions.cpp.orig 2006-04-05 17:08:35.000000000 +0200 -+++ juk/tagrenameroptions.cpp 2006-04-05 17:08:59.000000000 +0200 -@@ -147,7 +147,7 @@ - TagType TagRenamerOptions::tagFromCategoryText(const QString &text) - { - for(unsigned i = StartTag; i < NumTypes; ++i) -- if(tagTypeText(static_cast<TagType>(i), false) == text) -+ if(tagTypeText(static_cast<TagType>(i), true) == text) - return static_cast<TagType>(i); - - return Unknown; diff --git a/kde-base/kdemultimedia/files/kdemultimedia-64bit.patch b/kde-base/kdemultimedia/files/kdemultimedia-64bit.patch deleted file mode 100644 index a2eb8cc89e28..000000000000 --- a/kde-base/kdemultimedia/files/kdemultimedia-64bit.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- mpeglib/lib/input/cdromAccess.cpp.orig 2004-12-17 19:48:52.348984280 +0000 -+++ mpeglib/lib/input/cdromAccess.cpp 2004-12-17 19:49:01.656900680 +0000 -@@ -26,9 +26,14 @@ - #include <linux/version.h> - #include <sys/types.h> - #ifndef __u64 -- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) -- typedef unsigned long long __u64; -- #endif -+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70) -+ #include <bits/wordsize.h> -+ #if __WORDSIZE == 64 -+ typedef unsigned long __u64; -+ #else -+ typedef unsigned long long __u64; -+ #endif -+ #endif - #endif - #include "cdromAccess_Linux.cpp" - #endif |