Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

5 files changed, 53 insertions, 26 deletions

diff --git a/kde/ktorrent/.footprint.i686 b/kde/ktorrent/.footprint.i686
index b39793c30..5aa155da9 100644
--- a/kde/ktorrent/.footprint.i686
+++ b/kde/ktorrent/.footprint.i686
@@ -5,12 +5,14 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ktupnptest
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/kde4/
+-rwxr-xr-x	root/root	usr/lib/kde4/kio_magnet.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktbwschedulerplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktdownloadorderplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktinfowidgetplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktipfilterplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktlogviewerplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktmagnetgeneratorplugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/ktmediaplayerplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktscanfolderplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktscriptingplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktsearchplugin.so
@@ -22,26 +24,27 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/ktzeroconfplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_ktorrent.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_engine_ktorrent.so
-lrwxrwxrwx	root/root	usr/lib/libktcore.so -> libktcore.so.11
-lrwxrwxrwx	root/root	usr/lib/libktcore.so.11 -> libktcore.so.11.0.4
--rwxr-xr-x	root/root	usr/lib/libktcore.so.11.0.4
-lrwxrwxrwx	root/root	usr/lib/libktupnp.so -> libktupnp.so.4
-lrwxrwxrwx	root/root	usr/lib/libktupnp.so.4 -> libktupnp.so.4.0.2
--rwxr-xr-x	root/root	usr/lib/libktupnp.so.4.0.2
+lrwxrwxrwx	root/root	usr/lib/libktcore.so -> libktcore.so.12
+lrwxrwxrwx	root/root	usr/lib/libktcore.so.12 -> libktcore.so.12.0.1
+-rwxr-xr-x	root/root	usr/lib/libktcore.so.12.0.1
 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/ktorrent.desktop
+-rwxr-xr-x	root/root	usr/share/applications/kde4/ktorrent.desktop
 -rw-r--r--	root/root	usr/share/applications/ktorrent.desktop
 drwxr-xr-x	root/root	usr/share/apps/
 drwxr-xr-x	root/root	usr/share/apps/ktorrent/
+-rw-r--r--	root/root	usr/share/apps/ktorrent/ktbwschedulerpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktdownloadorderpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktmagnetgeneratorpluginui.rc
+-rw-r--r--	root/root	usr/share/apps/ktorrent/ktmediaplayerpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktorrent.notifyrc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktorrentui.rc
+-rw-r--r--	root/root	usr/share/apps/ktorrent/ktscriptingpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktsearchpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktshutdownpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktsyndicationpluginui.rc
+-rw-r--r--	root/root	usr/share/apps/ktorrent/kttorrentactivityui.rc
 drwxr-xr-x	root/root	usr/share/apps/ktorrent/opensearch/
 drwxr-xr-x	root/root	usr/share/apps/ktorrent/opensearch/bitenova/
 -rw-r--r--	root/root	usr/share/apps/ktorrent/opensearch/bitenova/opensearch.xml
@@ -131,6 +134,16 @@ drwxr-xr-x	root/root	usr/share/apps/ktorrent/www/mobile/
 -rw-r--r--	root/root	usr/share/apps/ktorrent/www/mobile/login.html
 -rw-r--r--	root/root	usr/share/apps/ktorrent/www/mobile/mobile.css
 -rw-r--r--	root/root	usr/share/apps/ktorrent/www/mobile/mobile.js
+drwxr-xr-x	root/root	usr/share/config.kcfg/
+-rw-r--r--	root/root	usr/share/config.kcfg/magnetsettings.kcfg
+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/en/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/ktorrent/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/ktorrent/common -> /usr/share/doc/kde/html/en/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/ktorrent/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/ktorrent/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/
@@ -251,6 +264,7 @@ drwxr-xr-x	root/root	usr/share/kde4/services/
 -rw-r--r--	root/root	usr/share/kde4/services/ktipfilterplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktlogviewerplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktmagnetgeneratorplugin.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/ktmediaplayerplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktscanfolderplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktscriptingplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktsearchplugin.desktop
diff --git a/kde/ktorrent/.footprint.x86_64 b/kde/ktorrent/.footprint.x86_64
index b39793c30..5aa155da9 100644
--- a/kde/ktorrent/.footprint.x86_64
+++ b/kde/ktorrent/.footprint.x86_64
@@ -5,12 +5,14 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ktupnptest
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/kde4/
+-rwxr-xr-x	root/root	usr/lib/kde4/kio_magnet.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktbwschedulerplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktdownloadorderplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktinfowidgetplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktipfilterplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktlogviewerplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktmagnetgeneratorplugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/ktmediaplayerplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktscanfolderplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktscriptingplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/ktsearchplugin.so
@@ -22,26 +24,27 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/ktzeroconfplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_ktorrent.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_engine_ktorrent.so
-lrwxrwxrwx	root/root	usr/lib/libktcore.so -> libktcore.so.11
-lrwxrwxrwx	root/root	usr/lib/libktcore.so.11 -> libktcore.so.11.0.4
--rwxr-xr-x	root/root	usr/lib/libktcore.so.11.0.4
-lrwxrwxrwx	root/root	usr/lib/libktupnp.so -> libktupnp.so.4
-lrwxrwxrwx	root/root	usr/lib/libktupnp.so.4 -> libktupnp.so.4.0.2
--rwxr-xr-x	root/root	usr/lib/libktupnp.so.4.0.2
+lrwxrwxrwx	root/root	usr/lib/libktcore.so -> libktcore.so.12
+lrwxrwxrwx	root/root	usr/lib/libktcore.so.12 -> libktcore.so.12.0.1
+-rwxr-xr-x	root/root	usr/lib/libktcore.so.12.0.1
 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/ktorrent.desktop
