summaryrefslogtreecommitdiff
path: root/source/kde/koffice
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/koffice')
-rwxr-xr-xsource/kde/koffice/koffice.SlackBuild4
-rw-r--r--source/kde/koffice/koffice.krita.png14.diff11
-rw-r--r--source/kde/koffice/local.options3
3 files changed, 17 insertions, 1 deletions
diff --git a/source/kde/koffice/koffice.SlackBuild b/source/kde/koffice/koffice.SlackBuild
index 1945b990..d7332bf5 100755
--- a/source/kde/koffice/koffice.SlackBuild
+++ b/source/kde/koffice/koffice.SlackBuild
@@ -46,6 +46,9 @@ cd $TMP
echo "Building koffice-$VERSION..."
tar xvf $CWD/../src/koffice-$VERSION.tar.?z* || exit 1
cd koffice-$VERSION
+
+zcat $CWD/koffice.krita.png14.diff.gz | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -56,6 +59,7 @@ find . \
mkdir -p build
cd build
cmake \
+ $KDE_OPT_ARGS \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/source/kde/koffice/koffice.krita.png14.diff b/source/kde/koffice/koffice.krita.png14.diff
new file mode 100644
index 00000000..252107de
--- /dev/null
+++ b/source/kde/koffice/koffice.krita.png14.diff
@@ -0,0 +1,11 @@
+--- ./krita/ui/kis_png_converter.cpp.orig 2010-01-08 04:42:41.000000000 -0600
++++ ./krita/ui/kis_png_converter.cpp 2010-02-25 12:01:11.000000000 -0600
+@@ -404,7 +404,7 @@
+
+ png_byte signature[8];
+ iod->peek((char*)signature, 8);
+- if (!png_check_sig(signature, 8)) {
++ if (!(png_sig_cmp(signature, 0, 8) == 0)) {
+ iod->close();
+ return (KisImageBuilder_RESULT_BAD_FETCH);
+ }
diff --git a/source/kde/koffice/local.options b/source/kde/koffice/local.options
index ccb0cb13..d98d655d 100644
--- a/source/kde/koffice/local.options
+++ b/source/kde/koffice/local.options
@@ -1 +1,2 @@
-VERSION=2.0.2
+VERSION=2.1.2
+BUILD=2