[Lunar-commits] <moonbase> openjade: stop segfaulting

[Paul Bredbury]

commit c6b023382a1fed20396498d20bcb81a30b9ebfdb
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Mon Sep 28 07:48:19 2009 +0700

    openjade: stop segfaulting
    
    Fixes compilation of docbook-utils.
---
 doc-tools/openjade/BUILD   |   14 ++++++++------
 doc-tools/openjade/DETAILS |    8 ++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/doc-tools/openjade/BUILD b/doc-tools/openjade/BUILD
index 84d394a..9e14ef2 100644
--- a/doc-tools/openjade/BUILD
+++ b/doc-tools/openjade/BUILD
@@ -1,11 +1,15 @@
 (
+
+  # Fixes segfault when compiling docbook-utils
+  patch_it $SOURCE2 1 &&
+
   # We need to remove the old catalog entries upon an update
   if module_is_expired $MODULE ; then
          set_module_config OLD_VER "`installed_version $MODULE`"
   fi &&
 
-  CATALOGDIR="/usr/share/sgml/$MODULE-$VERSION"
-  PTEXTD="$CATALOGDIR/pubtext"
+  CATALOGDIR="/usr/share/sgml/$MODULE-$VERSION" &&
+  PTEXTD="$CATALOGDIR/pubtext" &&
 
   ./configure --build=$BUILD                                 \
               --prefix=/usr                                  \
@@ -18,13 +22,11 @@
               --libdir=/usr/lib                              \
               --includedir=/usr/include                      \
               --enable-http                                  \
-              --disable-shared                               \
-              --enable-mif                                   \
+              --disable-static                               \
               --enable-default-catalog=/etc/sgml/catalog     \
               --enable-default-search-path=/usr/share/sgml   &&
 
-  LDFLAGS="$LDFLAGS -all-static"                             &&
-  make all LDFLAGS="$LDFLAGS"                                &&
+  make all                                                   &&
   prepare_install                                            &&
   make install                                               &&
   if ! [ -d "$CATALOGDIR" ]; then 
diff --git a/doc-tools/openjade/DETAILS b/doc-tools/openjade/DETAILS
index b26b7d6..e96b14c 100644
--- a/doc-tools/openjade/DETAILS
+++ b/doc-tools/openjade/DETAILS
@@ -1,12 +1,16 @@
           MODULE=openjade
          VERSION=1.3.2
           SOURCE=$MODULE-$VERSION.tar.gz
+         SOURCE2=openjade-1.3.2-35.fc12.patch.bz2
       SOURCE_URL=$SFORGE_URL/$MODULE/
+     SOURCE2_URL=$PATCH_URL
       SOURCE_VFY=sha1:54e1999f41450fbd62c5d466002d79d3efca2321
+     SOURCE2_VFY=sha1:b0bc8a0e3967788d0d26659652556d8c7c71ad0a
         WEB_SITE=http://openjade.sourceforge.net
          ENTERED=20010922
-         UPDATED=20060124
+         UPDATED=20090925
            SHORT="implementation of DSSSL SGML/XML"
+           PSAFE=no
 
 cat << EOF
 Jade is James Clark's implementation of DSSSL -- Document Style
@@ -15,5 +19,5 @@ SGML (and XML) documents.
 OpenJade is a project undertaken by the DSSSL community to maintain and
 extend Jade, as well as the related SP suite of SGML/XML processing
 tools. OpenJade and OpenSP are distributed under the same license as
-Jade
+Jade.
 EOF