This commit is contained in:
milisbir 2017-09-21 23:03:17 +03:00
parent cb295d7dd4
commit 9ee418f188
3 changed files with 57 additions and 38 deletions

View File

@ -0,0 +1,11 @@
diff -ru openjade-1.3.3-pre1.orig/style/MultiLineInlineNote.cxx openjade-1.3.3-pre1/style/MultiLineInlineNote.cxx
--- openjade-1.3.3-pre1.orig/style/MultiLineInlineNote.cxx 2009-03-15 18:10:52.000000000 +0200
+++ openjade-1.3.3-pre1/style/MultiLineInlineNote.cxx 2009-03-15 18:11:06.000000000 +0200
@@ -1,6 +1,6 @@
#include "MultiLineInlineNote.h"
-#include <iostream.h>
+#include <iostream>
#ifdef DSSSL_NAMESPACE
namespace DSSSL_NAMESPACE {

View File

@ -0,0 +1,32 @@
Use Getopt::Std in place of getopts.pl.
https://bugs.gentoo.org/show_bug.cgi?id=420083
--- a/msggen.pl
+++ b/msggen.pl
@@ -4,6 +4,7 @@
# See the file COPYING for copying permission.
use POSIX;
+use Getopt::Std;
# Package and version.
$package = 'openjade';
@@ -18,8 +19,7 @@
undef $opt_l;
undef $opt_p;
undef $opt_t;
-do 'getopts.pl';
-&Getopts('l:p:t:');
+getopts('l:p:t:');
$module = $opt_l;
$pot_file = $opt_p;
@@ -72,7 +72,7 @@
else {
$field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");;
$type[$num] = substr($field[0], 0, 1);
- $argc = int(substr($field[0], 1, 1));
+ $argc = substr($field[0], 1, 1);
}
$nargs[$num] = $argc;
$field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag");

View File

@ -4,45 +4,21 @@
# Depends on: opensp
name=openjade
version=1.3.2
release=1
version=1.3.3-pre1
release=2
source=(http://downloads.sourceforge.net/project/$name/$name/1.3.3/$name-$version.tar.gz
iostream.patch
msggen.pl.patch)
source=(http://downloads.sourceforge.net/openjade/openjade-$version.tar.gz
http://www.linuxfromscratch.org/patches/blfs/7.5/openjade-1.3.2-gcc_4.6-1.patch)
build() {
cd $name-$version
build(){
cd $name-$version
# fix a compilation problem identified in gcc-4.6 and later
patch -Np1 -i ../openjade-1.3.2-gcc_4.6-1.patch
# fix a compilation problem with perl-5.16 and later
sed -i -e '/getopts/{N;s#&G#g#;s#do .getopts.pl.;##;}' \
-e '/use POSIX/ause Getopt::Std;' msggen.pl
./configure --prefix=/usr \
--mandir=/usr/share/man \
--enable-http \
--disable-static \
--enable-default-catalog=/etc/sgml/catalog \
--enable-default-search-path=/usr/share/sgml \
--datadir=/usr/share/sgml/openjade-$version
make
make DESTDIR=$PKG install
make DESTDIR=$PKG/usr/share/man install-man
patch -p 1 -i $SRC/iostream.patch
patch -p 1 -i $SRC/msggen.pl.patch
# create the Jade equivalents of OpenJade executables and libraries
cd $PKG/usr/bin
ln -v -sf openjade jade
cd $PKG/usr/lib
ln -v -sf libogrove.so libgrove.so
ln -v -sf libospgrove.so libspgrove.so
ln -v -sf libostyle.so libstyle.so
cd $SRC/$name-$version
install -v -m644 dsssl/catalog $PKG/usr/share/sgml/openjade-$version
install -v -m644 dsssl/*.{dtd,dsl,sgm} \
$PKG/usr/share/sgml/openjade-$version
./configure \
--prefix=/usr
make
make DESTDIR=$PKG install
}
# NuTyX Pkgfile (http://nutyx.org)