aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/xalan-c/README3
-rw-r--r--libraries/xalan-c/xalan-c-1.10.0+gcc-4.3.patch50
-rw-r--r--libraries/xalan-c/xalan-c.SlackBuild49
-rw-r--r--libraries/xalan-c/xalan-c.info14
4 files changed, 34 insertions, 82 deletions
diff --git a/libraries/xalan-c/README b/libraries/xalan-c/README
index 55089294ddc21..cde4c916313fa 100644
--- a/libraries/xalan-c/README
+++ b/libraries/xalan-c/README
@@ -1,5 +1,4 @@
XSLT processor for transforming XML into HTML, text,
or other XML types.
-You'll need xerces-c to build this, which is
-also available at SlackBuilds.org
+This requires xerces-c.
diff --git a/libraries/xalan-c/xalan-c-1.10.0+gcc-4.3.patch b/libraries/xalan-c/xalan-c-1.10.0+gcc-4.3.patch
deleted file mode 100644
index a0a4eeae6698a..0000000000000
--- a/libraries/xalan-c/xalan-c-1.10.0+gcc-4.3.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- XalanDOMString.cpp 2008-03-21 09:50:39.000000000 +0100
-+++ xml-xalan/c/src/xalanc/XalanDOM/XalanDOMString.cpp 2008-03-21 09:51:06.000000000 +0100
-@@ -26,6 +26,7 @@
-
-
- #include <cstdlib>
-+#include <cstring>
-
-
-
---- FormatterToHTML.cpp 2008-03-21 09:56:31.000000000 +0100
-+++ xml-xalan/c/src/xalanc/XMLSupport/FormatterToHTML.cpp 2008-03-21 09:56:54.000000000 +0100
-@@ -26,6 +26,7 @@
-
-
- #include <cassert>
-+#include <cstring>
-
-
-
---- ElemNumber.cpp 2008-03-21 10:09:56.000000000 +0100
-+++ xml-xalan/c/src/xalanc/XSLT/ElemNumber.cpp 2008-03-21 10:10:15.000000000 +0100
-@@ -14,6 +14,7 @@
- * limitations under the License.
- */
- #include "ElemNumber.hpp"
-+#include <cstring>
-
-
-
---- DirectoryEnumerator.hpp 2008-03-21 10:19:13.000000000 +0100
-+++ xml-xalan/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp 2008-03-21 10:19:41.000000000 +0100
-@@ -36,6 +36,7 @@
-
- #include <functional>
- #include <iterator>
-+#include <cstring>
-
-
- #include "xercesc/framework/MemoryManager.hpp"
---- XalanExe.cpp 2008-03-21 12:11:08.000000000 +0100
-+++ xml-xalan/c/src/xalanc/XalanExe/XalanExe.cpp 2008-03-21 12:11:44.000000000 +0100
-@@ -19,6 +19,7 @@
-
-
- #include <cstdlib>
-+#include <cstring>
- #if defined(XALAN_CLASSIC_IOSTREAMS)
- #include <iostream.h>
- #else
diff --git a/libraries/xalan-c/xalan-c.SlackBuild b/libraries/xalan-c/xalan-c.SlackBuild
index 68e8772bf2620..b959c96aa446f 100644
--- a/libraries/xalan-c/xalan-c.SlackBuild
+++ b/libraries/xalan-c/xalan-c.SlackBuild
@@ -22,17 +22,26 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=Xalan-C
-VERSION=1_10_0
-BUILD=${BUILD:-3}
+# Currently maintained by Robert Allen <slacker@slaphappygeeks.com>
+
+# Note: This SVN snapshot of xalan-c is selected to build with xerces-c-3.x
+# series without patching, so the source archive filename is hard-coded into
+# the script. If you want to build with a different snapshot then you will
+# need to create your own archive an update the filename in the script.
+#
+# To capture the current SVN trunk to a local directory:
+# mkdir svn ; cd svn ; svn co http://svn.apache.org/repos/asf/xalan/c/trunk .
+
+
+PRGNAM=xalan-c
+VERSION=1.11_1335373
+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
@@ -42,9 +51,6 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-PKGNAM=$(echo $PRGNAM | tr [:upper:] [:lower:])
-PKGVER=$(echo $VERSION | tr _ .)
-
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
LIBDIRSUFFIX=""
@@ -69,45 +75,42 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf xml-xalan
-tar xvf $CWD/${PRGNAM}_${VERSION}-src.tar.gz
-cd xml-xalan
+rm -rf $PRGNAM-$VERSION
+# We are building from a specific SVN snapshot with fixed filename
+# so we hardwire it into this script
+tar xvf $CWD/xalan-c-1.11_1335373.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
-patch -p1 -i $CWD/xalan-c-1.10.0+gcc-4.3.patch
-
-cd c
- XALANCROOT="$TMP/xml-xalan/c" \
+ XALANCROOT=$(pwd) \
XERCESCROOT="/usr" \
./runConfigure \
-p linux \
-c gcc \
-x g++ \
-m inmem \
- -r pthreads \
-P /usr \
-C --libdir=/usr/lib$LIBDIRSUFFIX \
"$FLAGS"
-# I could not get this to compile with more than 1 job, XGizzmo
- XALANCROOT="$TMP/xml-xalan/c" \
+ XALANCROOT=$(pwd) \
XERCESCROOT="/usr" \
make -j1
- XALANCROOT="$TMP/xml-xalan/c" \
+ XALANCROOT=$(pwd) \
XERCESCROOT="/usr" \
make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-mkdir -p $PKG/usr/doc/$PKGNAM-$PKGVER
-cp -a KEYS LICENSE NOTICE readme.html README $PKG/usr/doc/$PKGNAM-$PKGVER
-cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$PKGVER/$PKGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a KEYS LICENSE NOTICE readme.html README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$PKGVER-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/xalan-c/xalan-c.info b/libraries/xalan-c/xalan-c.info
index e3f943e990933..cff3dba6bfaa4 100644
--- a/libraries/xalan-c/xalan-c.info
+++ b/libraries/xalan-c/xalan-c.info
@@ -1,10 +1,10 @@
PRGNAM="xalan-c"
-VERSION="1.10.0"
-HOMEPAGE="http://xalan.apache.org"
-DOWNLOAD="http://www.apache.org/dist/xml/xalan-c/source/Xalan-C_1_10_0-src.tar.gz"
-MD5SUM="0a3fbb535885531cc544b07a2060bfb1"
+VERSION="1.11_1335373"
+HOMEPAGE="http://xml.apache.org/xalan-c/"
+DOWNLOAD="http://slaphappygeeks.com/dl/xalan-c-1.11_1335373.tar.gz"
+MD5SUM="fd7fcf958d3f6446cd3689e36cbd93cf"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-MAINTAINER="ppr:kut"
-EMAIL="HMWiesinger@gmx.at"
-APPROVED="David Somero"
+MAINTAINER="Robert Allen"
+EMAIL="slacker@slaphappygeeks.com"
+APPROVED="rworkman"