summaryrefslogtreecommitdiffstats
path: root/kde
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-05-08 23:36:24 +0200
committertnut <thierryn1 at hispeed dot ch>2010-05-08 23:36:24 +0200
commit25b3b763e5f74b0336c489856a14bd047ad98a6c (patch)
treec26ec4a12bb44eaeaf6071cea4762887677b3567 /kde
parent6d0a2726a2d82e94fc0830f5c42bfbeb66648f0e (diff)
parentd2d6e1bad553b10ba46b75d45409d245b647980a (diff)
downloadnutyx-extra-25b3b763e5f74b0336c489856a14bd047ad98a6c.tar.gz
nutyx-extra-25b3b763e5f74b0336c489856a14bd047ad98a6c.tar.bz2
nutyx-extra-25b3b763e5f74b0336c489856a14bd047ad98a6c.tar.xz
nutyx-extra-25b3b763e5f74b0336c489856a14bd047ad98a6c.zip
Merge commit 'lesibel/master'NuTyX2010-beta-3
Diffstat (limited to 'kde')
-rwxr-xr-xkde/ktorrent/Pkgfile6
-rw-r--r--kde/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch11
2 files changed, 4 insertions, 13 deletions
diff --git a/kde/ktorrent/Pkgfile b/kde/ktorrent/Pkgfile
index cdb2cff3a..d371dce05 100755
--- a/kde/ktorrent/Pkgfile
+++ b/kde/ktorrent/Pkgfile
@@ -6,9 +6,11 @@
name=ktorrent
version=3.3.4
+
release=1
source=(http://ktorrent.org/downloads/$version/$name-$version.tar.bz2 \
$name.png $name.desktop httpserver.patch)
+
build() {
cd $name-$version
patch -Np0 -i $SRC/httpserver.patch
@@ -20,9 +22,9 @@ build() {
make
make DESTDIR=$PKG install
mkdir -p $PKG/usr/share/applications
- install -m 644 ../$name.desktop $PKG/usr/share/applications/
+ install -m 644 $SRC/$name.desktop $PKG/usr/share/applications/
mkdir -p $PKG/usr/share/icons/hicolor/48x48/apps/
- install -m 644 ../$name.png $PKG/usr/share/icons/hicolor/48x48/apps/
+ install -m 644 $SRC/$name.png $PKG/usr/share/icons/hicolor/48x48/apps/
}
diff --git a/kde/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch b/kde/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch
deleted file mode 100644
index 01193d734..000000000
--- a/kde/qtscriptgenerator/qtscriptgenerator.gcc-4.4.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
---- generator.orig/parser/rpp/pp.h 2008-12-05 11:01:44.000000000 +0100
-+++ generator/parser/rpp/pp.h 2008-12-13 10:42:22.000000000 +0100
-@@ -30,6 +30,7 @@
- #include <cctype>
-
- #include <fcntl.h>
-+#include <cstdio>
-
- #ifdef HAVE_MMAP
- # include <sys/mman.h> \ No newline at end of file