diff --git a/SOURCES/config.guess b/SOURCES/config.guess index b79252d6..f475ceb4 100644 --- a/SOURCES/config.guess +++ b/SOURCES/config.guess @@ -2,7 +2,7 @@ # Attempt to guess a canonical system name. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2013-02-12' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -132,27 +132,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in -Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu - - eval $set_cc_for_build - cat <<-EOF > $dummy.c - #include - #if defined(__UCLIBC__) - LIBC=uclibc - #elif defined(__dietlibc__) - LIBC=dietlibc - #else - LIBC=gnu - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - ;; -esac - # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in @@ -874,21 +853,21 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -901,54 +880,59 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo ${UNAME_MACHINE}-unknown-linux-gnueabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + LIBC=gnu + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -967,63 +951,57 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + echo hppa64-unknown-linux-gnu exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-${LIBC} + echo powerpc64-unknown-linux-gnu exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} - exit ;; - ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} - exit ;; - ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpc-unknown-linux-gnu exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1256,21 +1234,19 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc - fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - fi + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; + esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) diff --git a/SOURCES/config.sub b/SOURCES/config.sub index d2a96130..872199ac 100644 --- a/SOURCES/config.sub +++ b/SOURCES/config.sub @@ -2,7 +2,7 @@ # Configuration validation subroutine script. # Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2013-08-10' +timestamp='2013-02-12' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -252,12 +252,12 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arceb \ + | arc \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | c8051 | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -366,13 +366,13 @@ case $basic_machine in | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -794,7 +794,7 @@ case $basic_machine in os=-mingw64 ;; mingw32) - basic_machine=i686-pc + basic_machine=i386-pc os=-mingw32 ;; mingw32ce) @@ -830,7 +830,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i686-pc + basic_machine=i386-pc os=-msys ;; mvs) @@ -1006,7 +1006,7 @@ case $basic_machine in ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown @@ -1546,9 +1546,6 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; - c8051-*) - os=-elf - ;; hexagon-*) os=-elf ;; diff --git a/SOURCES/openjade-1.3.1-nsl.patch b/SOURCES/openjade-1.3.1-nsl.patch new file mode 100644 index 00000000..48d13029 --- /dev/null +++ b/SOURCES/openjade-1.3.1-nsl.patch @@ -0,0 +1,21 @@ +--- openjade-1.3.1/config/configure.in.lr 2003-09-12 08:03:22.000000000 -0600 ++++ openjade-1.3.1/config/configure.in 2003-09-12 08:03:44.000000000 -0600 +@@ -156,7 +156,6 @@ + then + AC_MSG_RESULT(yes) + AC_DEFINE(SP_HAVE_SOCKET) +- AC_CHECK_LIB(nsl,main,LIBS="$LIBS -lnsl") + AC_CHECK_LIB(socket,main,LIBS="$LIBS -lsocket") + AC_MSG_CHECKING(h_errno in netdb.h) + AC_EGREP_HEADER(h_errno,netdb.h, +--- openjade-1.3.1/configure.lr 2003-09-12 08:35:55.000000000 -0600 ++++ openjade-1.3.1/configure 2003-09-12 08:36:07.000000000 -0600 +@@ -5530,7 +5530,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lnsl $LIBS" ++LIBS="-lXXXnsl $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + #include "confdefs.h" diff --git a/SOURCES/openjade-1.3.2-gcc46.patch b/SOURCES/openjade-1.3.2-gcc46.patch new file mode 100644 index 00000000..962ac19f --- /dev/null +++ b/SOURCES/openjade-1.3.2-gcc46.patch @@ -0,0 +1,82 @@ +If a class or struct has no user-defined default constructor, C++ doesn't +allow you to default construct a const instance of it. + +https://bugs.gentoo.org/358021 +http://clang.llvm.org/compatibility.html#default_init_const +http://gcc.gnu.org/PR44499 + + +--- a/jade/TeXFOTBuilder.cxx ++++ b/jade/TeXFOTBuilder.cxx +@@ -88,6 +88,8 @@ public: + value.convertString(nic_.placement); + } + ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } ++ public: ++ PageFloatFlowObj() {} + private: + PageFloatNIC nic_; + StringC name_; +@@ -101,6 +103,8 @@ public: + fotb.endPageFootnote(); + } + ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } ++ public: ++ PageFootnoteFlowObj() {} + private: + }; + ////////////////////////////////////////////////////////////////////// +--- a/jade/TransformFOTBuilder.cxx ++++ b/jade/TransformFOTBuilder.cxx +@@ -41,6 +41,7 @@ public: + }; + class EntityRefFlowObj : public TransformExtensionFlowObj { + public: ++ EntityRefFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.entityRef(name_); + } +@@ -56,6 +57,7 @@ public: + }; + class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { + public: ++ ProcessingInstructionFlowObj() {} + void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { + fotb.processingInstruction(data_); + } +@@ -98,6 +100,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } ++ public: ++ EmptyElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -133,6 +137,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } ++ public: ++ ElementFlowObj() {} + private: + ElementNIC nic_; + }; +@@ -150,6 +156,8 @@ public: + value.convertString(systemId_); + } + ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } ++ public: ++ EntityFlowObj() {} + private: + StringC systemId_; + }; +@@ -174,6 +182,8 @@ public: + } + } + ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } ++ public: ++ DocumentTypeFlowObj() {} + private: + DocumentTypeNIC nic_; + }; diff --git a/SOURCES/openjade-deplibs.patch b/SOURCES/openjade-deplibs.patch new file mode 100644 index 00000000..3466ad7d --- /dev/null +++ b/SOURCES/openjade-deplibs.patch @@ -0,0 +1,40 @@ +diff -urNp openjade-1.3.2/grove/Makefile.sub devel/grove/Makefile.sub +--- openjade-1.3.2/grove/Makefile.sub 2002-10-20 23:47:24.000000000 +0200 ++++ devel/grove/Makefile.sub 2007-07-23 15:39:23.000000000 +0200 +@@ -1,4 +1,4 @@ + LTVERSION=0:1:0 + LIB=ogrove +-DEPLIBS=-lm ++DEPLIBS=-lm -lstdc++ + OBJS=Node.o LocNode.o +diff -urNp openjade-1.3.2/spgrove/Makefile.sub devel/spgrove/Makefile.sub +--- openjade-1.3.2/spgrove/Makefile.sub 2002-11-15 23:46:50.000000000 +0100 ++++ devel/spgrove/Makefile.sub 2007-07-23 16:06:13.000000000 +0200 +@@ -1,9 +1,10 @@ + LTVERSION=0:1:0 + LIB=ospgrove + INCLUDE=-I$(srcdir)/../grove +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ ++DEPLIBS=$(TOP)/grove/libogrove.la \ ++ -lm -losp -L$(TOP)/grove/.libs \ + -L$(TOP)/lib -L$(TOP)/lib/.libs \ +- $(LIB_THREADS) ++ $(LIB_THREADS) -lstdc++ + OBJS=GroveApp.o GroveBuilder.o SdNode.o + GENSRCS=grove_inst.cxx + +diff -urNp openjade-1.3.2/style/Makefile.sub devel/style/Makefile.sub +--- openjade-1.3.2/style/Makefile.sub 2003-04-18 19:18:10.000000000 +0200 ++++ devel/style/Makefile.sub 2007-07-23 16:08:26.000000000 +0200 +@@ -1,8 +1,8 @@ + LTVERSION=0:1:0 + LIB=ostyle +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ +- -L$(TOP)/lib -L$(TOP)/lib/.libs \ +- -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs ++DEPLIBS=$(TOP)/grove/libogrove.la $(TOP)/spgrove/libospgrove.la \ ++ -lm -losp -L$(TOP)/lib -L$(TOP)/lib/.libs -L$(TOP)/grove/.libs \ ++ -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs -lstdc++ + OBJS=LangObj.o \ + Collector.o \ + DssslApp.o \ diff --git a/SOURCES/openjade-getoptperl.patch b/SOURCES/openjade-getoptperl.patch new file mode 100644 index 00000000..0d835eae --- /dev/null +++ b/SOURCES/openjade-getoptperl.patch @@ -0,0 +1,21 @@ +diff -urNp openjade-1.3.2-orig/msggen.pl openjade-1.3.2/msggen.pl +--- openjade-1.3.2-orig/msggen.pl 2002-10-20 23:47:23.000000000 +0200 ++++ openjade-1.3.2/msggen.pl 2012-08-10 10:38:28.019081661 +0200 +@@ -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 @@ $gen_c = 0; + 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; + diff --git a/SOURCES/openjade-nola.patch b/SOURCES/openjade-nola.patch new file mode 100644 index 00000000..1e23ca52 --- /dev/null +++ b/SOURCES/openjade-nola.patch @@ -0,0 +1,12 @@ +diff -urNp openjade-1.3.2-orig/jade/Makefile.sub openjade-1.3.2/jade/Makefile.sub +--- openjade-1.3.2-orig/jade/Makefile.sub 2002-11-15 23:46:50.000000000 +0100 ++++ openjade-1.3.2/jade/Makefile.sub 2009-02-13 11:52:30.000000000 +0100 +@@ -4,7 +4,7 @@ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuild + INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style + # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \ + # ../lib/libosp.a +-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a ++XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.so + GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \ + HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx TeXFOTBuilder_inst.cxx \ + TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx diff --git a/SOURCES/openjade-ppc64.patch b/SOURCES/openjade-ppc64.patch new file mode 100644 index 00000000..3c05c61b --- /dev/null +++ b/SOURCES/openjade-ppc64.patch @@ -0,0 +1,27 @@ +--- openjade-1.3.1/Makefile.prog.in.sopwith 2002-01-22 06:57:53.000000000 -0500 ++++ openjade-1.3.1/Makefile.prog.in 2003-02-11 16:59:44.000000000 -0500 +@@ -1,3 +1,4 @@ ++ + # + # Makefile.prog.in - Makerules for bilding programs + # +@@ -11,15 +12,17 @@ + LINKFLAGS = @LINKFLAGS@ + + ALL_LIBS = $(XLIBS) $(LIBS) ++LT_LIBS = $(shell echo $(XLIBS) | sed 's/\.a/.la/g') ++LT_ALL_LIBS = $(shell echo $(ALL_LIBS) | sed 's/\.a/.la/g') + Makefile.lt: +- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt ++ echo > Makefile.lt + + PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') + + all: $(PROG) + + $(PROG): $(OBJS) $(COBJS) $(LT_LIBS) +- $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) ++ $(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_ALL_LIBS) + + install: $(PROG) + -test -d $(DESTDIR)$(bindir) || \ diff --git a/SPECS/openjade.spec b/SPECS/openjade.spec new file mode 100644 index 00000000..c1dc676f --- /dev/null +++ b/SPECS/openjade.spec @@ -0,0 +1,425 @@ +Summary: A DSSSL implementation +Name: openjade +Version: 1.3.2 +Release: 45%{?dist} +Requires: sgml-common +URL: http://openjade.sourceforge.net/ +Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz +#config.sub and config.guess from upstream sources (Mar 25th 2013). +#http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +#http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +#I can't get them from autoreconf, because of the very strange openjade structure of config files +Source2:config.guess +Source3:config.sub +#fix build on ppc64 +Patch0: openjade-ppc64.patch +#do not link against -lnsl +Patch1: openjade-1.3.1-nsl.patch +#Fix dependent libs for libogrove (bug #198232). +Patch2: openjade-deplibs.patch +#do not require OpenSP libosp.la file for build(#485114) +Patch3: openjade-nola.patch +#upstream bug tracker fix for build with gcc46 +Patch4: openjade-1.3.2-gcc46.patch +#use Getopt:Std to prevent build failure +Patch5: openjade-getoptperl.patch +License: BSD +Group: Applications/Text +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +#Last jade version is from Red Hat 6.2 +Provides: jade = %{version}-%{release} + +BuildRequires: opensp-devel + + +%description +OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL +(Document Style Semantics and Specification Language). OpenJade is +based on James Clark's Jade implementation of DSSSL. OpenJade is a +command-line application and a set of components. The DSSSL engine +inputs an SGML or XML document and can output a variety of formats: +XML, RTF, TeX, MIF (FrameMaker), SGML, or XML. + + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 -b .deplibs +%patch3 -p1 -b .nola +%patch4 -p1 -b .gcc46 +%patch5 -p1 -b .getopt + + +%build +cp -p %{SOURCE2} %{SOURCE3} config/ +%configure --disable-static --datadir=%{_datadir}/sgml/%{name}-%{version} \ + --enable-splibdir=%{_libdir} +make + + +%install +rm -rf $RPM_BUILD_ROOT + +make install install-man DESTDIR=$RPM_BUILD_ROOT + +# oMy, othis ois osilly. +ln -s openjade $RPM_BUILD_ROOT/%{_bindir}/jade +echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1 + +# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade +cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ +cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/ + +# add unversioned/versioned catalog and symlink +mkdir -p $RPM_BUILD_ROOT/etc/sgml +cd $RPM_BUILD_ROOT/etc/sgml +touch %{name}-%{version}-%{release}.soc +ln -s %{name}-%{version}-%{release}.soc %{name}.soc +cd - + +rm -f $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/*.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post +/sbin/ldconfig +/usr/bin/install-catalog --add /etc/sgml/%{name}-%{version}-%{release}.soc \ + %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + +%preun +/usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}-%{release}.soc \ + %{_datadir}/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + +%postun -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc jadedoc/* dsssl/README.jadetex +%doc README COPYING VERSION +%ghost /etc/sgml/%{name}-%{version}-%{release}.soc +/etc/sgml/%{name}.soc +%{_bindir}/* +%{_libdir}/*.so.* +%{_mandir}/*/* +%{_datadir}/sgml/%{name}-%{version} + +%changelog +* Fri Jan 24 2014 Daniel Mach - 1.3.2-45 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 1.3.2-44 +- Mass rebuild 2013-12-27 + +* Mon Mar 25 2013 Ondrej Vasik 1.3.2-43 +- Use upstream config.sub and config.guess to support aarch64(#926278) + +* Thu Feb 14 2013 Fedora Release Engineering - 1.3.2-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Aug 10 2012 Ondrej Vasik 1.3.2-41 +- avoid build failure with using Getopt::Std; + +* Fri Jul 20 2012 Fedora Release Engineering - 1.3.2-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jan 13 2012 Fedora Release Engineering - 1.3.2-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Jun 08 2011 Ondrej Vasik 1.3.2-38 +- fix build with gcc46 (upstream bug tracker) + +* Tue Feb 08 2011 Fedora Release Engineering - 1.3.2-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 10 2009 Ondrej Vasik 1.3.2-36 +- Merge Review (#226213) - added url, fixed rpmlint warnings, + no macros in changelog + +* Sat Jul 25 2009 Fedora Release Engineering - 1.3.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Feb 27 2009 Ondrej Vasik 1.3.2-34 +- disable parallel build (culprit of build failure) + - http://bugs.gentoo.org/181651 + +* Thu Feb 26 2009 Fedora Release Engineering - 1.3.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Thu Sep 25 2008 Ondrej Vasik 1.3.2-32 +- do not require OpenSP libosp.la file for build(#485114) + +* Mon Feb 11 2008 Ondrej Vasik 1.3.2-31 +- gcc43 rebuild + +* Mon Aug 27 2007 Ondrej Vasik 1.3.2-30 +- changed license tag to BSD +- rebuilt for F8 + +* Mon Jul 23 2007 Ondrej Vasik 1.3.2-29 +- improved dependent libs patch (bug #237500) +- same done for libospgrove.so + +* Fri Feb 9 2007 Tim Waugh 1.3.2-28 +- Don't ship .so or .la files (bug #203635). +- Added dist tag to release. +- Fixed summary. +- Fixed build root. +- Removed prefix tag. + +* Mon Jul 17 2006 Tim Waugh 1.3.2-27 +- Rebuilt. + +* Mon Jul 10 2006 Tim Waugh 1.3.2-26 +- Fix dependent libs for libogrove (bug #198232). + +* Mon Jun 26 2006 Florian La Roche 1.3.2-25 +- add redirection to /dev/null for preun + +* Tue Jun 13 2006 Tim Waugh 1.3.2-24 +- Rebuild against opensp. + +* Fri Feb 10 2006 Jesse Keating - 1.3.2-23.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1.3.2-23.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Jan 6 2006 Tim Waugh 1.3.2-23 +- Rebuild against new opensp. + +* Mon Dec 19 2005 Tim Waugh 1.3.2-22 +- Fix SOC files. +- Quieten scriptlets. + +* Mon Dec 19 2005 Tim Waugh 1.3.2-21 +- Fix location of catalog. + +* Tue Dec 13 2005 Tim Waugh 1.3.2-20 +- Use --enable-splibdir to prevent ambiguity. +- Move 'install-catalog --remove' to %%preun section (bug #60409). + +* Thu Dec 8 2005 Terje Bless - 1.3.2-19 +- Drop -devel subpackage. + +* Sun Dec 4 2005 Ville Skyttä - 1.3.2-18 +- Really BuildRequire opensp-devel. +- Clean up unneeded build dependencies and configure options. +- Drop dependency on docbook-dtds. +- Fix %%post(un) syntax and catalog installation. + +* Wed Nov 30 2005 Terje Bless 1.3.2-17 +- Split opensp out into its own package. +- BuildRequire OpenSP-devel, Require OpenSP. +- Drop openjade-1.3.1-manpage.patch (it patches opensp, not openjade, and is + obsolete with external opensp). + +* Tue Mar 1 2005 Tim Waugh 1.3.2-16 +- Rebuilt for new GCC. + +* Wed Feb 9 2005 Tim Waugh 1.3.2-15 +- Rebuilt. + +* Tue Oct 5 2004 Tim Waugh 1.3.2-14 +- Build requires gettext-devel (bug #134672). + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Fri Mar 19 2004 Tim Waugh 1.3.2-11.2 +- Rebuilt. + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Sat Jan 31 2004 Tim Waugh 1.3.2-10 +- More C++ fixes (for GCC 3.4). + +* Thu Dec 4 2003 Tim Waugh 1.3.2-9 +- No longer need httphost patch. + +* Mon Oct 20 2003 Tim Waugh 1.3.2-8 +- Rebuilt. + +* Tue Sep 23 2003 Florian La Roche 1.3.2-7 +- do not link against -lnsl + +* Thu Aug 7 2003 Tim Waugh 1.3.2-6 +- Rebootstrap to create a libtool that actually works. + +* Wed Aug 6 2003 Tim Waugh 1.3.2-5 +- Rebuilt. + +* Wed Jun 04 2003 Elliot Lee 1.3.2-4 +- rebuilt + +* Thu May 22 2003 Tim Waugh 1.3.2-3 +- Fixes for GCC 3.3. +- Use --parents for %%doc. + +* Tue Mar 18 2003 Tim Waugh 1.3.2-2 +- Provide sgml2xml man page (bug #83759). +- Add devel subpackage. + +* Fri Mar 14 2003 Tim Waugh 1.3.2-1 +- OpenSP 1.5, openjade 1.3.2. +- Renumber patches. + +* Thu Feb 13 2003 Elliot Lee 1.3.1-13 +- Add openjade-ppc64.patch + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 7 2003 Jeff Johnson 1.3.1-11 +- don't include -debuginfo files in package. + +* Thu Dec 12 2002 Tim Waugh +- Fix typo in description (bug #79395). + +* Mon Nov 4 2002 Tim Waugh 1.3.1-10 +- Fix DTD retrieval from virtual hosts (bug #77137). + +* Sat Aug 10 2002 Elliot Lee +- rebuilt with gcc-3.2 (we hope) + +* Mon Jul 22 2002 Tim Powers 1.3.1-8 +- rebuild using gcc-3.2-0.1 + +* Fri Jun 21 2002 Tim Powers 1.3.1-7 +- automated rebuild + +* Thu Jun 13 2002 Tim Waugh 1.3.1-6 +- Fix sgmlnorm(1) man page (bug #64136). +- Fix %%files list (bug #64323). + +* Thu May 23 2002 Tim Powers 1.3.1-5 +- automated rebuild + +* Thu Feb 21 2002 Tim Waugh 1.3.1-4 +- Avoid bad triggers. + +* Thu Feb 21 2002 Tim Waugh 1.3.1-3 +- Rebuild in new environment. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-2 +- Ship man pages. + +* Mon Jan 28 2002 Tim Waugh 1.3.1-1 +- 1.3.1. +- Patches no longer needed: decl, strdup, foo, size_t, 31525, indev, + ligature, twosidestartonright. +- Updated lt patch. + +* Mon Jan 14 2002 Tim Waugh 1.3-22 +- Enable build on GCC 3.0 onwards. +- Run libtoolize. + +* Fri Nov 2 2001 Tim Waugh 1.3-21 +- Enable HTTP support. Now a DocBook XML document can be processed by + either xsltproc or openjade. + +* Tue Oct 30 2001 Tim Waugh 1.3-20 +- Apply twosidestartonright patch from Ian Castle. + +* Thu Oct 11 2001 Tim Waugh 1.3-19 +- s/Copyright:/License:/ +- Use %%{_tmppath}. +- Fix up libtool libraries (bug #46212). + +* Wed Sep 12 2001 Tim Powers 1.3-18 +- rebuild with new gcc and binutils + +* Fri Jun 15 2001 Tim Waugh 1.3-17 +- Apply patch from CVS to break up unintentional ligatures (bugs #11497, + #11779) + +* Mon Jun 4 2001 Tim Waugh 1.3-16 +- Apply the iNdev openjade-1.3.patch patch. + +* Tue May 29 2001 Tim Waugh 1.3-15 +- ldconfig (bug #32824). +- Fix up some libtool problems. + +* Fri Apr 27 2001 Bill Nottingham 1.3-14 +- rebuild for C++ exception handling on ia64 +- build with optimization on ia64 + +* Tue Mar 13 2001 Tim Waugh +- Avoid creating bogus TeX output for section headings containing + special characters (#bug 31525). + +* Mon Jan 22 2001 Florian La Roche +- Apply original autoconf patch to s390 s390x only. This patch can + be deleted once s390* uses a current compiler. + +* Thu Jan 19 2001 Tim Waugh +- Don't conflict with stylesheets; require sgml-common >= 0.5 instead. +- Revert autoconf change, as it's still broken. + +* Wed Jan 17 2001 Florian La Roche +- fix this autoconf macro to work on all archs :-) + +* Wed Jan 17 2001 Florian La Roche +- apply patch from Fritz Elfert + - removed explicit stripping + - Added autoconf macro for correctly recognizing if size_t + is unsigned int + +* Tue Jan 16 2001 Tim Waugh +- Default catalog file is /etc/sgml/catalog. + +* Mon Jan 08 2001 Tim Waugh +- Conflict with stylesheets (new-trials location changes). +- /usr/lib/sgml -> /usr/share/sgml/%%{name}-%%{version}. +- Remove %%post and %%postun. + +* Wed Oct 18 2000 Matt Wilson +- rebuilt against g++-2.96-60, fixes jade on alpha + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Tue Jul 4 2000 Jakub Jelinek +- Rebuild with new C++ + +* Wed May 31 2000 Matt Wilson +- fix several C++ build problems (declarations) +- build against new libstdc++ + +* Wed May 17 2000 Matt Wilson +- build with -O0 on alpha +- fix -j testing + +* Thu May 5 2000 Bill Nottingham +- openjade is maintained, and actually builds. Let's try that. + +* Thu Mar 9 2000 Bill Nottingham +- this package is way too huge. strip *everything* + +* Mon Feb 21 2000 Matt Wilson +- build with CXXFLAGS="-O2 -ggdb" to work around segfault on alpha + +* Thu Feb 3 2000 Bill Nottingham +- strip binaries + +* Wed Jan 5 2000 Bill Nottingham +- sanitize spec file some + +* Tue Aug 17 1999 Tim Powers +- fixed conflict problem with sgml-tools + +* Sat Jul 17 1999 Tim Powers +- changed buildroot path to /var/tmp +- rebuilt for 6.1 + +* Fri Apr 23 1999 Michael K. Johnson +- quiet scripts + +* Thu Apr 23 1999 Owen Taylor +- Made requires for sgml-common into prereq