summaryrefslogtreecommitdiff
path: root/source/kde/kdewebdev
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2010-05-19 08:58:23 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 22:43:05 +0200
commitb76270bf9e6dd375e495fec92140a79a79415d27 (patch)
tree3dbed78b2279bf9f14207a16dc634b90995cbd40 /source/kde/kdewebdev
parent5a12e7c134274dba706667107d10d231517d3e05 (diff)
downloadcurrent-b76270bf9e6dd375e495fec92140a79a79415d27.tar.gz
Slackware 13.1slackware-13.1
Wed May 19 08:58:23 UTC 2010 Slackware 13.1 x86_64 stable is released! Lots of thanks are due -- see the RELEASE_NOTES and the rest of the ChangeLog for credits. The ISOs are on their way to replication, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We are taking pre-orders now at store.slackware.com, and offering a discount if you sign up for a subscription. Consider picking up a copy to help support the project. Thanks again to the Slackware community for testing, contributing, and generally holding us to a high level of quality. :-) Enjoy!
Diffstat (limited to 'source/kde/kdewebdev')
-rw-r--r--source/kde/kdewebdev/include-tidy.patch13
-rwxr-xr-xsource/kde/kdewebdev/kdewebdev.SlackBuild5
-rw-r--r--source/kde/kdewebdev/slack-desc6
-rwxr-xr-xsource/kde/kdewebdev/tidy/tidy.SlackBuild17
-rwxr-xr-xsource/kde/kdewebdev/tidy/tidy.build18
5 files changed, 49 insertions, 10 deletions
diff --git a/source/kde/kdewebdev/include-tidy.patch b/source/kde/kdewebdev/include-tidy.patch
new file mode 100644
index 00000000..fd4de940
--- /dev/null
+++ b/source/kde/kdewebdev/include-tidy.patch
@@ -0,0 +1,13 @@
+--- klinkstatus/src/tidy/tidyx.h.orig 2009-09-03 09:55:38.886267704 -0500
++++ klinkstatus/src/tidy/tidyx.h 2009-09-03 09:57:29.032269520 -0500
+@@ -48,8 +48,8 @@
+ Created 2002-07-11 by Charles Reitzel
+ */
+
+-#include <tidy.h>
+-#include <buffio.h>
++#include "/tmp/package-kdewebdev/usr/include/tidy/tidy.h"
++#include "/tmp/package-kdewebdev/usr/include/tidy/buffio.h"
+
+ #include <config-tidy.h>
+
diff --git a/source/kde/kdewebdev/kdewebdev.SlackBuild b/source/kde/kdewebdev/kdewebdev.SlackBuild
index 45753629..47e48499 100755
--- a/source/kde/kdewebdev/kdewebdev.SlackBuild
+++ b/source/kde/kdewebdev/kdewebdev.SlackBuild
@@ -54,7 +54,7 @@ echo "Building kdewebdev-$VERSION..."
tar xvf $CWD/../src/kdewebdev-$VERSION.tar.?z* || exit 1
cd kdewebdev-$VERSION
-zcat $CWD/kde4-kdewebdev-findtidy.diff.gz | patch -p0 --verbose || exit 1
+#zcat $CWD/kde4-kdewebdev-findtidy.diff.gz | patch -p0 --verbose || exit 1
chown -R root:root .
find . \
@@ -65,10 +65,13 @@ find . \
# Maybe we won't need this again...
# -DWITH_RUBY:BOOL=OFF \
+cp klinkstatus/src/tidy/tidyx.h{,.orig}
+zcat $CWD/include-tidy.patch.gz | patch -p0
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/kdewebdev/slack-desc b/source/kde/kdewebdev/slack-desc
index a082d057..294ef22e 100644
--- a/source/kde/kdewebdev/slack-desc
+++ b/source/kde/kdewebdev/slack-desc
@@ -6,10 +6,10 @@
# customary to leave one space after the ':'.
|-----handy-ruler--------------------------------------------------|
-kdewebdev: kdewebdev (web development package for the K Desktop Environment)
+kdewebdev: kdewebdev (web development package for the KDE Platform)
kdewebdev:
-kdewebdev: The kdewebdev package contains Quanta Plus and other applications
-kdewebdev: which are useful for web development.
+kdewebdev: The kdewebdev package contains applications which are useful for
+kdewebdev: web development.
kdewebdev:
kdewebdev:
kdewebdev:
diff --git a/source/kde/kdewebdev/tidy/tidy.SlackBuild b/source/kde/kdewebdev/tidy/tidy.SlackBuild
index e487d95e..6d8c3a7d 100755
--- a/source/kde/kdewebdev/tidy/tidy.SlackBuild
+++ b/source/kde/kdewebdev/tidy/tidy.SlackBuild
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,10 +22,19 @@
# This file is an example, so feel free to fix it if it gets out of date. :-)
PKGNAM=tidy
-VERSION=${VERSION:-20090604T2303}
-ARCH=${ARCH:-x86_64}
+VERSION=${VERSION:-20100503T2309}
BUILD=${BUILD:-1}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-${PKGNAM}
@@ -36,6 +45,8 @@ elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+else
+ SLKCFLAGS="-O2"
fi
rm -rf $PKG
diff --git a/source/kde/kdewebdev/tidy/tidy.build b/source/kde/kdewebdev/tidy/tidy.build
index ee7b821f..b638b24e 100755
--- a/source/kde/kdewebdev/tidy/tidy.build
+++ b/source/kde/kdewebdev/tidy/tidy.build
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,19 @@
# New cvs version - 20080502
PKGNAM=tidy
-VERSION=20090604T2303
-ARCH=${ARCH:-x86_64}
+VERSION=20100503T2309
BUILD=${BUILD:-1}
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i486 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp}
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "s390" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
cd $TMP