diff options
| -rw-r--r-- | media-sound/amarok/ChangeLog | 6 | ||||
| -rw-r--r-- | media-sound/amarok/Manifest | 7 | ||||
| -rw-r--r-- | media-sound/amarok/amarok-9999.ebuild | 6 | ||||
| -rw-r--r-- | media-sound/amarok/files/2.0.2-ipod.patch | 32 | ||||
| -rw-r--r-- | media-sound/amarok/files/disable_bindings_test.patch | 12 |
5 files changed, 36 insertions, 27 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog index 7c32d50a58d..417093b070e 100644 --- a/media-sound/amarok/ChangeLog +++ b/media-sound/amarok/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 25 Mar 2009; Theo Chatzimichos <tampakrap@gentoo.org> + files/2.0.2-ipod.patch, +files/disable_bindings_test.patch, + amarok-9999.ebuild: + remove bindings test (nasty workaround) until i properly patch it it + stucks on +kdeprefix, + 22 Mar 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm> amarok-9999.ebuild: Added qtscriptgenerator deps diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest index 54372f1d455..0681103c026 100644 --- a/media-sound/amarok/Manifest +++ b/media-sound/amarok/Manifest @@ -1,6 +1,7 @@ -AUX 2.0.2-ipod.patch 6713 RMD160 40a0da7ceca93e081edfa660383f8281dc4c2d68 SHA1 8a1aad8e9a8ad34fac3de7ca8ba5966c4dbfb50f SHA256 612cdb6886d0bac22773d7a621d3062d0eb96801cff8053d4011e44cb738fb61 +AUX 2.0.2-ipod.patch 5230 RMD160 d147223985dc8c45d0aaaad5008a4b2024159051 SHA1 d94aa98a17229b2ddbae4128021bdb727fb38202 SHA256 b119ba280bba29276ece49b3d80d8770aee831e9afcb1d8795811130b734994a +AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdcbd1 SHA1 09dadd86dc57c39ce768230bf8e0630af40db297 SHA256 b3a4cd44dbd8ce610cb6d5a9214df0abb1458290c6382458dfeb95de00f92ba6 DIST amarok-2.0.2.tar.bz2 4979989 RMD160 d9e7aa2e97c9a80450993aceebbbe1a6f0c301f3 SHA1 13bb7c71b27e88cad728f63c624af90111daeb5c SHA256 d13c0b6b058a8dfd86194c81f89365f69adc14f0e4e6ac82359135629caaf651 EBUILD amarok-2.0.2.ebuild 2927 RMD160 88f7f894ca790a645429723c3779928c660e85f8 SHA1 a49cdf66656d244b7f12513db861fe9979289a55 SHA256 36527638df074bfe9e937b7b407bd7b4f19ae079bbf1ce3a183112458478cd37 -EBUILD amarok-9999.ebuild 2537 RMD160 07f316c0ec169f36b65f48605d5a12fa73b11013 SHA1 6ba3bc830b7e8446411a9a94e3f4f76bcbc8d276 SHA256 4525169239021c344ab2ea7311f7ed3cf5910ece38e4f1658e1ecd5d5b12fd44 -MISC ChangeLog 4484 RMD160 01f75a3f6e332ace6eb1f5735ac1edc408a500fc SHA1 a3683c7893046ad50f01282c35d82a417be1e653 SHA256 4155b9d3eef655ab091c0fdee53f40200ff1c8dc7c484ece7e668ed63c3d4b4d +EBUILD amarok-9999.ebuild 2674 RMD160 b0fcb3ab3cd15b6c3c95f9d615c50634b1fb375d SHA1 c096960aaa36492144a0ce0e1a21e9da760a0947 SHA256 56ca189eb9cc87e225f36c5b13496084dd7fdd10d4a198e379fb1e9742dcbeda +MISC ChangeLog 4720 RMD160 b7bece786d095ded8f33c8afa661ab6d3996551e SHA1 a4ac0f2f7d58f8367a131c825cea803d92f5092e SHA256 5fa1d79cbb9f03718fe07df9938ce2f3c4881f8ba2d416d6fd974be6af76746e MISC metadata.xml 2111 RMD160 27d5395947be1230fe299e1bfd2c39a2c391944a SHA1 dfa479d20096c1d930e3606ea213bde600b0c86f SHA256 c70d4b86309dd709e1d075f6d315cc5f783487ca91a25447a715eb46a2a2d4ce diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild index c7aa594b798..7f20f70712d 100644 --- a/media-sound/amarok/amarok-9999.ebuild +++ b/media-sound/amarok/amarok-9999.ebuild @@ -70,6 +70,12 @@ pkg_setup() { kde4-base_pkg_setup } +src_prepare() { + append-flags -I${KDEDIR} + append-ldflags -L${KDEDIR}/$(get_libdir) + epatch "${FILESDIR}/disable_bindings_test.patch" +} + src_configure() { mycmakeargs="${mycmakeargs} -DWITH_PLAYER=ON diff --git a/media-sound/amarok/files/2.0.2-ipod.patch b/media-sound/amarok/files/2.0.2-ipod.patch index 2e4300ed514..d4621d1d09d 100644 --- a/media-sound/amarok/files/2.0.2-ipod.patch +++ b/media-sound/amarok/files/2.0.2-ipod.patch @@ -1,6 +1,5 @@ -diff -urN amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake amarok-2.0.1.1/cmake/modules/FindIpod.cmake ---- amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake 2009-01-06 13:48:28.000000000 +0100 -+++ amarok-2.0.1.1/cmake/modules/FindIpod.cmake 2009-02-10 18:18:23.000000000 +0100 +--- cmake/modules/FindIpod.cmake 2009-01-06 13:48:28.000000000 +0100 ++++ cmake/modules/FindIpod.cmake 2009-02-10 18:18:23.000000000 +0100 @@ -2,45 +2,35 @@ # Once done this will define # @@ -67,24 +66,9 @@ diff -urN amarok-2.0.1.1.old/cmake/modules/FindIpod.cmake amarok-2.0.1.1/cmake/m - -endif (IPOD_INCLUDE_DIR AND IPOD_LIBRARIES) +endif (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES) -diff -urN amarok-2.0.1.1.old/CMakeLists.txt amarok-2.0.1.1/CMakeLists.txt ---- amarok-2.0.1.1.old/CMakeLists.txt 2009-01-06 14:12:50.000000000 +0100 -+++ amarok-2.0.1.1/CMakeLists.txt 2009-02-10 18:22:23.000000000 +0100 -@@ -56,7 +56,10 @@ - macro_log_feature( GDK_FOUND "Gdk" "Support for artwork on iPod audio devices via GdkPixbuf" "http://developer.gnome.org/arch/imaging/gdkpixbuf.html" FALSE "2.0.x" "" ) - - macro_optional_find_package(Ipod) --macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.6.0" "" ) -+if(IPOD_FOUND) -+ macro_ensure_version("0.7.0" ${IPOD_VERSION} IPOD_0_7) -+endif(IPOD_FOUND) -+macro_log_feature( IPOD_FOUND "libgpod" "Support Apple iPod audio devices" "http://sourceforge.net/projects/gtkpod/" FALSE "0.7.0" "" ) - - #macro_optional_find_package(MySQL) - #macro_log_feature( MYSQL_FOUND "mysql" "Store Collection in a mysql database instead of a sqlite one" "http://www.mysql.com" FALSE "4.1.0" "" ) -diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt ---- amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt 2009-01-06 13:49:32.000000000 +0100 -+++ amarok-2.0.1.1/src/collection/ipodcollection/CMakeLists.txt 2009-02-10 22:22:01.000000000 +0100 + +--- src/collection/ipodcollection/CMakeLists.txt 2009-01-06 13:49:32.000000000 +0100 ++++ src/collection/ipodcollection/CMakeLists.txt 2009-02-10 22:22:01.000000000 +0100 @@ -17,7 +17,7 @@ handler ${GLIB2_INCLUDE_DIR} @@ -94,9 +78,9 @@ diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/CMakeLists.txt amarok ${CMAKE_CURRENT_BINARY_DIR}/../.. ${AMAROK_COLLECTION_SUPPORT_DIR} ${KDE4_INCLUDE_DIR} -diff -urN amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp ---- amarok-2.0.1.1.old/src/collection/ipodcollection/handler/IpodHandler.cpp 2009-01-06 13:49:32.000000000 +0100 -+++ amarok-2.0.1.1/src/collection/ipodcollection/handler/IpodHandler.cpp 2009-02-10 18:00:09.000000000 +0100 + +--- src/collection/ipodcollection/handler/IpodHandler.cpp 2009-01-06 13:49:32.000000000 +0100 ++++ src/collection/ipodcollection/handler/IpodHandler.cpp 2009-02-10 18:00:09.000000000 +0100 @@ -1339,73 +1339,12 @@ QFileInfo tempImageFileInfo( tempImageFile ); // get info for path QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path diff --git a/media-sound/amarok/files/disable_bindings_test.patch b/media-sound/amarok/files/disable_bindings_test.patch new file mode 100644 index 00000000000..27194a88395 --- /dev/null +++ b/media-sound/amarok/files/disable_bindings_test.patch @@ -0,0 +1,12 @@ +--- CMakeLists.txt 2009-03-24 16:51:54.000000000 +0200 ++++ CMakeLists.txt2 2009-03-24 17:06:57.000000000 +0200 +@@ -38,9 +38,6 @@ + + macro_log_feature( KDE4_FOUND "kdelibs" "The toolkit Amarok uses to build" "http://www.kde.org" TRUE "4.2.0" "" ) + +- find_package( QtScriptQtBindings REQUIRED ) +- macro_log_feature( QTSCRIPTQTBINDINGS_FOUND "qtscript-qt" "QtScript Qt Bindings" "http://code.google.com/p/qtscriptgenerator/" TRUE "" "" ) +- + add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) + + find_package(MySQLAmarok REQUIRED) |