mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-26 22:06:35 +01:00
development/kdiff3: Updated script and added docbook patch.
Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
This commit is contained in:
parent
aa4deace92
commit
225f69327b
2 changed files with 50 additions and 10 deletions
40
development/kdiff3/docbook.patch
Normal file
40
development/kdiff3/docbook.patch
Normal file
|
@ -0,0 +1,40 @@
|
|||
diff -Naur kdiff3-0.9.95/doc/de/index.docbook kdiff3-0.9.95_patched/doc/de/index.docbook
|
||||
--- kdiff3-0.9.95/doc/de/index.docbook 2009-01-01 22:52:33.000000000 +0000
|
||||
+++ kdiff3-0.9.95_patched/doc/de/index.docbook 2011-03-30 15:22:42.385602434 +0000
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
<!ENTITY kdiff3 "<application
|
||||
>KDiff3</application
|
||||
>">
|
||||
diff -Naur kdiff3-0.9.95/doc/fr/index.docbook kdiff3-0.9.95_patched/doc/fr/index.docbook
|
||||
--- kdiff3-0.9.95/doc/fr/index.docbook 2009-01-01 22:52:33.000000000 +0000
|
||||
+++ kdiff3-0.9.95_patched/doc/fr/index.docbook 2011-03-30 15:23:18.415460663 +0000
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
<!ENTITY kdiff3 "<application
|
||||
>KDiff3</application
|
||||
>">
|
||||
diff -Naur kdiff3-0.9.95/doc/it/index.docbook kdiff3-0.9.95_patched/doc/it/index.docbook
|
||||
--- kdiff3-0.9.95/doc/it/index.docbook 2009-01-01 22:52:33.000000000 +0000
|
||||
+++ kdiff3-0.9.95_patched/doc/it/index.docbook 2011-03-30 15:23:29.516952292 +0000
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
<!ENTITY kdiff3 "<application
|
||||
>KDiff3</application
|
||||
>">
|
||||
diff -Naur kdiff3-0.9.95/doc/nl/index.docbook kdiff3-0.9.95_patched/doc/nl/index.docbook
|
||||
--- kdiff3-0.9.95/doc/nl/index.docbook 2009-01-01 22:52:33.000000000 +0000
|
||||
+++ kdiff3-0.9.95_patched/doc/nl/index.docbook 2011-03-30 15:23:37.372178242 +0000
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" ?>
|
||||
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
<!ENTITY kdiff3 "<application
|
||||
>KDiff3</application
|
||||
>">
|
|
@ -26,12 +26,10 @@ VERSION=${VERSION:-0.9.95}
|
|||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
# Automatically determine the architecture we're building on:
|
||||
if [ -z "$ARCH" ]; then
|
||||
case "$( uname -m )" in
|
||||
i?86) ARCH=i486 ;;
|
||||
arm*) ARCH=arm ;;
|
||||
# Unless $ARCH is already set, use uname -m for all other archs:
|
||||
*) ARCH=$( uname -m ) ;;
|
||||
esac
|
||||
fi
|
||||
|
@ -57,7 +55,6 @@ fi
|
|||
|
||||
set -e # Exit on most errors
|
||||
|
||||
|
||||
rm -rf $PKG
|
||||
mkdir -p $TMP $PKG $OUTPUT
|
||||
cd $TMP
|
||||
|
@ -71,6 +68,9 @@ find . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \;
|
||||
|
||||
# Patch docbook.dtd's so this will compile properly
|
||||
patch -p1 < $CWD/docbook.patch
|
||||
|
||||
mkdir build
|
||||
cd build
|
||||
cmake \
|
||||
|
@ -83,7 +83,7 @@ cd build
|
|||
|
||||
make VERBOSE=1
|
||||
make install VERBOSE=1 DESTDIR=$PKG
|
||||
cd -
|
||||
cd ..
|
||||
|
||||
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
|
||||
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
|
||||
|
|
Loading…
Reference in a new issue