summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-05 08:58:16 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-01-17 09:40:16 +0700
commit34e5069ef0d4f6474a995447af356599d6bc306f (patch)
tree969528662ce69992a10a9d09aaef8f8ee703f366
parentcb964b3c5a938a3e8677294b6870632bb3e94227 (diff)
downloadslackbuilds-34e5069ef0d4f6474a995447af356599d6bc306f.tar.gz
development/kdesvn: Fix build with newer cmake.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--development/kdesvn/kdesvn.SlackBuild20
-rw-r--r--development/kdesvn/kdesvn.patch16
2 files changed, 27 insertions, 9 deletions
diff --git a/development/kdesvn/kdesvn.SlackBuild b/development/kdesvn/kdesvn.SlackBuild
index 5407281554..c4ba379b0a 100644
--- a/development/kdesvn/kdesvn.SlackBuild
+++ b/development/kdesvn/kdesvn.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=kdesvn
VERSION=${VERSION:-1.6.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -54,7 +54,7 @@ else
LIBDIRSUFFIX=""
fi
-set -e
+set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
@@ -64,10 +64,13 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# patch for cmake 3.x
+patch -p1 < $CWD/kdesvn.patch
mkdir build
cd build
@@ -83,7 +86,7 @@ cd build
make install DESTDIR=$PKG
cd -
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
# mandir setting above seems ignored
@@ -92,8 +95,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $(find $PKG/usr/man -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING* ChangeLog GPL.txt INSTALL-cmake TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog GPL.txt INSTALL-cmake TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/development/kdesvn/kdesvn.patch b/development/kdesvn/kdesvn.patch
new file mode 100644
index 0000000000..ba97ff3b0b
--- /dev/null
+++ b/development/kdesvn/kdesvn.patch
@@ -0,0 +1,16 @@
+--- kdesvn-1.6.0/CMakeLists.txt.orig 2015-12-07 17:48:18.377100540 +0000
++++ kdesvn-1.6.0/CMakeLists.txt 2015-12-07 17:48:53.280327027 +0000
+@@ -20,11 +20,6 @@
+
+ PROJECT(kdesvn)
+ SET(PACKAGENAME "${CMAKE_PROJECT_NAME}")
+-IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
+- CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+-ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
+- CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+-ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
+ SET(BASE_VERSION 1.6.0)
+
+ OPTION(BUILD_TESTS "Building the tests yes or no (default off)")
+
+