summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2012-06-02 15:19:09 +0000
committerpiernov <piernov@piernov.org>2012-06-02 15:19:09 +0000
commit89dd9819399eeea14e8b689bb13b49ea814bbe54 (patch)
tree5ff16ca19a0bdb65423c57c071d1bd1ab9626fe5
parentf4ac21c517d0fee054f45be84f4a2867b05b2eb6 (diff)
downloadnutyx-extra-89dd9819399eeea14e8b689bb13b49ea814bbe54.tar.gz
nutyx-extra-89dd9819399eeea14e8b689bb13b49ea814bbe54.tar.bz2
nutyx-extra-89dd9819399eeea14e8b689bb13b49ea814bbe54.tar.xz
nutyx-extra-89dd9819399eeea14e8b689bb13b49ea814bbe54.zip
kde-runtime correction port
-rw-r--r--kde-runtime/.md5sum.i6861
-rw-r--r--kde-runtime/.md5sum.x86_641
-rwxr-xr-xkde-runtime/Pkgfile13
-rw-r--r--kde-runtime/rpc_fix-1.patch19
4 files changed, 27 insertions, 7 deletions
diff --git a/kde-runtime/.md5sum.i686 b/kde-runtime/.md5sum.i686
index e856cd477..27aae2903 100644
--- a/kde-runtime/.md5sum.i686
+++ b/kde-runtime/.md5sum.i686
@@ -1 +1,2 @@
aa22e3d4166e8cd0f149ac5dd5989301 kde-runtime-4.8.3.tar.xz
+0f604459c96d65e59d6b5d19022963ff rpc_fix-1.patch
diff --git a/kde-runtime/.md5sum.x86_64 b/kde-runtime/.md5sum.x86_64
index e856cd477..27aae2903 100644
--- a/kde-runtime/.md5sum.x86_64
+++ b/kde-runtime/.md5sum.x86_64
@@ -1 +1,2 @@
aa22e3d4166e8cd0f149ac5dd5989301 kde-runtime-4.8.3.tar.xz
+0f604459c96d65e59d6b5d19022963ff rpc_fix-1.patch
diff --git a/kde-runtime/Pkgfile b/kde-runtime/Pkgfile
index e8e69a991..9edd53552 100755
--- a/kde-runtime/Pkgfile
+++ b/kde-runtime/Pkgfile
@@ -2,16 +2,18 @@
# URL: http://www.kde.org
# Maintainer: KDE Project : https://projects.kde.org/projects/kde
# Packager: lesibel at free dot fr
-# Depends on: cmake,automoc4,kdelibs,kdepimlibs,openslp,ntrack,libssh,libcanberra
-# Run on: kdelibs,kdepimlibs,openslp,ntrack,libssh,libcanberra
+# Depends on: cmake,automoc4,kdelibs,kdepimlibs,openslp,ntrack,libssh,libcanberra,libtirpc
+# Run on: kdelibs,kdepimlibs,openslp,ntrack,libssh,libcanberra,libtirpc
name=kde-runtime
version=4.8.3
release=1
-source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.xz)
+source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.xz
+ rpc_fix-1.patch)
build() {
cd $name-*
+ patch -p1 < ../rpc_fix-1.patch
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \
@@ -19,12 +21,9 @@ build() {
-DKDE_DEFAULT_HOME=.kde \
-DSYSCONF_INSTALL_DIR=/etc \
-DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
-
+ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
make
mkdir -p $PKG/usr/share/locale/currency
make DESTDIR=$PKG install
rm $PKG/usr/share/icons/hicolor/index.theme
-
}
-
diff --git a/kde-runtime/rpc_fix-1.patch b/kde-runtime/rpc_fix-1.patch
new file mode 100644
index 000000000..7b0a8db75
--- /dev/null
+++ b/kde-runtime/rpc_fix-1.patch
@@ -0,0 +1,19 @@
+Submitted By: Ragnar Thomsen <rthomsen_at_linuxfromscratch_dot_org>
+Date: 2012-04-14
+Initial Package Version: 4.8.2
+Description: Fixes linking to libtirpc
+
+diff -Naur a/kioslave/nfs/CMakeLists.txt b/kioslave/nfs/CMakeLists.txt
+--- a/kioslave/nfs/CMakeLists.txt 2011-07-27 20:36:16.000000000 +0200
++++ b/kioslave/nfs/CMakeLists.txt 2012-04-04 14:26:09.899031662 +0200
+@@ -3,8 +3,8 @@
+
+ kde4_add_plugin(kio_nfs ${kio_nfs_PART_SRCS})
+
+-
+-target_link_libraries(kio_nfs ${KDE4_KIO_LIBS})
++include_directories(/usr/include/tirpc)
++target_link_libraries(kio_nfs ${KDE4_KIO_LIBS} tirpc)
+
+ install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR} )
+