+-rwxr-xr-x	root/root	usr/share/applications/kde4/ktorrent.desktop
 -rw-r--r--	root/root	usr/share/applications/ktorrent.desktop
 drwxr-xr-x	root/root	usr/share/apps/
 drwxr-xr-x	root/root	usr/share/apps/ktorrent/
+-rw-r--r--	root/root	usr/share/apps/ktorrent/ktbwschedulerpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktdownloadorderpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktmagnetgeneratorpluginui.rc
+-rw-r--r--	root/root	usr/share/apps/ktorrent/ktmediaplayerpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktorrent.notifyrc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktorrentui.rc
+-rw-r--r--	root/root	usr/share/apps/ktorrent/ktscriptingpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktsearchpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktshutdownpluginui.rc
 -rw-r--r--	root/root	usr/share/apps/ktorrent/ktsyndicationpluginui.rc
+-rw-r--r--	root/root	usr/share/apps/ktorrent/kttorrentactivityui.rc
 drwxr-xr-x	root/root	usr/share/apps/ktorrent/opensearch/
 drwxr-xr-x	root/root	usr/share/apps/ktorrent/opensearch/bitenova/
 -rw-r--r--	root/root	usr/share/apps/ktorrent/opensearch/bitenova/opensearch.xml
@@ -131,6 +134,16 @@ drwxr-xr-x	root/root	usr/share/apps/ktorrent/www/mobile/
 -rw-r--r--	root/root	usr/share/apps/ktorrent/www/mobile/login.html
 -rw-r--r--	root/root	usr/share/apps/ktorrent/www/mobile/mobile.css
 -rw-r--r--	root/root	usr/share/apps/ktorrent/www/mobile/mobile.js
+drwxr-xr-x	root/root	usr/share/config.kcfg/
+-rw-r--r--	root/root	usr/share/config.kcfg/magnetsettings.kcfg
+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/en/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/en/ktorrent/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/en/ktorrent/common -> /usr/share/doc/kde/html/en/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/ktorrent/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/ktorrent/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/
@@ -251,6 +264,7 @@ drwxr-xr-x	root/root	usr/share/kde4/services/
 -rw-r--r--	root/root	usr/share/kde4/services/ktipfilterplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktlogviewerplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktmagnetgeneratorplugin.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/ktmediaplayerplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktscanfolderplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktscriptingplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/ktsearchplugin.desktop
diff --git a/kde/ktorrent/.md5sum.i686 b/kde/ktorrent/.md5sum.i686
index a4bbafa6b..f7ac70062 100644
--- a/kde/ktorrent/.md5sum.i686
+++ b/kde/ktorrent/.md5sum.i686
@@ -1,4 +1,4 @@
 1f25b94615b0bbfa0457c99fb20de3e6  httpserver.patch
-3a2e9a92d3a30d44b98ded0e4984ae8a  ktorrent-4.0.5.tar.bz2
+affadf7c7198e5aa430e91ab75800296  ktorrent-4.1.1.tar.bz2
 9905d1f19c8f35e7dd5db76fc9ca9a1d  ktorrent.desktop
 01f8b2275588a3e80f6783061d2b9377  ktorrent.png
diff --git a/kde/ktorrent/.md5sum.x86_64 b/kde/ktorrent/.md5sum.x86_64
index a4bbafa6b..f7ac70062 100644
--- a/kde/ktorrent/.md5sum.x86_64
+++ b/kde/ktorrent/.md5sum.x86_64
@@ -1,4 +1,4 @@
 1f25b94615b0bbfa0457c99fb20de3e6  httpserver.patch
-3a2e9a92d3a30d44b98ded0e4984ae8a  ktorrent-4.0.5.tar.bz2
+affadf7c7198e5aa430e91ab75800296  ktorrent-4.1.1.tar.bz2
 9905d1f19c8f35e7dd5db76fc9ca9a1d  ktorrent.desktop
 01f8b2275588a3e80f6783061d2b9377  ktorrent.png
diff --git a/kde/ktorrent/Pkgfile b/kde/ktorrent/Pkgfile
index 5b31db6c9..f5fdceb13 100755
--- a/kde/ktorrent/Pkgfile
+++ b/kde/ktorrent/Pkgfile
@@ -2,11 +2,11 @@
 # URL: http://ktorrent.org/
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on: libktorrent
-# Run on: libktorrent
+# Depends on: libktorrent, kdebase-workspace
+# Run on: libktorrent,kdebase-workspace
 
 name=ktorrent
-version=4.0.5
+version=4.1.1
 
 release=1
 source=(http://ktorrent.org/downloads/$version/$name-$version.tar.bz2 \
@@ -14,14 +14,13 @@ source=(http://ktorrent.org/downloads/$version/$name-$version.tar.bz2 \
 
 build() {
 	cd $name-$version
-#	patch -Np0 -i $SRC/httpserver.patch	
+	patch -Np0 -i $SRC/httpserver.patch	
 	cmake . -DCMAKE_BUILD_TYPE=Release \
-                -DCMAKE_INSTALL_PREFIX=/usr \
-                -DCMAKE_SKIP_RPATH=ON \
-                -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \
-                -DENABLE_MEDIAPLAYER_PLUGIN=false
-        make
-        make DESTDIR=$PKG install
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DENABLE_MEDIAPLAYER_PLUGIN=true
+	make
+	make DESTDIR=$PKG install
 	mkdir -p $PKG/usr/share/applications
 	install -m 644 $SRC/$name.desktop $PKG/usr/share/applications/
 	mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps/