From c527fd1f14c27855a37f2e8ac5346ce8d940ced2 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 16 Oct 2014 03:05:19 +0200 Subject: initial commit for Enea Linux 4.0-140929 Migrated from the internal git server on the daisy-enea-point-release branch Signed-off-by: Tudor Florea --- .../openjade/openjade-1.3.2/fix-regex.patch | 32 ++++++++ .../openjade/openjade-1.3.2/makefile.patch | 39 +++++++++ .../openjade/openjade-1.3.2/msggen.pl.patch | 44 +++++++++++ .../openjade/openjade-1.3.2/reautoconf.patch | 83 +++++++++++++++++++ .../user-declared-default-constructor.patch | 92 ++++++++++++++++++++++ 5 files changed, 290 insertions(+) create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch create mode 100644 meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch (limited to 'meta/recipes-devtools/openjade/openjade-1.3.2') diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch new file mode 100644 index 0000000000..6b40afdad8 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch @@ -0,0 +1,32 @@ +From 55f6fd8f1958aa36584eefeecce782a505963c88 Mon Sep 17 00:00:00 2001 +From: benvm +Date: Wed, 9 Jan 2013 12:14:06 -0500 +Subject: [PATCH] Fix Makefile regular expression + +This patch modifies a regular expression within a Makefile to stop builds +from failing in the case where the path contains the characters ".a". + +Upstream-Status: Submitted + +Signed-off-by: Kai Kang + +--- + Makefile.prog.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.prog.in b/Makefile.prog.in +index 76310c9..44c3534 100644 +--- a/Makefile.prog.in ++++ b/Makefile.prog.in +@@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@ + + ALL_LIBS = $(XLIBS) $(LIBS) + Makefile.lt: +- echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt ++ echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt + + PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') + +-- +1.7.0.4 + diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch new file mode 100644 index 0000000000..968b9b47cf --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch @@ -0,0 +1,39 @@ +This patch fixes libtool QA issues with WORKDIR creeping in to +libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded. + +Upstream-Status: Inappropriate [Other] +Workaround is specific to our build system. + +Signed-off-by: Scott Garman + +Index: openjade-1.3.2/spgrove/Makefile.sub +=================================================================== +--- openjade-1.3.2.orig/spgrove/Makefile.sub ++++ openjade-1.3.2/spgrove/Makefile.sub +@@ -1,8 +1,8 @@ + LTVERSION=0:1:0 + LIB=ospgrove + INCLUDE=-I$(srcdir)/../grove +-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ +- -L$(TOP)/lib -L$(TOP)/lib/.libs \ ++DEPLIBS=-lm $(TOP)/grove \ ++ $(TOP)/lib \ + $(LIB_THREADS) + OBJS=GroveApp.o GroveBuilder.o SdNode.o + GENSRCS=grove_inst.cxx +Index: openjade-1.3.2/style/Makefile.sub +=================================================================== +--- openjade-1.3.2.orig/style/Makefile.sub ++++ openjade-1.3.2/style/Makefile.sub +@@ -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=-lm $(TOP)/grove \ ++ $(TOP)/lib \ ++ $(TOP)/spgrove + OBJS=LangObj.o \ + Collector.o \ + DssslApp.o \ diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch new file mode 100644 index 0000000000..b47fd4655f --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch @@ -0,0 +1,44 @@ +commit fcc5b94f118495b1a467edcda6c6f631691c3f69 +Author: Dennis Lan +Date: Tue Jul 3 09:25:42 2012 +0800 + + openjade: fix undefined Getopts error, use std namespace + + Using Gentoo Linux as the build host, it fails without this patch + Use Getopt::Std in place of getopts.pl. + + Upstream-Status: Inappropriate [no upstream] + Original-Author-By: Mike Gilbert + Signed-off-by: Dennis Lan + +diff --git a/msggen.pl b/msggen.pl +index 0c33968..2ee3f66 100644 +--- 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 @@ $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; + +@@ -72,7 +72,7 @@ while () { + 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"); diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch new file mode 100644 index 0000000000..1a23a4a685 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch @@ -0,0 +1,83 @@ +Ensure we reautoconf the packag + +Currently since configure.in in is in a subdirectory, we don't reautoconf the +recipe. We really need to do this, to update things like the libtool script used +and fix various issues such as those that could creep in if a reautoconf is +triggered for some reason. Since this source only calls AM_INIT_AUTOMAKE to +gain the PACKAGE and VERSION definitions and that macro now errors if Makefile.am +doesn't exist, we need to add these definitions manually. + +These changes avoid failures like: +---- +| ... +| DssslApp.cxx:117:36: error: 'PACKAGE' was not declared in this scope +| DssslApp.cxx:118:36: error: 'VERSION' was not declared in this scope +| make[2]: *** [DssslApp.lo] Error 1 ---- + +Upstream-Status: Pending + +RP 2012/6/12 + +Index: openjade-1.3.2/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ openjade-1.3.2/acinclude.m4 2012-06-12 12:48:54.871365344 +0000 +@@ -0,0 +1,39 @@ ++dnl Configure-time switch with default ++dnl ++dnl Each switch defines an --enable-FOO and --disable-FOO option in ++dnl the resulting configure script. ++dnl ++dnl Usage: ++dnl smr_SWITCH(name, description, default, pos-def, neg-def) ++dnl ++dnl where: ++dnl ++dnl name name of switch; generates --enable-name & --disable-name ++dnl options ++dnl description help string is set to this prefixed by "enable" or ++dnl "disable", whichever is the non-default value ++dnl default either "on" or "off"; specifies default if neither ++dnl --enable-name nor --disable-name is specified ++dnl pos-def a symbol to AC_DEFINE if switch is on (optional) ++dnl neg-def a symbol to AC_DEFINE if switch is off (optional) ++dnl ++AC_DEFUN(smr_SWITCH, [ ++ AC_MSG_CHECKING(whether to enable $2) ++ AC_ARG_ENABLE( ++ $1, ++ ifelse($3, on, ++ [ --disable-[$1] disable [$2]], ++ [ --enable-[$1] enable [$2]]), ++ [ if test "$enableval" = yes; then ++ AC_MSG_RESULT(yes) ++ ifelse($4, , , AC_DEFINE($4)) ++ else ++ AC_MSG_RESULT(no) ++ ifelse($5, , , AC_DEFINE($5)) ++ fi ], ++ ifelse($3, on, ++ [ AC_MSG_RESULT(yes) ++ ifelse($4, , , AC_DEFINE($4)) ], ++ [ AC_MSG_RESULT(no) ++ ifelse($5, , , AC_DEFINE($5))]))]) ++ +Index: openjade-1.3.2/config/configure.in +=================================================================== +--- openjade-1.3.2.orig/config/configure.in 2012-06-12 12:47:20.735365445 +0000 ++++ openjade-1.3.2/config/configure.in 2012-06-12 12:48:17.507364080 +0000 +@@ -12,9 +12,12 @@ + dnl Credits: this autoconf script was largely "inspired" by the + dnl autoconf script around SP made by Henry Thompson. + dnl +-AC_INIT(dsssl) ++AC_INIT([openjade], [1.3.2]) + AC_CONFIG_AUX_DIR(config) +-AM_INIT_AUTOMAKE( openjade, 1.3.2) ++AC_SUBST([PACKAGE], [openjade]) ++AC_SUBST([VERSION], [1.3.2]) ++AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") ++AC_DEFINE_UNQUOTED(VERSION, "$VERSION") + TOP=`pwd` + AC_SUBST(TOP) + dnl diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch new file mode 100644 index 0000000000..073af46fc5 --- /dev/null +++ b/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch @@ -0,0 +1,92 @@ +In GCC 4.6 the compiler no longer allows objects of const-qualified type to +be default initialized unless the type has a user-declared default +constructor. + +Patch from Gentoo bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=358021 + +Gentoo Bugzilla description follows: +"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" + +Upstream-Status: Pending + +Signed-off-by: Scott Garman + +--- 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_; + }; -- cgit v1.2.3-54-g00ecf