Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

3 files changed, 16 insertions, 17 deletions

diff --git a/source/kde/koffice/koffice.SlackBuild b/source/kde/koffice/koffice.SlackBuild
index d7332bf5b..a87d36e71 100755
--- a/source/kde/koffice/koffice.SlackBuild
+++ b/source/kde/koffice/koffice.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2009  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -47,8 +47,6 @@ 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 \) \
@@ -62,13 +60,12 @@ cd build
     $KDE_OPT_ARGS \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-    -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DMAN_INSTALL_DIR=/usr/man \
     -DSYSCONF_INSTALL_DIR=/etc/kde \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
     ..
-   make $NUMJOBS || exit 1
+   make $NUMJOBS || make || exit 1
    make install DESTDIR=$PKG || exit 1
 cd -
 
@@ -76,6 +73,19 @@ if [ -d $PKG/usr/man ]; then
   gzip -9 $PKG/usr/man/man?/*
 fi
 
+if [ ! -r $PKG/usr/bin/kformula ]; then # wtf??
+  echo "Kludging KFormula installation..."
+  cp -a build/kformula/kformula $PKG/usr/bin/kformula || exit 1
+  cp -a build/lib/kformulapart.so $PKG/usr/lib${LIBDIRSUFFIX}/kde4/kformulapart.so || exit 1
+  cp -a build/lib/libkdeinit_kformula.so $PKG/usr/lib${LIBDIRSUFFIX}/libkdeinit_kformula.so || exit 1
+  cp -a kformula/kformula.desktop $PKG/usr/share/applications/kde4/kformula.desktop || exit 1
+  mkdir -p $PKG/usr/share/apps/kformula || exit 1
+  cp -a kformula/kformula.rc $PKG/usr/share/apps/kformula/kformula.rc || exit 1
+  cp -a kformula/kformula_readonly.rc $PKG/usr/share/apps/kformula/kformula_readonly.rc || exit 1
+  cp -a kformula/tips $PKG/usr/share/apps/kformula/tips || exit 1
+  cp -a kformula/kformulapart.desktop $PKG/usr/share/kde4/services/kformulapart.desktop || exit 1
+fi
+
 mkdir -p $PKG/usr/doc/koffice-$VERSION
 cp -a AUTHORS COPYING* README* $PKG/usr/doc/koffice-$VERSION
 
diff --git a/source/kde/koffice/koffice.krita.png14.diff b/source/kde/koffice/koffice.krita.png14.diff
deleted file mode 100644
index 252107de0..000000000
--- a/source/kde/koffice/koffice.krita.png14.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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 d98d655d6..504bb683a 100644
--- a/source/kde/koffice/local.options
+++ b/source/kde/koffice/local.options
@@ -1,2 +1,2 @@
-VERSION=2.1.2
+VERSION=2.3.3
 BUILD=2