From b0e47e81a5e4c6b58276cf966fe34c4db8eeff7e Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Fri, 7 Oct 2011 20:40:22 +0200 Subject: [PATCH] openjade: Convert package to new layout. --- openjade/openjade.nm | 72 ++++++++++++++++ openjade/patches/openjade-1.3.1-manpage.patch | 5 ++ .../patches/openjade-1.3.1-nsl.patch | 0 openjade/patches/openjade-1.3.2-gcc46.patch | 82 +++++++++++++++++++ .../patches/openjade-deplibs.patch | 0 .../patches/openjade-nola.patch | 0 pkgs/core/openjade/openjade.nm | 66 --------------- 7 files changed, 159 insertions(+), 66 deletions(-) create mode 100644 openjade/openjade.nm create mode 100644 openjade/patches/openjade-1.3.1-manpage.patch rename {pkgs/core/openjade => openjade}/patches/openjade-1.3.1-nsl.patch (100%) create mode 100644 openjade/patches/openjade-1.3.2-gcc46.patch rename {pkgs/core/openjade => openjade}/patches/openjade-deplibs.patch (100%) rename {pkgs/core/openjade => openjade}/patches/openjade-nola.patch (100%) delete mode 100644 pkgs/core/openjade/openjade.nm diff --git a/openjade/openjade.nm b/openjade/openjade.nm new file mode 100644 index 000000000..757e1a054 --- /dev/null +++ b/openjade/openjade.nm @@ -0,0 +1,72 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team # +############################################################################### + +name = openjade +version = 1.3.2 +release = 1 + +groups = Application/Text +url = http://openjade.sourceforge.net/ +license = MIT +summary = A DSSSL implementation. + +description + OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL + (Document Style Semantics and Specification Language). +end + +source_dl = http://downloads.sourceforge.net/project/%{name}/%{name}/%{thisapp} + +build + requires + gcc-c++ + opensp-devel + perl + end + + configure_options += \ + --disable-static \ + --disable-rpath \ + --datadir=/usr/share/sgml/openjade-%{version} \ + --enable-splibdir=/usr/lib + + install_cmds + # Create symlink for jade + ln -s openjade %{BUILDROOT}/usr/bin/jade + + # Install jade catalog + cp %{DIR_APP}/dsssl/catalog %{BUILDROOT}/usr/share/sgml/openjade-%{version}/ + cp %{DIR_APP}/dsssl/{dsssl,style-sheet,fot}.dtd %{BUILDROOT}/usr/share/sgml/openjade-%{version}/ + + # Add unversioned/versioned catalog and symlink + mkdir -p %{BUILDROOT}/etc/sgml + touch %{BUILDROOT}/etc/sgml/openjade-%{version}.soc + ln -s openjade-%{version}.soc openjade.soc + end +end + +packages + package %{name} + provides + jade + end + + script postin + # Install catalog files on system. + /usr/bin/install-catalog --add /etc/sgml/openjade-%{version}.soc \ + /usr/share/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + end + + script preun + # Uninstall the catalog files. + /usr/bin/install-catalog --remove /etc/sgml/%{name}-%{version}.soc \ + /usr/share/sgml/%{name}-%{version}/catalog >/dev/null 2>/dev/null || : + end + end + + package %{name}-devel + template DEVEL + end +end diff --git a/openjade/patches/openjade-1.3.1-manpage.patch b/openjade/patches/openjade-1.3.1-manpage.patch new file mode 100644 index 000000000..935ad2d6d --- /dev/null +++ b/openjade/patches/openjade-1.3.1-manpage.patch @@ -0,0 +1,5 @@ +--- openjade-1.3.1/docsrc/sgmlnorm.1.manpage 2002-06-13 17:45:48.000000000 +0100 ++++ openjade-1.3.1/docsrc/sgmlnorm.1 2002-06-13 17:45:58.000000000 +0100 +@@ -1 +1 @@ +-.so man1/sgmlnorm.1 ++.so man1/osgmlnorm.1 diff --git a/pkgs/core/openjade/patches/openjade-1.3.1-nsl.patch b/openjade/patches/openjade-1.3.1-nsl.patch similarity index 100% rename from pkgs/core/openjade/patches/openjade-1.3.1-nsl.patch rename to openjade/patches/openjade-1.3.1-nsl.patch diff --git a/openjade/patches/openjade-1.3.2-gcc46.patch b/openjade/patches/openjade-1.3.2-gcc46.patch new file mode 100644 index 000000000..962ac19ff --- /dev/null +++ b/openjade/patches/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/pkgs/core/openjade/patches/openjade-deplibs.patch b/openjade/patches/openjade-deplibs.patch similarity index 100% rename from pkgs/core/openjade/patches/openjade-deplibs.patch rename to openjade/patches/openjade-deplibs.patch diff --git a/pkgs/core/openjade/patches/openjade-nola.patch b/openjade/patches/openjade-nola.patch similarity index 100% rename from pkgs/core/openjade/patches/openjade-nola.patch rename to openjade/patches/openjade-nola.patch diff --git a/pkgs/core/openjade/openjade.nm b/pkgs/core/openjade/openjade.nm deleted file mode 100644 index fc572a69c..000000000 --- a/pkgs/core/openjade/openjade.nm +++ /dev/null @@ -1,66 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include $(PKGROOT)/Include - -PKG_NAME = openjade -PKG_VER = 1.3.2 -PKG_REL = 0 - -PKG_MAINTAINER = -PKG_GROUP = Application/Text -PKG_URL = http://openjade.sourceforge.net/ -PKG_LICENSE = MIT -PKG_SUMMARY = A DSSSL implementation. - -PKG_PACKAGES += $(PKG_NAME_REAL)-devel - -PKG_BUILD_DEPS+= gcc-c++ opensp-devel perl - -define PKG_DESCRIPTION - OpenJade is an implementation of the ISO/IEC 10179:1996 standard DSSSL \ - (Document Style Semantics and Specification Language). -endef - -PKG_TARBALL = $(THISAPP).tar.gz - -CONFIGURE_OPTIONS += \ - --disable-static \ - --disable-rpath \ - --datadir=/usr/share/sgml/openjade-$(PKG_VER) \ - --enable-splibdir=/usr/lib - -define STAGE_INSTALL_CMDS - # Create symlink for jade - ln -s openjade $(BUILDROOT)/usr/bin/jade - - # Install jade catalog - cp $(DIR_APP)/dsssl/catalog $(BUILDROOT)/usr/share/sgml/openjade-$(PKG_VER)/ - cp $(DIR_APP)/dsssl/{dsssl,style-sheet,fot}.dtd $(BUILDROOT)/usr/share/sgml/openjade-$(PKG_VER)/ - - # Add unversioned/versioned catalog and symlink - mkdir -p $(BUILDROOT)/etc/sgml - touch $(BUILDROOT)/etc/sgml/openjade-$(PKG_VER).soc - ln -s openjade-$(PKG_VER).soc openjade.soc -endef -- 2.39.2