From 9726d2343d630d0e62430e22bdbdc80ac16862d6 Mon Sep 17 00:00:00 2001 From: Markus Rothe Date: Sat, 18 Dec 2004 14:51:09 +0000 Subject: [PATCH] patch for kdemultimedia-3.3.2 added --- kde-base/kdemultimedia/ChangeLog | 6 +++++- kde-base/kdemultimedia/Manifest | 21 ++++++++++--------- .../files/kdemultimedia-3.3.2-64bit.patch | 20 ++++++++++++++++++ .../kdemultimedia/kdemultimedia-3.3.2.ebuild | 3 ++- 4 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 kde-base/kdemultimedia/files/kdemultimedia-3.3.2-64bit.patch diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog index ad96f865b32a..8878cef07c9f 100644 --- a/kde-base/kdemultimedia/ChangeLog +++ b/kde-base/kdemultimedia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kdemultimedia # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.135 2004/12/09 02:17:22 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.136 2004/12/18 14:51:09 corsair Exp $ + + 18 Dec 2004; Markus Rothe + +files/kdemultimedia-3.3.2-64bit.patch, kdemultimedia-3.3.2.ebuild: + Added patch to let this package compile on ppc64 *kdemultimedia-3.3.2 (08 Dec 2004) diff --git a/kde-base/kdemultimedia/Manifest b/kde-base/kdemultimedia/Manifest index 2511be72d67a..9c3668dcf222 100644 --- a/kde-base/kdemultimedia/Manifest +++ b/kde-base/kdemultimedia/Manifest @@ -1,23 +1,24 @@ -MD5 5b7b01e13af20398a424639403dfc063 kdemultimedia-3.3.2.ebuild 1678 +MD5 fa91f2a2d0d6e0fd1513d9c6d1d9d1ff ChangeLog 20114 MD5 c4e2811488f5b7057830a07c7372764e kdemultimedia-3.1.5.ebuild 2689 -MD5 f357275645a4a8346ee79dd77d66b222 kdemultimedia-3.2.3.ebuild 1544 -MD5 905b8466b08097680bce1e45dfedb7fe kdemultimedia-3.3.1.ebuild 1675 MD5 78a5d756b72f651a8038451801e9bee6 kdemultimedia-3.2.0.ebuild 2255 MD5 cb93ab2aa47f5cfa2918e4d596a3569a kdemultimedia-3.2.2-r1.ebuild 1460 +MD5 f357275645a4a8346ee79dd77d66b222 kdemultimedia-3.2.3.ebuild 1544 MD5 d14011222ca2e60526a7b1cf97f643c9 kdemultimedia-3.3.0.ebuild 1803 -MD5 eba88737d6a5b831bd57f30fc1d3d0cc ChangeLog 19941 +MD5 905b8466b08097680bce1e45dfedb7fe kdemultimedia-3.3.1.ebuild 1675 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161 -MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450 -MD5 373aaabfcb29c89281c6880b2a784c2a files/digest-kdemultimedia-3.2.2-r1 73 -MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300 -MD5 b9cce2b0015700be978730f7bba11352 files/3.3.0-Makefile-synth.am.diff 537 -MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278 -MD5 55cd599c61d48ca121ef4c96a905b6d1 files/kdemultimedia-3.1.5-gentoo-timidity.diff 590 +MD5 3a9cbbd8c45bd4281313e9c9e48a7cf5 kdemultimedia-3.3.2.ebuild 1717 MD5 b9cce2b0015700be978730f7bba11352 files/3.2.3-Makefile-synth.am.diff 537 +MD5 b9cce2b0015700be978730f7bba11352 files/3.3.0-Makefile-synth.am.diff 537 MD5 b7333a2e3e5c81a1c904c67f1a79c0ca files/3.3.0-Makefile.am.diff 459 MD5 239528cb3f6dd1fcc4e2bc4fd2ba9ba8 files/digest-kdemultimedia-3.1.5 73 MD5 498d3a9ec387535d759af9fd59f3dc07 files/digest-kdemultimedia-3.2.0 73 +MD5 373aaabfcb29c89281c6880b2a784c2a files/digest-kdemultimedia-3.2.2-r1 73 MD5 ddadc716d5d607434a4fa830a241ac65 files/digest-kdemultimedia-3.2.3 73 MD5 ff71f209a5c07db1d7ba70b4109484f0 files/digest-kdemultimedia-3.3.0 73 MD5 b25b44699f69e998481bd9aad08e1cef files/digest-kdemultimedia-3.3.1 73 +MD5 a39413062132d248ceae0b20ed262e79 files/flac-patch.diff 450 +MD5 441c0251c7db96f19b27f29861f65ee9 files/kdemultimedia-3.1.5-alpha.diff 300 +MD5 55cd599c61d48ca121ef4c96a905b6d1 files/kdemultimedia-3.1.5-gentoo-timidity.diff 590 +MD5 fe58e9a2bdef8ba1e3b8268714ff5fa7 files/kdemultimedia-3.1.5-ln-sf.diff 1278 MD5 30810bdee5baa766c389b0a4d8533a4e files/digest-kdemultimedia-3.3.2 73 +MD5 c07193251dfaf45f9cc882235c4930d7 files/kdemultimedia-3.3.2-64bit.patch 674 diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.3.2-64bit.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.3.2-64bit.patch new file mode 100644 index 000000000000..c1767a7fa3f6 --- /dev/null +++ b/kde-base/kdemultimedia/files/kdemultimedia-3.3.2-64bit.patch @@ -0,0 +1,20 @@ +--- kdemultimedia-3.3.2/mpeglib/lib/input/cdromAccess.cpp.orig 2004-12-17 19:48:52.348984280 +0000 ++++ kdemultimedia-3.3.2/mpeglib/lib/input/cdromAccess.cpp 2004-12-17 19:49:01.656900680 +0000 +@@ -26,9 +26,14 @@ + #include + #include + #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 ++ #if __WORDSIZE == 64 ++ typedef unsigned long __u64; ++ #else ++ typedef unsigned long long __u64; ++ #endif ++ #endif + #endif + #include "cdromAccess_Linux.cpp" + #endif diff --git a/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild index fab9d3be931a..d5159f3053b5 100644 --- a/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild +++ b/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild,v 1.1 2004/12/09 02:17:22 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-3.3.2.ebuild,v 1.2 2004/12/18 14:51:09 corsair Exp $ inherit kde-dist flag-o-matic eutils @@ -24,6 +24,7 @@ DEPEND="~kde-base/kdebase-${PV} src_unpack() { kde_src_unpack + epatch ${FILESDIR}/${P}-64bit.patch } src_compile() { -- 2.26.2