summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsibel <lesibel at free dot fr>2010-07-31 07:53:36 +0200
committersibel <lesibel at free dot fr>2010-07-31 07:53:36 +0200
commita4b854a6f28e2d83999857aff49352466c511feb (patch)
tree3f90bc50a2ad5566d60272ecc33b48819327c2e3
parente25a18825cd42e54d6025e172911ce0e59515f96 (diff)
downloadnutyx-extra-a4b854a6f28e2d83999857aff49352466c511feb.tar.gz
nutyx-extra-a4b854a6f28e2d83999857aff49352466c511feb.tar.bz2
nutyx-extra-a4b854a6f28e2d83999857aff49352466c511feb.tar.xz
nutyx-extra-a4b854a6f28e2d83999857aff49352466c511feb.zip
maj de amarok#2.3.1-3 (avec support iPod)
-rw-r--r--kde/amarok/.footprint2
-rw-r--r--kde/amarok/.md5sum1
-rwxr-xr-xkde/amarok/Pkgfile10
-rw-r--r--kde/amarok/ipodcollection.patch15
4 files changed, 24 insertions, 4 deletions
diff --git a/kde/amarok/.footprint b/kde/amarok/.footprint
index 54e7e1d6a..f06555c5a 100644
--- a/kde/amarok/.footprint
+++ b/kde/amarok/.footprint
@@ -10,6 +10,7 @@ drwxr-xr-x root/root usr/lib/kde4/
-rwxr-xr-x root/root usr/lib/kde4/amarok_appletscript_simple_javascript.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_collection-audiocdcollection.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_collection-daapcollection.so
+-rwxr-xr-x root/root usr/lib/kde4/amarok_collection-ipodcollection.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_collection-mtpcollection.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_collection-mysqlecollection.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_collection-mysqlservercollection.so
@@ -554,6 +555,7 @@ drwxr-xr-x root/root usr/share/kde4/services/ServiceMenus/
-rw-r--r-- root/root usr/share/kde4/services/amarok.protocol
-rw-r--r-- root/root usr/share/kde4/services/amarok_collection-audiocdcollection.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok_collection-daapcollection.desktop
+-rw-r--r-- root/root usr/share/kde4/services/amarok_collection-ipodcollection.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok_collection-mtpcollection.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok_collection-mysqlecollection.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok_collection-mysqlservercollection.desktop
diff --git a/kde/amarok/.md5sum b/kde/amarok/.md5sum
index 35cb47f2b..06eef5c42 100644
--- a/kde/amarok/.md5sum
+++ b/kde/amarok/.md5sum
@@ -1,2 +1,3 @@
6679adaf5cc757b1515a9f03cdcb6066 amarok-2.3.1.tar.bz2
+42eec4ed38583fdbfc9d3e106d04c4cd ipodcollection.patch
5595074ec080ede76f366496f4fc0ff7 splash_screen.jpg
diff --git a/kde/amarok/Pkgfile b/kde/amarok/Pkgfile
index c56200304..7bf72115d 100755
--- a/kde/amarok/Pkgfile
+++ b/kde/amarok/Pkgfile
@@ -2,16 +2,18 @@
# URL: http://amarok.kde.org/fr
# Maintainer: NuTyX packager team
# Packager: lesibel at free dot fr
-# Depends on: kdelibs, taglib, taglib-extras, xine-lib, kdebase, k3b, kdemultimedia, libvisual, liblastfm, mysql, qtscriptgenerator, libmtp, liblastfm, loudmouth
+# Depends on: kdebase-runtime, mysql, qtscriptgenerator, taglib-extras, liblastfm, libgpod, libmtp, loudmouth
+#taglib, taglib-extras, xine-lib, kdebase, k3b, kdemultimedia, libvisual, liblastfm, mysql, qtscriptgenerator, libmtp, liblastfm, loudmouth, libgpod
name=amarok
version=2.3.1
-release=2
-source=(http://download.kde.org/stable/$name/$version/src/$name-$version.tar.bz2\
- splash_screen.jpg)
+release=3
+source=(http://download.kde.org/unstable/$name/$version/src/$name-$version.tar.bz2\
+ splash_screen.jpg ipodcollection.patch)
build() {
cd $name-$version
+ patch -p0 -i $SRC/ipodcollection.patch
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/kde/amarok/ipodcollection.patch b/kde/amarok/ipodcollection.patch
new file mode 100644
index 000000000..3782de803
--- /dev/null
+++ b/kde/amarok/ipodcollection.patch
@@ -0,0 +1,15 @@
+Index: index 2507cb7..dbeb161 100644
+===================================================================
+--- src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
++++ src/core-impl/collections/ipodcollection/handler/IpodHandler.cpp
+@@ -28,6 +28,10 @@
+ extern "C" {
+ #include <glib-object.h> // g_type_init
+ #ifdef GDK_FOUND
++// work around compile issue with glib >= 2.25
++#ifdef signals
++ #undef signals
++#endif
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #endif
+ }