From ed0364b98dece31804d576f8305232fc2705d921 Mon Sep 17 00:00:00 2001
From: Aldas Nabazas <aldas@opensde.net>
Date: Mon, 20 Apr 2009 19:39:38 +0300
Subject: [PATCH] kdemultimedia: Updated (3.5.10 -> 4.2.2)

---
 kde/kdemultimedia/kdemultimedia.cache         | 61 +++++++++++++++++--
 kde/kdemultimedia/kdemultimedia.desc          |  4 +-
 .../wordsize_check.patch.disabled             | 31 ----------
 3 files changed, 59 insertions(+), 37 deletions(-)
 delete mode 100644 kde/kdemultimedia/wordsize_check.patch.disabled

diff --git a/kde/kdemultimedia/kdemultimedia.cache b/kde/kdemultimedia/kdemultimedia.cache
index 8bb5f053c..cf908b0bb 100644
--- a/kde/kdemultimedia/kdemultimedia.cache
+++ b/kde/kdemultimedia/kdemultimedia.cache
@@ -1,15 +1,68 @@
 
-[TIMESTAMP] 1134183730 Sat Dec 10 04:02:10 2005
-[BUILDTIME] 5 (9) ERROR
-[SIZE] 0.01 MB, 6 files
+[TIMESTAMP] 1240065844 Sat Apr 18 17:44:04 2009
+[BUILDTIME] 130 (5)
+[SIZE] 5.65 MB, 192 files
 
+[DEP] acl
+[DEP] alsa-lib
+[DEP] attr
+[DEP] automoc4
 [DEP] bash
+[DEP] binutils
 [DEP] bzip2
+[DEP] cdparanoia
+[DEP] cmake
 [DEP] coreutils
 [DEP] diffutils
+[DEP] e2fsprogs
+[DEP] expat
+[DEP] fhs
+[DEP] findutils
+[DEP] flac
+[DEP] fontconfig
+[DEP] freetype
+[DEP] gamin
+[DEP] gawk
 [DEP] gcc
+[DEP] glib
+[DEP] glibc
 [DEP] grep
-[DEP] patch
+[DEP] kdelibs
+[DEP] libice
+[DEP] libjpeg
+[DEP] libmusicbrainz
+[DEP] libogg
+[DEP] libpng
+[DEP] libsm
+[DEP] libungif
+[DEP] libunicode
+[DEP] libvorbis
+[DEP] libx11
+[DEP] libxau
+[DEP] libxcb
+[DEP] libxcursor
+[DEP] libxdmcp
+[DEP] libxext
+[DEP] libxfixes
+[DEP] libxft
+[DEP] libxml
+[DEP] libxpm
+[DEP] libxrender
+[DEP] libxt
+[DEP] libxtst
+[DEP] linux-header
+[DEP] make
+[DEP] nas
+[DEP] ncurses
+[DEP] pcre
+[DEP] phonon
+[DEP] pkgconfig
+[DEP] qt4
 [DEP] sed
+[DEP] strigi
 [DEP] sysfiles
+[DEP] taglib
 [DEP] tar
+[DEP] util-linux
+[DEP] xine-lib
+[DEP] xproto
diff --git a/kde/kdemultimedia/kdemultimedia.desc b/kde/kdemultimedia/kdemultimedia.desc
index 6671f899d..839a8218c 100644
--- a/kde/kdemultimedia/kdemultimedia.desc
+++ b/kde/kdemultimedia/kdemultimedia.desc
@@ -34,7 +34,7 @@
 
 [L] GPL
 [S] Stable
-[V] 3.5.10
+[V] 4.2.2
 [P] X -----5---9 168.800
 
-[D] 242940120 kdemultimedia-3.5.10.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/3.5.10/src/
+[D] 3173314556 kdemultimedia-4.2.2.tar.bz2 ftp://ftp.kde.org/pub/kde/stable/4.2.2/src/
diff --git a/kde/kdemultimedia/wordsize_check.patch.disabled b/kde/kdemultimedia/wordsize_check.patch.disabled
deleted file mode 100644
index 496df0356..000000000
--- a/kde/kdemultimedia/wordsize_check.patch.disabled
+++ /dev/null
@@ -1,31 +0,0 @@
-# --- SDE-COPYRIGHT-NOTE-BEGIN ---
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-#
-# Filename: package/.../kdemultimedia/wordsize_check.patch.disabled
-# Copyright (C) 2004 - 2006 The T2 SDE Project
-#
-# More information can be found in the files COPYING and README.
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# --- SDE-COPYRIGHT-NOTE-END ---
-diff -Naur kdemultimedia-3.4.0.orig/mpeglib/lib/input/cdromAccess.cpp kdemultimedia-3.4.0/mpeglib/lib/input/cdromAccess.cpp
---- kdemultimedia-3.4.0.orig/mpeglib/lib/input/cdromAccess.cpp	2005-01-03 16:53:36.000000000 +0200
-+++ kdemultimedia-3.4.0/mpeglib/lib/input/cdromAccess.cpp	2005-03-06 15:04:12.252743928 +0200
-@@ -29,7 +29,11 @@
-   #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,70)
-   #include <bits/wordsize.h>
-   #if __WORDSIZE == 64
--  typedef unsigned long __u64;
-+  #ifdef __x86_64__
-+	  typedef unsigned long long __u64;
-+  #else
-+	  typedef unsigned long __u64;
-+  #endif
-   #else
-   typedef unsigned long long __u64;
-   #endif