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

4 files changed, 19 insertions, 12 deletions

diff --git a/kde/libktorrent/.footprint.x86_64 b/kde/libktorrent/.footprint.x86_64
index 88eb156f6..22b5e8629 100644
--- a/kde/libktorrent/.footprint.x86_64
+++ b/kde/libktorrent/.footprint.x86_64
@@ -9,7 +9,6 @@ drwxr-xr-x	root/root	usr/include/libktorrent/bcodec/
 drwxr-xr-x	root/root	usr/include/libktorrent/datachecker/
 -rw-r--r--	root/root	usr/include/libktorrent/datachecker/datachecker.h
 -rw-r--r--	root/root	usr/include/libktorrent/datachecker/datacheckerjob.h
--rw-r--r--	root/root	usr/include/libktorrent/datachecker/datacheckerlistener.h
 -rw-r--r--	root/root	usr/include/libktorrent/datachecker/datacheckerthread.h
 -rw-r--r--	root/root	usr/include/libktorrent/datachecker/multidatachecker.h
 -rw-r--r--	root/root	usr/include/libktorrent/datachecker/singledatachecker.h
@@ -93,6 +92,7 @@ drwxr-xr-x	root/root	usr/include/libktorrent/net/
 -rw-r--r--	root/root	usr/include/libktorrent/net/poll.h
 -rw-r--r--	root/root	usr/include/libktorrent/net/portlist.h
 -rw-r--r--	root/root	usr/include/libktorrent/net/reverseresolver.h
+-rw-r--r--	root/root	usr/include/libktorrent/net/serversocket.h
 -rw-r--r--	root/root	usr/include/libktorrent/net/socket.h
 -rw-r--r--	root/root	usr/include/libktorrent/net/socketdevice.h
 -rw-r--r--	root/root	usr/include/libktorrent/net/socketgroup.h
@@ -117,6 +117,7 @@ drwxr-xr-x	root/root	usr/include/libktorrent/peer/
 -rw-r--r--	root/root	usr/include/libktorrent/peer/peerprotocolextension.h
 -rw-r--r--	root/root	usr/include/libktorrent/peer/peeruploader.h
 -rw-r--r--	root/root	usr/include/libktorrent/peer/serverauthenticate.h
+-rw-r--r--	root/root	usr/include/libktorrent/peer/superseeder.h
 -rw-r--r--	root/root	usr/include/libktorrent/peer/utmetadata.h
 -rw-r--r--	root/root	usr/include/libktorrent/peer/utpex.h
 drwxr-xr-x	root/root	usr/include/libktorrent/torrent/
@@ -133,6 +134,7 @@ drwxr-xr-x	root/root	usr/include/libktorrent/torrent/
 -rw-r--r--	root/root	usr/include/libktorrent/torrent/torrentcontrol.h
 -rw-r--r--	root/root	usr/include/libktorrent/torrent/torrentcreator.h
 -rw-r--r--	root/root	usr/include/libktorrent/torrent/torrentfile.h
+-rw-r--r--	root/root	usr/include/libktorrent/torrent/torrentfilestream.h
 -rw-r--r--	root/root	usr/include/libktorrent/torrent/torrentstats.h
 -rw-r--r--	root/root	usr/include/libktorrent/torrent/uploader.h
 drwxr-xr-x	root/root	usr/include/libktorrent/tracker/
@@ -143,6 +145,9 @@ drwxr-xr-x	root/root	usr/include/libktorrent/tracker/
 -rw-r--r--	root/root	usr/include/libktorrent/tracker/trackermanager.h
 -rw-r--r--	root/root	usr/include/libktorrent/tracker/udptracker.h
 -rw-r--r--	root/root	usr/include/libktorrent/tracker/udptrackersocket.h
+drwxr-xr-x	root/root	usr/include/libktorrent/upnp/
+-rw-r--r--	root/root	usr/include/libktorrent/upnp/upnpmcastsocket.h
+-rw-r--r--	root/root	usr/include/libktorrent/upnp/upnprouter.h
 drwxr-xr-x	root/root	usr/include/libktorrent/util/
 -rw-r--r--	root/root	usr/include/libktorrent/util/array.h
 -rw-r--r--	root/root	usr/include/libktorrent/util/autorotatelogjob.h
@@ -160,8 +165,10 @@ drwxr-xr-x	root/root	usr/include/libktorrent/util/
 -rw-r--r--	root/root	usr/include/libktorrent/util/logsystemmanager.h
 -rw-r--r--	root/root	usr/include/libktorrent/util/pipe.h
 -rw-r--r--	root/root	usr/include/libktorrent/util/ptrmap.h
+-rw-r--r--	root/root	usr/include/libktorrent/util/resourcemanager.h
 -rw-r--r--	root/root	usr/include/libktorrent/util/sha1hash.h
 -rw-r--r--	root/root	usr/include/libktorrent/util/sha1hashgen.h
+-rw-r--r--	root/root	usr/include/libktorrent/util/signalcatcher.h
 -rw-r--r--	root/root	usr/include/libktorrent/util/timer.h
 -rw-r--r--	root/root	usr/include/libktorrent/util/urlencoder.h
 -rw-r--r--	root/root	usr/include/libktorrent/util/waitjob.h
@@ -179,9 +186,9 @@ drwxr-xr-x	root/root	usr/include/libktorrent/utp/
 -rw-r--r--	root/root	usr/include/libktorrent/utp/utpsocket.h
 -rw-r--r--	root/root	usr/include/libktorrent/version.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libktorrent.so -> libktorrent.so.2
-lrwxrwxrwx	root/root	usr/lib/libktorrent.so.2 -> libktorrent.so.2.0.4
--rwxr-xr-x	root/root	usr/lib/libktorrent.so.2.0.4
+lrwxrwxrwx	root/root	usr/lib/libktorrent.so -> libktorrent.so.3
+lrwxrwxrwx	root/root	usr/lib/libktorrent.so.3 -> libktorrent.so.3.0.1
+-rwxr-xr-x	root/root	usr/lib/libktorrent.so.3.0.1
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/apps/
 drwxr-xr-x	root/root	usr/share/apps/cmake/
diff --git a/kde/libktorrent/.md5sum.i686 b/kde/libktorrent/.md5sum.i686
index 42008cab4..7089ab94f 100644
--- a/kde/libktorrent/.md5sum.i686
+++ b/kde/libktorrent/.md5sum.i686
@@ -1 +1 @@
-31f0397a28557220ce38fe2c8630826d  libktorrent-1.0.5-3.tar.bz2
+96de8dd6d6cea4255ce946bb4cd69836  libktorrent-1.1.1.tar.bz2
diff --git a/kde/libktorrent/.md5sum.x86_64 b/kde/libktorrent/.md5sum.x86_64
index 42008cab4..7089ab94f 100644
--- a/kde/libktorrent/.md5sum.x86_64
+++ b/kde/libktorrent/.md5sum.x86_64
@@ -1 +1 @@
-31f0397a28557220ce38fe2c8630826d  libktorrent-1.0.5-3.tar.bz2
+96de8dd6d6cea4255ce946bb4cd69836  libktorrent-1.1.1.tar.bz2
diff --git a/kde/libktorrent/Pkgfile b/kde/libktorrent/Pkgfile
index b594fca0d..b8cdbec6a 100755
--- a/kde/libktorrent/Pkgfile
+++ b/kde/libktorrent/Pkgfile
@@ -2,17 +2,17 @@
 # URL: http://ktorrent.org/
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on: qca, xorg-libxft, kdebase-runtime, kdebase-workspace, taglib, hicolor-icon-theme, kdepimlibs
-# Run on: qca,xorg-libxft,kdebase-runtime,kdebase-workspace,taglib,hicolor-icon-theme,kdepimlibs
+# Depends on: qca, xorg-libxft,kdelibs,taglib,hicolor-icon-theme,kdepimlibs
+# Run on: qca,xorg-libxft,kdelibs,taglib,hicolor-icon-theme,kdepimlibs
 
 name=libktorrent
-version=1.0.5
-versionktorrent=4.0.5
+version=1.1.1
+versionktorrent=4.1.1
 release=1
-source=(http://ktorrent.org/downloads/$versionktorrent/$name-$version-3.tar.bz2)
+source=(http://ktorrent.org/downloads/$versionktorrent/$name-$version.tar.bz2)
 
 build() {
-	cd $name-$version-3
+	cd $name-*
 	cmake . -DCMAKE_BUILD_TYPE=Release \
                 -DCMAKE_INSTALL_PREFIX=/usr \
                 -DCMAKE_SKIP_RPATH=ON