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

11 files changed, 5 insertions, 88 deletions

diff --git a/kde/ktorrent/Pkgfile b/kde/ktorrent/Pkgfile
index a42d8e637..15f37f08d 100755
--- a/kde/ktorrent/Pkgfile
+++ b/kde/ktorrent/Pkgfile
@@ -9,7 +9,7 @@ version=4.0.3
 
 release=1
 source=(http://ktorrent.org/downloads/$version/$name-$version.tar.bz2 \
-	$name.png  $name.desktop httpserver.patch)
+	http://nutyx.meticul.eu/files/patchs/$name/{$name.png,$name.desktop,httpserver.patch})
 
 build() {
 	cd $name-$version
diff --git a/kde/ktorrent/httpserver.patch b/kde/ktorrent/httpserver.patch
deleted file mode 100644
index 71c616db0..000000000
--- a/kde/ktorrent/httpserver.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/webinterface/httpserver.cpp.old
-+++ plugins/webinterface/httpserver.cpp
-@@ -29,6 +29,7 @@
- #include <ktemporaryfile.h>
- #include <k3streamsocket.h>
- #include <k3resolver.h>
-+#include <time.h>
- 
- #include <qfileinfo.h>
- #include <qstringlist.h> 
diff --git a/kde/ktorrent/ktorrent.desktop b/kde/ktorrent/ktorrent.desktop
deleted file mode 100755
index 9ac725332..000000000
--- a/kde/ktorrent/ktorrent.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=le ktorrent
-Comment=KDE Client bitorrent
-Exec=ktorrent
-Icon=ktorrent
-Terminal=false
-Type=Application
-Categories=Application;Internet;
-StartupNotify=true
-
diff --git a/kde/ktorrent/ktorrent.install b/kde/ktorrent/ktorrent.install
deleted file mode 100644
index 3884b350d..000000000
--- a/kde/ktorrent/ktorrent.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-        update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/kde/ktorrent/ktorrent.png b/kde/ktorrent/ktorrent.png
deleted file mode 100755
index 6746d8d1d..000000000
--- a/kde/ktorrent/ktorrent.png
+++ /dev/null
diff --git a/kde/ktorrent/post-install b/kde/ktorrent/post-install
new file mode 100644
index 000000000..e66be6d25
--- /dev/null
+++ b/kde/ktorrent/post-install
@@ -0,0 +1,2 @@
+xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+update-mime-database usr/share/mime &> /dev/null
diff --git a/kde/oxygen-icons/NuTyXlogo.png b/kde/oxygen-icons/NuTyXlogo.png
deleted file mode 100755
index b76aba549..000000000
--- a/kde/oxygen-icons/NuTyXlogo.png
+++ /dev/null
diff --git a/kde/oxygen-icons/Pkgfile b/kde/oxygen-icons/Pkgfile
index 8d7dad498..4cf745915 100755
--- a/kde/oxygen-icons/Pkgfile
+++ b/kde/oxygen-icons/Pkgfile
@@ -8,7 +8,7 @@ name=oxygen-icons
 version=4.5.2
 release=1
 source=( ftp://kde.mirrors.pair.com/stable/$version/src/$name-$version.tar.bz2 \
-	NuTyXlogo.png)
+	http://nutyx.meticul.eu/files/patchs/$file/NuTyXlogo.png)
 
 build() {
 	cd $name-$version
diff --git a/kde/redland/librdf_storage_register_factory.patch b/kde/redland/librdf_storage_register_factory.patch
deleted file mode 100644
index 9d99bbee2..000000000
--- a/kde/redland/librdf_storage_register_factory.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Dave Beckett <dave@dajobe.org>
-Date: Fri, 18 Dec 2009 16:03:31 +0000 (+0000)
-Subject: Add librdf.la to librdf_storage_virtuoso_la_LIBADD
-X-Git-Url: http://git.librdf.org/view?p=librdf.git;a=commitdiff_plain;h=bfeaca74108e5a1e0c8143b2dc4c36f23e78f311;hp=5dfe6dc3361cccdf47a9db32bfa8374d405ad1e4
-
-Add librdf.la to librdf_storage_virtuoso_la_LIBADD
----
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 6bb4aa0..fcbe149 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -152,7 +152,7 @@ if STORAGE_VIRTUOSO
- plugin_LTLIBRARIES += librdf_storage_virtuoso.la 
- librdf_storage_virtuoso_la_SOURCES = rdf_storage_virtuoso.c rdf_storage_virtuoso_internal.h
- librdf_storage_virtuoso_la_CPPFLAGS = @ODBC_CFLAGS@
--librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@
-+librdf_storage_virtuoso_la_LIBADD = @ODBC_LIBS@ librdf.la
- librdf_storage_virtuoso_la_LDFLAGS = -module -avoid-version
- endif
- 
diff --git a/kde/yawp/Pkgfile b/kde/yawp/Pkgfile
index d8d7e1cf6..415e24b6f 100755
--- a/kde/yawp/Pkgfile
+++ b/kde/yawp/Pkgfile
@@ -8,7 +8,7 @@ name=yawp
 version=0.3.2
 release=2
 source=(http://downloads.sourceforge.net/yawp/yawp-$version.tar.bz2\
-	yawp-0.3.2-gcc-01.patch)
+	http://nutyx.meticul.eu/files/patchs/$name/$name-$version-gcc-01.patch)
 
 build() {
 	cd $name-$version
diff --git a/kde/yawp/yawp-0.3.2-gcc-01.patch b/kde/yawp/yawp-0.3.2-gcc-01.patch
deleted file mode 100644
index cc72ebce6..000000000
--- a/kde/yawp/yawp-0.3.2-gcc-01.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- yawp-0.3.2/applet/countrymap.cpp	2009-12-06 21:08:29.000000000 +0100
-+++ yawp-0.3.2.new/applet/countrymap.cpp	2010-05-07 18:11:21.000000000 +0200
-@@ -47,7 +47,7 @@
- const QString CountryMap::sFlagTemplate("l10n/%1/flag.png");
- 
- 
--CountryMap::CountryMap *
-+CountryMap *
- CountryMap::instance()
- {
- 	QMutexLocker locker( &singeltonMutex );
-@@ -210,7 +210,7 @@
- 
- /******************************************************************************/
- 
--UsStatesMap::UsStatesMap *
-+UsStatesMap *
- UsStatesMap::instance()
- {
- 	QMutexLocker locker( &singeltonMutex );
---- yawp-0.3.2/applet/ionlistmodel.cpp	2009-12-06 21:08:29.000000000 +0100
-+++ yawp-0.3.2.new/applet/ionlistmodel.cpp	2010-05-07 18:12:09.000000000 +0200
-@@ -45,7 +45,7 @@
- 	return bReturnVal;
- }
- 
--IonListModel::IonListModel *
-+IonListModel *
- IonListModel::instance()
- {
- 	QMutexLocker locker( &m_singeltonMutex );