summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extra/rdesktop/.md5sum1
-rwxr-xr-xextra/rdesktop/Pkgfile9
-rw-r--r--extra/rdesktop/rdesktop-send_physical_buttons.diff70
-rw-r--r--kde/amarok/.footprint152
-rw-r--r--kde/amarok/.md5sum3
-rwxr-xr-xkde/amarok/Pkgfile9
6 files changed, 231 insertions, 13 deletions
diff --git a/extra/rdesktop/.md5sum b/extra/rdesktop/.md5sum
index aa67a8401..cdeba13dc 100644
--- a/extra/rdesktop/.md5sum
+++ b/extra/rdesktop/.md5sum
@@ -1 +1,2 @@
c6fcbed7f0ad7e60ac5fcb2d324d8b16 rdesktop-1.6.0.tar.gz
+880d3aeac67b901e6bf44d1323374768 rdesktop-send_physical_buttons.diff
diff --git a/extra/rdesktop/Pkgfile b/extra/rdesktop/Pkgfile
index 9738a3668..32626a1ee 100755
--- a/extra/rdesktop/Pkgfile
+++ b/extra/rdesktop/Pkgfile
@@ -2,15 +2,18 @@
# URL: http://www.rdesktop.org/
# Maintainer: NutyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: xorg-libx11, libao, libsamplerate
+# Depends on: xorg-libx11, libao, libsamplerate, openssli
name=rdesktop
version=1.6.0
-release=1
-source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz)
+release=2
+source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz
+ rdesktop-send_physical_buttons.diff)
build() {
cd $name-$version
+ patch -i $SRC/rdesktop-send_physical_buttons.diff
+
./configure --prefix=/usr
make
make DESTDIR=$PKG install
diff --git a/extra/rdesktop/rdesktop-send_physical_buttons.diff b/extra/rdesktop/rdesktop-send_physical_buttons.diff
new file mode 100644
index 000000000..8e0f6cee7
--- /dev/null
+++ b/extra/rdesktop/rdesktop-send_physical_buttons.diff
@@ -0,0 +1,70 @@
+? aclocal.m4
+Index: rdesktop.c
+===================================================================
+RCS file: /cvsroot/rdesktop/rdesktop/rdesktop.c,v
+retrieving revision 1.163
+diff -u -r1.163 rdesktop.c
+--- rdesktop.c 5 Apr 2008 06:15:45 -0000 1.163
++++ rdesktop.c 5 Aug 2008 11:46:04 -0000
+@@ -73,6 +73,7 @@
+ int g_win_button_size = 0; /* If zero, disable single app mode */
+ RD_BOOL g_bitmap_compression = True;
+ RD_BOOL g_sendmotion = True;
++RD_BOOL g_send_physical_buttons = True;
+ RD_BOOL g_bitmap_cache = True;
+ RD_BOOL g_bitmap_cache_persist_enable = False;
+ RD_BOOL g_bitmap_cache_precache = True;
+@@ -152,6 +153,7 @@
+ fprintf(stderr, " -B: use BackingStore of X-server (if available)\n");
+ fprintf(stderr, " -e: disable encryption (French TS)\n");
+ fprintf(stderr, " -E: disable encryption from client to server\n");
++ fprintf(stderr, " -M: do not map logical mouse buttons to physical\n");
+ fprintf(stderr, " -m: do not send motion events\n");
+ fprintf(stderr, " -C: use private colour map\n");
+ fprintf(stderr, " -D: hide window manager decorations\n");
+@@ -450,7 +452,7 @@
+ #endif
+
+ while ((c = getopt(argc, argv,
+- VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
++ VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEMmzCDKS:T:NX:a:x:Pr:045h?")) != -1)
+ {
+ switch (c)
+ {
+@@ -584,6 +586,9 @@
+ case 'E':
+ g_packet_encryption = False;
+ break;
++ case 'M':
++ g_send_physical_buttons = False;
++ break;
+ case 'm':
+ g_sendmotion = False;
+ break;
+Index: xwin.c
+===================================================================
+RCS file: /cvsroot/rdesktop/rdesktop/xwin.c,v
+retrieving revision 1.235
+diff -u -r1.235 xwin.c
+--- xwin.c 11 Jul 2008 03:51:23 -0000 1.235
++++ xwin.c 5 Aug 2008 11:46:06 -0000
+@@ -36,6 +36,7 @@
+ extern int g_ypos;
+ extern int g_pos;
+ extern RD_BOOL g_sendmotion;
++extern RD_BOOL g_send_physical_buttons;
+ extern RD_BOOL g_fullscreen;
+ extern RD_BOOL g_grab_keyboard;
+ extern RD_BOOL g_hide_decorations;
+@@ -2190,7 +2191,8 @@
+ receive physical buttons (true in mstsc as well) and
+ logical button behavior depends on the remote desktop's own
+ mouse settings */
+- xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1];
++ if (g_send_physical_buttons)
++ xevent.xbutton.button = g_pointer_log_to_phys_map[xevent.xbutton.button - 1];
+ button = xkeymap_translate_button(xevent.xbutton.button);
+ if (button == 0)
+ return;
+
+
diff --git a/kde/amarok/.footprint b/kde/amarok/.footprint
index f06555c5a..1a4170c63 100644
--- a/kde/amarok/.footprint
+++ b/kde/amarok/.footprint
@@ -19,6 +19,7 @@ drwxr-xr-x root/root usr/lib/kde4/
-rwxr-xr-x root/root usr/lib/kde4/amarok_context_applet_albums.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_context_applet_currenttrack.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_context_applet_info.so
+-rwxr-xr-x root/root usr/lib/kde4/amarok_context_applet_labels.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_context_applet_lyrics.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_context_applet_photos.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_context_applet_similarArtists.so
@@ -27,6 +28,7 @@ drwxr-xr-x root/root usr/lib/kde4/
-rwxr-xr-x root/root usr/lib/kde4/amarok_context_applet_wikipedia.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_data_engine_current.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_data_engine_info.so
+-rwxr-xr-x root/root usr/lib/kde4/amarok_data_engine_labels.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_data_engine_lyrics.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_data_engine_photos.so
-rwxr-xr-x root/root usr/lib/kde4/amarok_data_engine_similarArtists.so
@@ -67,6 +69,7 @@ drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
drwxr-xr-x root/root usr/share/applications/kde4/
-rw-r--r-- root/root usr/share/applications/kde4/amarok.desktop
+-rw-r--r-- root/root usr/share/applications/kde4/amarok_containers.desktop
drwxr-xr-x root/root usr/share/apps/
drwxr-xr-x root/root usr/share/apps/amarok/
-rw-r--r-- root/root usr/share/apps/amarok/amarok.notifyrc
@@ -76,6 +79,7 @@ drwxr-xr-x root/root usr/share/apps/amarok/data/
-rw-r--r-- root/root usr/share/apps/amarok/data/InfoParserLoading.html
-rw-r--r-- root/root usr/share/apps/amarok/data/WikipediaCustomStyle.css
-rw-r--r-- root/root usr/share/apps/amarok/data/bullet.gif
+-rw-r--r-- root/root usr/share/apps/amarok/data/first_run_jingle.ogg
-rw-r--r-- root/root usr/share/apps/amarok/data/hover_info_template.html
-rw-r--r-- root/root usr/share/apps/amarok/data/info_frontpage.html
drwxr-xr-x root/root usr/share/apps/amarok/icons/
@@ -128,9 +132,6 @@ drwxr-xr-x root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/filename-underscore-amarok.png
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/filename-year-amarok.png
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/lastfm-loved-radio-amarok.png
--rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-friends-amarok.png
--rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-neighbours-amarok.png
--rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-tags-amarok.png
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/lastfm-neighbour-radio-amarok.png
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/lastfm-personal-radio-amarok.png
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/16x16/actions/lastfm-recommended-radio-amarok.png
@@ -233,6 +234,11 @@ drwxr-xr-x root/root usr/share/apps/amarok/icons/hicolor/22x22/actions/
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-mp3tunes-amarok.png
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-opml-amarok.png
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-scripted-amarok.png
+drwxr-xr-x root/root usr/share/apps/amarok/icons/hicolor/24x24/
+drwxr-xr-x root/root usr/share/apps/amarok/icons/hicolor/24x24/actions/
+-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-friends-amarok.png
+-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-neighbours-amarok.png
+-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/24x24/actions/lastfm-my-tags-amarok.png
drwxr-xr-x root/root usr/share/apps/amarok/icons/hicolor/32x32/
drwxr-xr-x root/root usr/share/apps/amarok/icons/hicolor/32x32/actions/
-rw-r--r-- root/root usr/share/apps/amarok/icons/hicolor/32x32/actions/amarok_artist.png
@@ -508,6 +514,144 @@ drwxr-xr-x root/root usr/share/dbus-1/interfaces/
-rw-r--r-- root/root usr/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
-rw-r--r-- root/root usr/share/dbus-1/interfaces/org.kde.amarok.Collection.xml
-rw-r--r-- root/root usr/share/dbus-1/interfaces/org.kde.amarok.SqlCollection.xml
+drwxr-xr-x root/root usr/share/doc/
+drwxr-xr-x root/root usr/share/doc/kde/
+drwxr-xr-x root/root usr/share/doc/kde/html/
+drwxr-xr-x root/root usr/share/doc/kde/html/de/
+drwxr-xr-x root/root usr/share/doc/kde/html/de/amarok/
+lrwxrwxrwx root/root usr/share/doc/kde/html/de/amarok/common -> /usr/share/doc/kde/html/de/common
+-rw-r--r-- root/root usr/share/doc/kde/html/de/amarok/index.cache.bz2
+-rw-r--r-- root/root usr/share/doc/kde/html/de/amarok/index.docbook
+drwxr-xr-x root/root usr/share/doc/kde/html/en/
+drwxr-xr-x root/root usr/share/doc/kde/html/en/amarok/
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1center.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1contextviewconfig.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1covermanager.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1dynamicplaylist.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1internetservices.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1ipod.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1left.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1pleditor.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1popup.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1rating.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1right.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1scriptmanager.png
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/Amarok2.1svn965006.png
+lrwxrwxrwx root/root usr/share/doc/kde/html/en/amarok/common -> /usr/share/doc/kde/html/en/common
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/index.cache.bz2
+-rw-r--r-- root/root usr/share/doc/kde/html/en/amarok/index.docbook
+drwxr-xr-x root/root usr/share/doc/kde/html/es/
+drwxr-xr-x root/root usr/share/doc/kde/html/es/amarok/
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/add_dynamic.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/advanced.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/amarok_playlist.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/analyzer.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/buttons.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/collection.png
+lrwxrwxrwx root/root usr/share/doc/kde/html/es/amarok/common -> /usr/share/doc/kde/html/es/common
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/config.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/config_appearance.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/config_collection.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/config_engine.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/config_general.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/config_osd.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/config_playback.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/config_scrobbler.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/coverman.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/dynamic_bar.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/dynamic_settings.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/equalizer.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/faq.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/file_browser.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/index.cache.bz2
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/index.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/logo.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/media_device.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/menubar.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/musicbrainz.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/pl_tip1.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/play_list.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/player_window.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/playlist_browser.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/playlist_window.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/queue_manager.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/quick.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/requirements.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/rmb_menu.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/script_manager.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/status_bar.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/tab_lyrics.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/tab_music.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/tab_wiki.png
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/using.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/es/amarok/vis_window.png
+drwxr-xr-x root/root usr/share/doc/kde/html/fr/
+drwxr-xr-x root/root usr/share/doc/kde/html/fr/amarok/
+-rw-r--r-- root/root usr/share/doc/kde/html/fr/amarok/advanced.docbook
+lrwxrwxrwx root/root usr/share/doc/kde/html/fr/amarok/common -> /usr/share/doc/kde/html/fr/common
+-rw-r--r-- root/root usr/share/doc/kde/html/fr/amarok/config.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/fr/amarok/faq.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/fr/amarok/index.cache.bz2
+-rw-r--r-- root/root usr/share/doc/kde/html/fr/amarok/index.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/fr/amarok/quick.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/fr/amarok/requirements.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/fr/amarok/using.docbook
+drwxr-xr-x root/root usr/share/doc/kde/html/it/
+drwxr-xr-x root/root usr/share/doc/kde/html/it/amarok/
+-rw-r--r-- root/root usr/share/doc/kde/html/it/amarok/advanced.docbook
+lrwxrwxrwx root/root usr/share/doc/kde/html/it/amarok/common -> /usr/share/doc/kde/html/it/common
+-rw-r--r-- root/root usr/share/doc/kde/html/it/amarok/config.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/it/amarok/faq.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/it/amarok/index.cache.bz2
+-rw-r--r-- root/root usr/share/doc/kde/html/it/amarok/index.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/it/amarok/quick.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/it/amarok/requirements.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/it/amarok/using.docbook
+drwxr-xr-x root/root usr/share/doc/kde/html/pt/
+drwxr-xr-x root/root usr/share/doc/kde/html/pt/amarok/
+lrwxrwxrwx root/root usr/share/doc/kde/html/pt/amarok/common -> /usr/share/doc/kde/html/pt/common
+-rw-r--r-- root/root usr/share/doc/kde/html/pt/amarok/index.cache.bz2
+-rw-r--r-- root/root usr/share/doc/kde/html/pt/amarok/index.docbook
+drwxr-xr-x root/root usr/share/doc/kde/html/pt_BR/
+drwxr-xr-x root/root usr/share/doc/kde/html/pt_BR/amarok/
+-rw-r--r-- root/root usr/share/doc/kde/html/pt_BR/amarok/advanced.docbook
+lrwxrwxrwx root/root usr/share/doc/kde/html/pt_BR/amarok/common -> /usr/share/doc/kde/html/pt_BR/common
+-rw-r--r-- root/root usr/share/doc/kde/html/pt_BR/amarok/config.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/pt_BR/amarok/faq.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/pt_BR/amarok/index.cache.bz2
+-rw-r--r-- root/root usr/share/doc/kde/html/pt_BR/amarok/index.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/pt_BR/amarok/quick.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/pt_BR/amarok/requirements.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/pt_BR/amarok/using.docbook
+drwxr-xr-x root/root usr/share/doc/kde/html/sv/
+drwxr-xr-x root/root usr/share/doc/kde/html/sv/amarok/
+-rw-r--r-- root/root usr/share/doc/kde/html/sv/amarok/advanced.docbook
+lrwxrwxrwx root/root usr/share/doc/kde/html/sv/amarok/common -> /usr/share/doc/kde/html/sv/common
+-rw-r--r-- root/root usr/share/doc/kde/html/sv/amarok/config.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/sv/amarok/faq.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/sv/amarok/index.cache.bz2
+-rw-r--r-- root/root usr/share/doc/kde/html/sv/amarok/index.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/sv/amarok/quick.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/sv/amarok/requirements.docbook
+-rw-r--r-- root/root usr/share/doc/kde/html/sv/amarok/using.docbook
+drwxr-xr-x root/root usr/share/doc/kde/html/uk/
+drwxr-xr-x root/root usr/share/doc/kde/html/uk/amarok/
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1center.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1contextviewconfig.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1covermanager.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1dynamicplaylist.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1internetservices.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1ipod.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1left.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1pleditor.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1popup.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1rating.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1right.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1scriptmanager.png
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/Amarok2.1svn965006.png
+lrwxrwxrwx root/root usr/share/doc/kde/html/uk/amarok/common -> /usr/share/doc/kde/html/uk/common
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/index.cache.bz2
+-rw-r--r-- root/root usr/share/doc/kde/html/uk/amarok/index.docbook
drwxr-xr-x root/root usr/share/icons/
drwxr-xr-x root/root usr/share/icons/hicolor/
drwxr-xr-x root/root usr/share/icons/hicolor/128x128/
@@ -536,6 +680,7 @@ drwxr-xr-x root/root usr/share/kde4/services/ServiceMenus/
-rw-r--r-- root/root usr/share/kde4/services/amarok-context-applet-albums.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-context-applet-currenttrack.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-context-applet-info.desktop
+-rw-r--r-- root/root usr/share/kde4/services/amarok-context-applet-labels.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-context-applet-lyrics.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-context-applet-photos.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-context-applet-similarArtists.desktop
@@ -544,6 +689,7 @@ drwxr-xr-x root/root usr/share/kde4/services/ServiceMenus/
-rw-r--r-- root/root usr/share/kde4/services/amarok-context-applet-wikipedia.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-data-engine-current.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-data-engine-info.desktop
+-rw-r--r-- root/root usr/share/kde4/services/amarok-data-engine-labels.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-data-engine-lyrics.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-data-engine-photos.desktop
-rw-r--r-- root/root usr/share/kde4/services/amarok-data-engine-similarArtists.desktop
diff --git a/kde/amarok/.md5sum b/kde/amarok/.md5sum
index 06eef5c42..fa9faaafa 100644
--- a/kde/amarok/.md5sum
+++ b/kde/amarok/.md5sum
@@ -1,3 +1,2 @@
-6679adaf5cc757b1515a9f03cdcb6066 amarok-2.3.1.tar.bz2
-42eec4ed38583fdbfc9d3e106d04c4cd ipodcollection.patch
+4e03dc009f8b44d9b8dfb5f6d1034081 amarok-2.3.2.tar.bz2
5595074ec080ede76f366496f4fc0ff7 splash_screen.jpg
diff --git a/kde/amarok/Pkgfile b/kde/amarok/Pkgfile
index abf15c47e..51c6d1410 100755
--- a/kde/amarok/Pkgfile
+++ b/kde/amarok/Pkgfile
@@ -6,14 +6,13 @@
#taglib, taglib-extras, xine-lib, kdebase, k3b, kdemultimedia, libvisual, liblastfm, mysql, qtscriptgenerator, libmtp, liblastfm, loudmouth, libgpod
name=amarok
-version=2.3.1
-release=3
-source=(http://download.kde.org/unstable/$name/$version/src/$name-$version.tar.bz2\
- splash_screen.jpg ipodcollection.patch)
+version=2.3.2
+release=1
+source=(ftp://ftp.kde.org/pub/kde/stable/$name/$version/src/$name-$version.tar.bz2
+ splash_screen.jpg)
build() {
cd $name-$version
- patch -p0 -i $SRC/ipodcollection.patch
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \