diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2016-09-30 12:52:25 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-28 16:15:19 +0100 |
commit | 671780de49f93ec1cc28f5ad2a7eebe211918b85 (patch) | |
tree | 42ebe78d73a3f0a0fa49fb83ff1f2e557c9dc505 | |
parent | d95ef2a0aa3116783cd01a905b46fc4920ebae9f (diff) | |
download | poky-671780de49f93ec1cc28f5ad2a7eebe211918b85.tar.gz |
Remove the SGML stack
It is not used for anything, and is something of a pain to maintain.
(From OE-Core rev: 4814d93646f6b86aaffbd3fca1af29c8c577db5b)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
27 files changed, 0 insertions, 1261 deletions
diff --git a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb deleted file mode 100644 index b7791f360b..0000000000 --- a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb +++ /dev/null | |||
@@ -1,71 +0,0 @@ | |||
1 | SUMMARY = "DSSSL stylesheets used to transform SGML and XML DocBook files" | ||
2 | HOMEPAGE = "http://docbook.sourceforge.net" | ||
3 | # Simple persmissive | ||
4 | LICENSE = "DSSSL" | ||
5 | LIC_FILES_CHKSUM = "file://README;beginline=41;endline=74;md5=875385159b2ee76ecf56136ae7f542d6" | ||
6 | |||
7 | DEPENDS = "sgml-common-native" | ||
8 | |||
9 | PR = "r4" | ||
10 | |||
11 | SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-dsssl-${PV}.tar.bz2" | ||
12 | |||
13 | SRC_URI[md5sum] = "bc192d23266b9a664ca0aba4a7794c7c" | ||
14 | SRC_URI[sha256sum] = "2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc" | ||
15 | |||
16 | UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-dsssl/" | ||
17 | UPSTREAM_CHECK_REGEX = "/docbook-dsssl/(?P<pver>(\d+[\.\-_]*)+)/" | ||
18 | |||
19 | S = "${WORKDIR}/docbook-dsssl-${PV}" | ||
20 | |||
21 | inherit native | ||
22 | |||
23 | SSTATEPOSTINSTFUNCS += "docbook_dsssl_stylesheets_sstate_postinst" | ||
24 | SYSROOT_PREPROCESS_FUNCS += "docbook_dsssl_sysroot_preprocess" | ||
25 | CLEANFUNCS += "docbook_dsssl_stylesheets_sstate_clean" | ||
26 | |||
27 | |||
28 | do_install () { | ||
29 | # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html | ||
30 | # for details. | ||
31 | install -d ${D}${bindir} | ||
32 | install -m 0755 bin/collateindex.pl ${D}${bindir} | ||
33 | |||
34 | install -d ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV} | ||
35 | install -m 0644 catalog ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV} | ||
36 | cp -v -R * ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV} | ||
37 | |||
38 | install -d ${D}${sysconfdir}/sgml | ||
39 | echo "CATALOG ${datadir}/sgml/docbook/dsssl-stylesheets-${PV}/catalog" > \ | ||
40 | ${D}${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat | ||
41 | echo "CATALOG ${datadir}/sgml/docbook/dsssl-stylesheets-${PV}/common/catalog" >> \ | ||
42 | ${D}${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat | ||
43 | } | ||
44 | |||
45 | docbook_dsssl_stylesheets_sstate_postinst () { | ||
46 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | ||
47 | then | ||
48 | # Ensure that the catalog file sgml-docbook.cat is properly | ||
49 | # updated when the package is installed from sstate cache. | ||
50 | ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \ | ||
51 | --add ${sysconfdir}/sgml/sgml-docbook.bak \ | ||
52 | ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat | ||
53 | ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl \ | ||
54 | --add ${sysconfdir}/sgml/sgml-docbook.cat \ | ||
55 | ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat | ||
56 | fi | ||
57 | } | ||
58 | |||
59 | docbook_dsssl_sysroot_preprocess () { | ||
60 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | ||
61 | install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-dsssl | ||
62 | } | ||
63 | |||
64 | docbook_dsssl_stylesheets_sstate_clean () { | ||
65 | # Ensure that the catalog file sgml-docbook.cat is properly | ||
66 | # updated when the package is removed from sstate cache. | ||
67 | files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat" | ||
68 | for f in $files; do | ||
69 | [ ! -f $f ] || sed -i '/\/sgml\/dsssl-docbook-stylesheets.cat/d' $f | ||
70 | done | ||
71 | } | ||
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb deleted file mode 100644 index a3ee5d83a6..0000000000 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-3.1-native_3.1.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | require docbook-sgml-dtd-native.inc | ||
2 | |||
3 | LICENSE = "OASIS" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" | ||
5 | |||
6 | DTD_VERSION = "3.1" | ||
7 | |||
8 | PR = "${INC_PR}.0" | ||
9 | |||
10 | # Note: the upstream sources are not distributed with a license file. | ||
11 | # LICENSE-OASIS is included as a "patch" to workaround this. When | ||
12 | # upgrading this recipe, please verify whether this is still needed. | ||
13 | SRC_URI = "http://www.docbook.org/sgml/3.1/docbk31.zip \ | ||
14 | file://LICENSE-OASIS" | ||
15 | |||
16 | SRC_URI[md5sum] = "432749c0c806dbae81c8bcb70da3b5d3" | ||
17 | SRC_URI[sha256sum] = "20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538" | ||
18 | |||
19 | UPSTREAM_CHECK_URI = "http://www.docbook.org/sgml/" | ||
20 | UPSTREAM_CHECK_REGEX = "(?P<pver>3\..+)/" | ||
21 | |||
22 | do_compile() { | ||
23 | # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd-3.html | ||
24 | # for details. | ||
25 | sed -i -e '/ISO 8879/d' -e 's|DTDDECL "-//OASIS//DTD DocBook V3.1//EN"|SGMLDECL|g' docbook.cat | ||
26 | } | ||
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb deleted file mode 100644 index be59680770..0000000000 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.1-native_4.1.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | require docbook-sgml-dtd-native.inc | ||
2 | |||
3 | LICENSE = "OASIS" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" | ||
5 | |||
6 | DTD_VERSION = "4.1" | ||
7 | |||
8 | PR = "${INC_PR}.0" | ||
9 | |||
10 | # Note: the upstream sources are not distributed with a license file. | ||
11 | # LICENSE-OASIS is included as a "patch" to workaround this. When | ||
12 | # upgrading this recipe, please verify whether this is still needed. | ||
13 | SRC_URI = "http://docbook.org/sgml/4.1/docbk41.zip \ | ||
14 | file://LICENSE-OASIS" | ||
15 | |||
16 | SRC_URI[md5sum] = "489f6ff2a2173eb1e14216c10533ede2" | ||
17 | SRC_URI[sha256sum] = "deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311" | ||
18 | |||
19 | UPSTREAM_CHECK_URI = "http://www.docbook.org/sgml/" | ||
20 | UPSTREAM_CHECK_REGEX = "(?P<pver>4\.1(\.\d+)*)/" | ||
21 | |||
22 | do_compile() { | ||
23 | # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html | ||
24 | # for details. | ||
25 | sed -i -e '/ISO 8879/d' -e '/gml/d' docbook.cat | ||
26 | } | ||
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb deleted file mode 100644 index ae723c74fe..0000000000 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-4.5-native.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | require docbook-sgml-dtd-native.inc | ||
2 | |||
3 | LICENSE = "OASIS" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" | ||
5 | |||
6 | DTD_VERSION = "4.5" | ||
7 | |||
8 | PR = "${INC_PR}.0" | ||
9 | PV = "4.5" | ||
10 | |||
11 | SRC_URI[md5sum] = "07c581f4bbcba6d3aac85360a19f95f7" | ||
12 | SRC_URI[sha256sum] = "8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43" | ||
13 | |||
14 | do_compile() { | ||
15 | # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html | ||
16 | # for details. | ||
17 | sed -i -e '/ISO 8879/d' -e'/gml/d' docbook.cat | ||
18 | } | ||
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc deleted file mode 100644 index af50987968..0000000000 --- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | # The DTDs of the various versions have to be installed in parallel and | ||
2 | # should not replace each other. The installation step is common for | ||
3 | # all versions and just differs in ${DTD_VERSION} which is set in each | ||
4 | # version recipe. | ||
5 | # | ||
6 | # The DTDs do have some quirks (see LFS documentation). | ||
7 | SUMMARY = "Document type definitions for verification of SGML data files" | ||
8 | DESCRIPTION = "Document type definitions for verification of SGML data \ | ||
9 | files against the DocBook rule set" | ||
10 | HOMEPAGE = "http://www.docbook.org/sgml/" | ||
11 | |||
12 | DEPENDS = "sgml-common-native" | ||
13 | |||
14 | # Note: the upstream sources are not distributed with a license file. | ||
15 | # LICENSE-OASIS is included as a "patch" to workaround this. When | ||
16 | # upgrading this recipe, please verify whether this is still needed. | ||
17 | SRC_URI = "http://www.docbook.org/sgml/${DTD_VERSION}/docbook-${DTD_VERSION}.zip \ | ||
18 | file://LICENSE-OASIS" | ||
19 | |||
20 | # The .zip file extracts to the current dir | ||
21 | S = "${WORKDIR}" | ||
22 | |||
23 | INC_PR = "r3" | ||
24 | |||
25 | SSTATEPOSTINSTFUNCS += "docbook_sgml_dtd_sstate_postinst" | ||
26 | SYSROOT_PREPROCESS_FUNCS += "docbook_sgml_dtd_sysroot_preprocess" | ||
27 | |||
28 | inherit native | ||
29 | |||
30 | do_install () { | ||
31 | # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/sgml-dtd.html | ||
32 | # for details. | ||
33 | install -d -m 755 ${D}${datadir}/sgml/docbook/sgml-dtd-${DTD_VERSION} | ||
34 | install docbook.cat ${D}${datadir}/sgml/docbook/sgml-dtd-${DTD_VERSION}/catalog | ||
35 | cp -PpRr *.dtd *.mod *.dcl ${D}${datadir}/sgml/docbook/sgml-dtd-${DTD_VERSION} | ||
36 | |||
37 | install -d ${D}${sysconfdir}/sgml | ||
38 | echo "CATALOG ${datadir}/sgml/docbook/sgml-dtd-${DTD_VERSION}/catalog" > \ | ||
39 | ${D}${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat | ||
40 | } | ||
41 | |||
42 | docbook_sgml_dtd_sstate_postinst () { | ||
43 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | ||
44 | then | ||
45 | # Ensure that the catalog file sgml-docbook.cat is properly | ||
46 | # updated when the package is installed from sstate cache. | ||
47 | ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} \ | ||
48 | --add ${sysconfdir}/sgml/sgml-docbook.bak \ | ||
49 | ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat | ||
50 | ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} \ | ||
51 | --add ${sysconfdir}/sgml/sgml-docbook.cat \ | ||
52 | ${sysconfdir}/sgml/sgml-docbook-dtd-${DTD_VERSION}.cat | ||
53 | fi | ||
54 | } | ||
55 | |||
56 | docbook_sgml_dtd_sysroot_preprocess () { | ||
57 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | ||
58 | install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-docbook-sgml-dtd-${DTD_VERSION} | ||
59 | } | ||
60 | |||
61 | CLEANFUNCS += "docbook_sgml_dtd_sstate_clean" | ||
62 | |||
63 | docbook_sgml_dtd_sstate_clean () { | ||
64 | # Ensure that the catalog file sgml-docbook.cat is properly | ||
65 | # updated when the package is removed from sstate cache. | ||
66 | files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat" | ||
67 | for f in $files; do | ||
68 | [ ! -f $f ] || sed -i '/\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat/d' $f | ||
69 | done | ||
70 | } | ||
diff --git a/meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS b/meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS deleted file mode 100644 index 6da7f5b8c7..0000000000 --- a/meta/recipes-devtools/docbook-sgml-dtd/files/LICENSE-OASIS +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Permission to use, copy, modify and distribute the DocBook XML DTD | ||
2 | and its accompanying documentation for any purpose and without fee | ||
3 | is hereby granted in perpetuity, provided that the above copyright | ||
4 | notice and this paragraph appear in all copies. The copyright | ||
5 | holders make no representation about the suitability of the DTD for | ||
6 | any purpose. It is provided "as is" without expressed or implied | ||
7 | warranty. | ||
8 | |||
9 | If you modify the DocBook DTD in any way, except for declaring and | ||
10 | referencing additional sets of general entities and declaring | ||
11 | additional notations, label your DTD as a variant of DocBook. See | ||
12 | the maintenance documentation for more information. | ||
13 | |||
14 | Please direct all questions, bug reports, or suggestions for | ||
15 | changes to the docbook@lists.oasis-open.org mailing list. For more | ||
16 | information, see http://www.oasis-open.org/docbook/. | ||
diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch b/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch deleted file mode 100644 index db079d68fd..0000000000 --- a/meta/recipes-devtools/docbook-utils/docbook-utils-0.6.14/re.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Fix runtime error occurred e.g. with docbook-to-man calls: | ||
4 | |||
5 | grep: character class syntax is [[:space:]], not [:space:] | ||
6 | grep: character class syntax is [[:space:]], not [:space:] | ||
7 | jw: There is no frontend called "/docbook/utils-0.6.14/frontends/docbook". | ||
8 | |||
9 | See also: | ||
10 | |||
11 | <https://qa.mandriva.com/show_bug.cgi?id=61127> | ||
12 | |||
13 | Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> | ||
14 | |||
15 | diff -Nurd docbook-utils-0.6.14-orig/bin/jw.in docbook-utils-0.6.14/bin/jw.in | ||
16 | --- docbook-utils-0.6.14-orig/bin/jw.in 2012-03-29 07:50:00.789564826 +0200 | ||
17 | +++ docbook-utils-0.6.14/bin/jw.in 2012-03-29 07:52:10.371302967 +0200 | ||
18 | @@ -80,9 +80,9 @@ | ||
19 | SGML_CATALOGS_DIR="/etc/sgml" | ||
20 | if [ -f "$SGML_CONF" ] | ||
21 | then | ||
22 | - RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*' | ||
23 | + RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*' | ||
24 | SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` | ||
25 | - RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*' | ||
26 | + RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*' | ||
27 | SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"` | ||
28 | fi | ||
29 | |||
diff --git a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb b/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb deleted file mode 100644 index c3a5f3b421..0000000000 --- a/meta/recipes-devtools/docbook-utils/docbook-utils-native_0.6.14.bb +++ /dev/null | |||
@@ -1,63 +0,0 @@ | |||
1 | SUMMARY = "Utilities for formatting and manipulating DocBook documents" | ||
2 | DESCRIPTION = "A collection of all the free software tools you need to \ | ||
3 | work on and format DocBook documents." | ||
4 | HOMEPAGE = "http://sources.redhat.com/docbook-tools/" | ||
5 | SECTION = "console/utils" | ||
6 | LICENSE = "GPLv2" | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
8 | DEPENDS = "openjade-native sgmlspl-native docbook-dsssl-stylesheets-native docbook-sgml-dtd-3.1-native" | ||
9 | |||
10 | PR = "r3" | ||
11 | |||
12 | SRC_URI = "\ | ||
13 | ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-${PV}.tar.gz \ | ||
14 | file://re.patch \ | ||
15 | " | ||
16 | |||
17 | SRC_URI[md5sum] = "6b41b18c365c01f225bc417cf632d81c" | ||
18 | SRC_URI[sha256sum] = "48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9" | ||
19 | |||
20 | inherit autotools native | ||
21 | |||
22 | do_configure_prepend() { | ||
23 | # Fix hard-coded references to /etc/sgml | ||
24 | if [ ! -e ${S}/.sed_done ]; then | ||
25 | sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" ${S}/bin/jw.in | ||
26 | sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" ${S}/doc/man/Makefile.am | ||
27 | sed -i -e "s|/etc/sgml|${sysconfdir}/sgml|g" ${S}/doc/HTML/Makefile.am | ||
28 | |||
29 | # Point jw to the native sysroot catalog | ||
30 | sed -i -e 's|^SGML_EXTRA_CATALOGS=""|SGML_EXTRA_CATALOGS=":${sysconfdir}/sgml/catalog"|g' ${S}/bin/jw.in | ||
31 | touch ${S}/.sed_done | ||
32 | fi | ||
33 | } | ||
34 | do_unpack[cleandirs] += "${S}" | ||
35 | |||
36 | do_install() { | ||
37 | install -d ${D}${bindir} | ||
38 | # Install the binaries and a bunch of other commonly used names for them. | ||
39 | for doctype in html ps dvi man pdf rtf tex texi txt | ||
40 | do | ||
41 | install -m 0755 ${S}/bin/docbook2$doctype ${D}${bindir}/ | ||
42 | ln -sf docbook2x-$doctype ${D}${bindir}/db2$doctype | ||
43 | ln -sf docbook2$doctype ${D}${bindir}/db2$doctype | ||
44 | ln -sf docbook2$doctype ${D}${bindir}/docbook-to-$doctype | ||
45 | done | ||
46 | |||
47 | install -m 0755 ${B}/bin/jw ${D}${bindir}/ | ||
48 | for i in backends/dvi backends/html \ | ||
49 | backends/pdf backends/ps backends/rtf backends/tex \ | ||
50 | backends/txt \ | ||
51 | helpers/docbook2man-spec.pl helpers/docbook2texi-spec.pl \ | ||
52 | docbook-utils.dsl | ||
53 | do | ||
54 | install -d ${D}${datadir}/sgml/docbook/utils-${PV}/`dirname $i` | ||
55 | install ${S}/$i ${D}${datadir}/sgml/docbook/utils-${PV}/$i | ||
56 | done | ||
57 | for i in backends/man backends/texi frontends/docbook | ||
58 | do | ||
59 | install -d ${D}${datadir}/sgml/docbook/utils-${PV}/`dirname $i` | ||
60 | install ${B}/$i ${D}${datadir}/sgml/docbook/utils-${PV}/$i | ||
61 | done | ||
62 | |||
63 | } | ||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb deleted file mode 100644 index a5deb2e2d5..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools-native_0.9.69.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | SUMMARY = "Convert LinuxDoc SGML source into other formats" | ||
2 | HOMEPAGE = "http://packages.debian.org/linuxdoc-tools" | ||
3 | LICENSE = "GPLv3+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=077ef64ec3ac257fb0d786531cf26931" | ||
5 | |||
6 | DEPENDS = "groff-native openjade-native" | ||
7 | |||
8 | SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/l/${BPN}/${BPN}_${PV}.orig.tar.gz \ | ||
9 | file://disable_sgml2rtf.patch \ | ||
10 | file://disable_txt_doc.patch \ | ||
11 | file://disable_tex_doc.patch \ | ||
12 | file://disable_dvips_doc.patch" | ||
13 | |||
14 | SRC_URI[md5sum] = "1d13d500918a7a145b0edc2f16f61dd1" | ||
15 | SRC_URI[sha256sum] = "7103facee18a2ea97186ca459d743d22f7f89ad4b5cd1dfd1c34f83d6bfd4101" | ||
16 | |||
17 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/l/linuxdoc-tools/" | ||
18 | inherit autotools-brokensep native | ||
19 | |||
20 | do_configure () { | ||
21 | oe_runconf | ||
22 | } | ||
23 | |||
24 | do_install() { | ||
25 | oe_runmake 'DESTDIR=${D}' 'TMPDIR=${T}' install | ||
26 | } | ||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch deleted file mode 100644 index 490b367990..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_dvips_doc.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | Disable building documentation which requires the dvips utility. | ||
2 | This patch should be dropped once we include a native version of | ||
3 | dvips. | ||
4 | |||
5 | Upstream-Status: Inappropriate [Other] | ||
6 | Temporary workaround which disables documentation. | ||
7 | |||
8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
9 | |||
10 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | ||
11 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2011-02-25 15:26:41.142917782 -0800 | ||
12 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:27:25.141917472 -0800 | ||
13 | @@ -52,13 +52,13 @@ | ||
14 | # $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide | ||
15 | #fi | ||
16 | |||
17 | -if [ -n "`which dvips`" ]; then | ||
18 | - echo " + dvips" >&2 | ||
19 | - dvips -t letter -o ./guide.ps ./guide.dvi | ||
20 | - if [ -n "`which gzip`" -a -f ./guide.ps ]; then | ||
21 | - gzip -fN ./guide.ps | ||
22 | - fi | ||
23 | -fi | ||
24 | +#if [ -n "`which dvips`" ]; then | ||
25 | +# echo " + dvips" >&2 | ||
26 | +# dvips -t letter -o ./guide.ps ./guide.dvi | ||
27 | +# if [ -n "`which gzip`" -a -f ./guide.ps ]; then | ||
28 | +# gzip -fN ./guide.ps | ||
29 | +# fi | ||
30 | +#fi | ||
31 | |||
32 | |||
33 | echo "- Building info docs" >&2 | ||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch deleted file mode 100644 index 50c8a8f3fe..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_sgml2rtf.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 756f20e70a97ee2dea9b32c0955eabfc27f29be1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
3 | Date: Wed, 29 May 2013 16:50:17 +0300 | ||
4 | Subject: [PATCH] The build of sgml2rtf is problematic due to the way it wants | ||
5 | to link to a shared library version of flex. Flex only | ||
6 | ships with a static lib. Rather than diverging from | ||
7 | upstream flex, simply skip building this un-needed utility. | ||
8 | |||
9 | Upstream-Status: Inappropriate [Other] | ||
10 | Workaround which disables a feature. | ||
11 | |||
12 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
13 | Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com> | ||
14 | --- | ||
15 | Makefile.in | 12 ++++++------ | ||
16 | 1 file changed, 6 insertions(+), 6 deletions(-) | ||
17 | |||
18 | diff --git a/Makefile.in b/Makefile.in | ||
19 | index 359f14e..fc04020 100644 | ||
20 | --- a/Makefile.in | ||
21 | +++ b/Makefile.in | ||
22 | @@ -40,7 +40,7 @@ perl5lib_ddir = $(DESTDIR)$(perl5libdir) | ||
23 | pkgdata_ddir = $(DESTDIR)$(pkgdatadir) | ||
24 | tex_ddir = $(DESTDIR)$(texdir) | ||
25 | |||
26 | -progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck | ||
27 | +progs := sgml2html sgml2info sgml2latex sgml2lyx sgml2txt sgmlcheck | ||
28 | |||
29 | PROFILE = | ||
30 | INCLUDE = | ||
31 | @@ -71,9 +71,9 @@ endif | ||
32 | ( cd sgmlpre ; \ | ||
33 | $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LEX=flex sgmlpre || exit -1 ) | ||
34 | |||
35 | - @echo "Compiling RTF conversion tools (in rtf-fix/)..." | ||
36 | - ( cd rtf-fix ; \ | ||
37 | - $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 ) | ||
38 | +# @echo "Compiling RTF conversion tools (in rtf-fix/)..." | ||
39 | +# ( cd rtf-fix ; \ | ||
40 | +# $(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" || exit -1 ) | ||
41 | |||
42 | @echo "making man pages in genman ..." | ||
43 | if [ ! -d genman ]; then mkdir genman ; fi | ||
44 | @@ -117,7 +117,7 @@ endif | ||
45 | |||
46 | # -- Install auxiliary programs | ||
47 | mkdir -p $(auxbin_ddir) | ||
48 | - for ii in sgmlpre/sgmlpre rtf-fix/rtf2rtf; do \ | ||
49 | + for ii in sgmlpre/sgmlpre; do \ | ||
50 | bn=`basename $$ii`; \ | ||
51 | $(INSTALL_PROGRAM) $$ii $(auxbin_ddir)/$$bn; \ | ||
52 | done | ||
53 | @@ -206,7 +206,7 @@ bin/linuxdoc:: Makefile bin/linuxdoc.in | ||
54 | |||
55 | clean:: | ||
56 | -rm -f *~ bin/*~ bin/linuxdoc | ||
57 | - for d in $(DDIRS) $(MDIRS) rtf-fix; do $(MAKE) -C $$d clean; done | ||
58 | + for d in $(DDIRS) $(MDIRS); do $(MAKE) -C $$d clean; done | ||
59 | (cd sgmlpre ; rm -f sgmlpre.o sgmlpre) | ||
60 | -rm -rf genman/ | ||
61 | |||
62 | -- | ||
63 | 1.7.9.5 | ||
64 | |||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch deleted file mode 100644 index b62895c67d..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_tex_doc.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | Disable building documentation which requires the latex utility. | ||
2 | This patch should be dropped once we include a native version of | ||
3 | latex. | ||
4 | |||
5 | Upstream-Status: Inappropriate [Other] | ||
6 | Temporary workaround which disables documentation. | ||
7 | |||
8 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
9 | |||
10 | diff -urN linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | ||
11 | --- linuxdoc-tools-0.9.66.orig/doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 | ||
12 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-02-25 15:23:58.610016114 -0800 | ||
13 | @@ -46,11 +46,11 @@ | ||
14 | $TMPDIR/sgml2txt -b 1 ./guide | ||
15 | fi | ||
16 | |||
17 | -if [ -n "`which latex`" ]; then | ||
18 | - ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex | ||
19 | - echo "- Building latex docs" >&2 | ||
20 | - $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide | ||
21 | -fi | ||
22 | +#if [ -n "`which latex`" ]; then | ||
23 | +# ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex | ||
24 | +# echo "- Building latex docs" >&2 | ||
25 | +# $TMPDIR/sgml2latex --pass="\usepackage{times}" -o dvi ./guide | ||
26 | +#fi | ||
27 | |||
28 | if [ -n "`which dvips`" ]; then | ||
29 | echo " + dvips" >&2 | ||
diff --git a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch b/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch deleted file mode 100644 index 8d784110db..0000000000 --- a/meta/recipes-devtools/linuxdoc-tools/linuxdoc-tools/disable_txt_doc.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | Disable building txt documentation. This is a temporary workaround, | ||
2 | as I have found an Ubuntu 10.10 system which throws errors during | ||
3 | building this that I'd like to ultimately fix. The error manifests | ||
4 | itself from the end of LinuxDocTools.pm with the following messages | ||
5 | during do_install: | ||
6 | |||
7 | | - Building txt docs | ||
8 | | Processing file ./guide | ||
9 | | troff: fatal error: can't find macro file s | ||
10 | | fmt_txt::postASP: Empty output file, error when calling groff. Aborting... | ||
11 | |||
12 | Upstream-Status: Inappropriate [Other] | ||
13 | Temporary workaround which disables documentation. | ||
14 | |||
15 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
16 | |||
17 | diff -urN linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh linuxdoc-tools-0.9.66/doc/Makedoc.sh | ||
18 | --- linuxdoc-tools-0.9.66.orig//doc/Makedoc.sh 2009-11-09 11:58:25.000000000 -0800 | ||
19 | +++ linuxdoc-tools-0.9.66/doc/Makedoc.sh 2011-03-04 17:37:24.788923998 -0800 | ||
20 | @@ -40,11 +40,11 @@ | ||
21 | |||
22 | chmod u+x $TMPDIR/linuxdoc | ||
23 | |||
24 | -if [ -n "`which groff`" ]; then | ||
25 | - ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt | ||
26 | - echo "- Building txt docs" >&2 | ||
27 | - $TMPDIR/sgml2txt -b 1 ./guide | ||
28 | -fi | ||
29 | +#if [ -n "`which groff`" ]; then | ||
30 | +# ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2txt | ||
31 | +# echo "- Building txt docs" >&2 | ||
32 | +# $TMPDIR/sgml2txt -b 1 ./guide | ||
33 | +#fi | ||
34 | |||
35 | if [ -n "`which latex`" ]; then | ||
36 | ln -s $TMPDIR/linuxdoc $TMPDIR/sgml2latex | ||
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 deleted file mode 100644 index 6b40afdad8..0000000000 --- a/meta/recipes-devtools/openjade/openjade-1.3.2/fix-regex.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 55f6fd8f1958aa36584eefeecce782a505963c88 Mon Sep 17 00:00:00 2001 | ||
2 | From: benvm <benvm@yow-gmoffatt-lx2.wrs.com> | ||
3 | Date: Wed, 9 Jan 2013 12:14:06 -0500 | ||
4 | Subject: [PATCH] Fix Makefile regular expression | ||
5 | |||
6 | This patch modifies a regular expression within a Makefile to stop builds | ||
7 | from failing in the case where the path contains the characters ".a". | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | |||
11 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
12 | |||
13 | --- | ||
14 | Makefile.prog.in | 2 +- | ||
15 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
16 | |||
17 | diff --git a/Makefile.prog.in b/Makefile.prog.in | ||
18 | index 76310c9..44c3534 100644 | ||
19 | --- a/Makefile.prog.in | ||
20 | +++ b/Makefile.prog.in | ||
21 | @@ -12,7 +12,7 @@ LINKFLAGS = @LINKFLAGS@ | ||
22 | |||
23 | ALL_LIBS = $(XLIBS) $(LIBS) | ||
24 | Makefile.lt: | ||
25 | - echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt | ||
26 | + echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt | ||
27 | |||
28 | PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') | ||
29 | |||
30 | -- | ||
31 | 1.7.0.4 | ||
32 | |||
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch deleted file mode 100644 index 968b9b47cf..0000000000 --- a/meta/recipes-devtools/openjade/openjade-1.3.2/makefile.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | This patch fixes libtool QA issues with WORKDIR creeping in to | ||
2 | libospgrove.la and libostyle.la. Patch obtained from OpenEmbedded. | ||
3 | |||
4 | Upstream-Status: Inappropriate [Other] | ||
5 | Workaround is specific to our build system. | ||
6 | |||
7 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
8 | |||
9 | Index: openjade-1.3.2/spgrove/Makefile.sub | ||
10 | =================================================================== | ||
11 | --- openjade-1.3.2.orig/spgrove/Makefile.sub | ||
12 | +++ openjade-1.3.2/spgrove/Makefile.sub | ||
13 | @@ -1,8 +1,8 @@ | ||
14 | LTVERSION=0:1:0 | ||
15 | LIB=ospgrove | ||
16 | INCLUDE=-I$(srcdir)/../grove | ||
17 | -DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ | ||
18 | - -L$(TOP)/lib -L$(TOP)/lib/.libs \ | ||
19 | +DEPLIBS=-lm $(TOP)/grove \ | ||
20 | + $(TOP)/lib \ | ||
21 | $(LIB_THREADS) | ||
22 | OBJS=GroveApp.o GroveBuilder.o SdNode.o | ||
23 | GENSRCS=grove_inst.cxx | ||
24 | Index: openjade-1.3.2/style/Makefile.sub | ||
25 | =================================================================== | ||
26 | --- openjade-1.3.2.orig/style/Makefile.sub | ||
27 | +++ openjade-1.3.2/style/Makefile.sub | ||
28 | @@ -1,8 +1,8 @@ | ||
29 | LTVERSION=0:1:0 | ||
30 | LIB=ostyle | ||
31 | -DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \ | ||
32 | - -L$(TOP)/lib -L$(TOP)/lib/.libs \ | ||
33 | - -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs | ||
34 | +DEPLIBS=-lm $(TOP)/grove \ | ||
35 | + $(TOP)/lib \ | ||
36 | + $(TOP)/spgrove | ||
37 | OBJS=LangObj.o \ | ||
38 | Collector.o \ | ||
39 | 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 deleted file mode 100644 index b47fd4655f..0000000000 --- a/meta/recipes-devtools/openjade/openjade-1.3.2/msggen.pl.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | commit fcc5b94f118495b1a467edcda6c6f631691c3f69 | ||
2 | Author: Dennis Lan <dennis.yxun@gmail.com> | ||
3 | Date: Tue Jul 3 09:25:42 2012 +0800 | ||
4 | |||
5 | openjade: fix undefined Getopts error, use std namespace | ||
6 | |||
7 | Using Gentoo Linux as the build host, it fails without this patch | ||
8 | Use Getopt::Std in place of getopts.pl. | ||
9 | |||
10 | Upstream-Status: Inappropriate [no upstream] | ||
11 | Original-Author-By: Mike Gilbert <floppym@gentoo.org> | ||
12 | Signed-off-by: Dennis Lan <dennis.yxun@gmail.com> | ||
13 | |||
14 | diff --git a/msggen.pl b/msggen.pl | ||
15 | index 0c33968..2ee3f66 100644 | ||
16 | --- a/msggen.pl | ||
17 | +++ b/msggen.pl | ||
18 | @@ -4,6 +4,7 @@ | ||
19 | # See the file COPYING for copying permission. | ||
20 | |||
21 | use POSIX; | ||
22 | +use Getopt::Std; | ||
23 | |||
24 | # Package and version. | ||
25 | $package = 'openjade'; | ||
26 | @@ -18,8 +19,7 @@ $gen_c = 0; | ||
27 | undef $opt_l; | ||
28 | undef $opt_p; | ||
29 | undef $opt_t; | ||
30 | -do 'getopts.pl'; | ||
31 | -&Getopts('l:p:t:'); | ||
32 | +getopts('l:p:t:'); | ||
33 | $module = $opt_l; | ||
34 | $pot_file = $opt_p; | ||
35 | |||
36 | @@ -72,7 +72,7 @@ while (<DEF>) { | ||
37 | else { | ||
38 | $field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");; | ||
39 | $type[$num] = substr($field[0], 0, 1); | ||
40 | - $argc = int(substr($field[0], 1, 1)); | ||
41 | + $argc = substr($field[0], 1, 1); | ||
42 | } | ||
43 | $nargs[$num] = $argc; | ||
44 | $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag"); | ||
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch deleted file mode 100644 index 2f57c000f6..0000000000 --- a/meta/recipes-devtools/openjade/openjade-1.3.2/no-libtool.patch +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | The openjade build is fairly unique in auto-generating explicit dependencies to | ||
2 | installed .la files. As some distributions may delete these files unless | ||
3 | clearly required, change the Makefile fragment to depend on the .so instead. | ||
4 | |||
5 | Patch originally by Phil Blundell <philb@brightsign.biz>. | ||
6 | |||
7 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
8 | Upstream-Status: Inappropriate | ||
9 | |||
10 | --- openjade-1.3.2/Makefile.prog.in~ 2013-05-14 11:42:02.646782318 +0100 | ||
11 | +++ openjade-1.3.2/Makefile.prog.in 2013-05-14 11:54:55.051728343 +0100 | ||
12 | @@ -12,7 +12,7 @@ | ||
13 | |||
14 | ALL_LIBS = $(XLIBS) $(LIBS) | ||
15 | Makefile.lt: | ||
16 | - echo 'LT_LIBS='`echo $(ALL_LIBS) | sed 's/\.a\s/\.la /g' | sed s/\.a$$/\.la/` > Makefile.lt | ||
17 | + echo 'LT_LIBS='`for d in $(ALL_LIBS); do case $$d in ../*) echo $$d | sed s/\.a$$/.la/g ;; *) echo $$d | sed s/\.a$$/.so/g ;; esac ; done` >Makefile.lt | ||
18 | |||
19 | PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@') | ||
20 | |||
diff --git a/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch b/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch deleted file mode 100644 index 1a23a4a685..0000000000 --- a/meta/recipes-devtools/openjade/openjade-1.3.2/reautoconf.patch +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | Ensure we reautoconf the packag | ||
2 | |||
3 | Currently since configure.in in is in a subdirectory, we don't reautoconf the | ||
4 | recipe. We really need to do this, to update things like the libtool script used | ||
5 | and fix various issues such as those that could creep in if a reautoconf is | ||
6 | triggered for some reason. Since this source only calls AM_INIT_AUTOMAKE to | ||
7 | gain the PACKAGE and VERSION definitions and that macro now errors if Makefile.am | ||
8 | doesn't exist, we need to add these definitions manually. | ||
9 | |||
10 | These changes avoid failures like: | ||
11 | ---- | ||
12 | | ... | ||
13 | | DssslApp.cxx:117:36: error: 'PACKAGE' was not declared in this scope | ||
14 | | DssslApp.cxx:118:36: error: 'VERSION' was not declared in this scope | ||
15 | | make[2]: *** [DssslApp.lo] Error 1 ---- | ||
16 | |||
17 | Upstream-Status: Pending | ||
18 | |||
19 | RP 2012/6/12 | ||
20 | |||
21 | Index: openjade-1.3.2/acinclude.m4 | ||
22 | =================================================================== | ||
23 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
24 | +++ openjade-1.3.2/acinclude.m4 2012-06-12 12:48:54.871365344 +0000 | ||
25 | @@ -0,0 +1,39 @@ | ||
26 | +dnl Configure-time switch with default | ||
27 | +dnl | ||
28 | +dnl Each switch defines an --enable-FOO and --disable-FOO option in | ||
29 | +dnl the resulting configure script. | ||
30 | +dnl | ||
31 | +dnl Usage: | ||
32 | +dnl smr_SWITCH(name, description, default, pos-def, neg-def) | ||
33 | +dnl | ||
34 | +dnl where: | ||
35 | +dnl | ||
36 | +dnl name name of switch; generates --enable-name & --disable-name | ||
37 | +dnl options | ||
38 | +dnl description help string is set to this prefixed by "enable" or | ||
39 | +dnl "disable", whichever is the non-default value | ||
40 | +dnl default either "on" or "off"; specifies default if neither | ||
41 | +dnl --enable-name nor --disable-name is specified | ||
42 | +dnl pos-def a symbol to AC_DEFINE if switch is on (optional) | ||
43 | +dnl neg-def a symbol to AC_DEFINE if switch is off (optional) | ||
44 | +dnl | ||
45 | +AC_DEFUN(smr_SWITCH, [ | ||
46 | + AC_MSG_CHECKING(whether to enable $2) | ||
47 | + AC_ARG_ENABLE( | ||
48 | + $1, | ||
49 | + ifelse($3, on, | ||
50 | + [ --disable-[$1] disable [$2]], | ||
51 | + [ --enable-[$1] enable [$2]]), | ||
52 | + [ if test "$enableval" = yes; then | ||
53 | + AC_MSG_RESULT(yes) | ||
54 | + ifelse($4, , , AC_DEFINE($4)) | ||
55 | + else | ||
56 | + AC_MSG_RESULT(no) | ||
57 | + ifelse($5, , , AC_DEFINE($5)) | ||
58 | + fi ], | ||
59 | + ifelse($3, on, | ||
60 | + [ AC_MSG_RESULT(yes) | ||
61 | + ifelse($4, , , AC_DEFINE($4)) ], | ||
62 | + [ AC_MSG_RESULT(no) | ||
63 | + ifelse($5, , , AC_DEFINE($5))]))]) | ||
64 | + | ||
65 | Index: openjade-1.3.2/config/configure.in | ||
66 | =================================================================== | ||
67 | --- openjade-1.3.2.orig/config/configure.in 2012-06-12 12:47:20.735365445 +0000 | ||
68 | +++ openjade-1.3.2/config/configure.in 2012-06-12 12:48:17.507364080 +0000 | ||
69 | @@ -12,9 +12,12 @@ | ||
70 | dnl Credits: this autoconf script was largely "inspired" <g> by the | ||
71 | dnl autoconf script around SP made by Henry Thompson. | ||
72 | dnl | ||
73 | -AC_INIT(dsssl) | ||
74 | +AC_INIT([openjade], [1.3.2]) | ||
75 | AC_CONFIG_AUX_DIR(config) | ||
76 | -AM_INIT_AUTOMAKE( openjade, 1.3.2) | ||
77 | +AC_SUBST([PACKAGE], [openjade]) | ||
78 | +AC_SUBST([VERSION], [1.3.2]) | ||
79 | +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") | ||
80 | +AC_DEFINE_UNQUOTED(VERSION, "$VERSION") | ||
81 | TOP=`pwd` | ||
82 | AC_SUBST(TOP) | ||
83 | 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 deleted file mode 100644 index 073af46fc5..0000000000 --- a/meta/recipes-devtools/openjade/openjade-1.3.2/user-declared-default-constructor.patch +++ /dev/null | |||
@@ -1,92 +0,0 @@ | |||
1 | In GCC 4.6 the compiler no longer allows objects of const-qualified type to | ||
2 | be default initialized unless the type has a user-declared default | ||
3 | constructor. | ||
4 | |||
5 | Patch from Gentoo bugzilla: http://bugs.gentoo.org/show_bug.cgi?id=358021 | ||
6 | |||
7 | Gentoo Bugzilla description follows: | ||
8 | "If a class or struct has no user-defined default constructor, C++ doesn't | ||
9 | allow you to default construct a const instance of it. | ||
10 | |||
11 | https://bugs.gentoo.org/358021 | ||
12 | http://clang.llvm.org/compatibility.html#default_init_const | ||
13 | http://gcc.gnu.org/PR44499" | ||
14 | |||
15 | Upstream-Status: Pending | ||
16 | |||
17 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
18 | |||
19 | --- a/jade/TeXFOTBuilder.cxx | ||
20 | +++ b/jade/TeXFOTBuilder.cxx | ||
21 | @@ -88,6 +88,8 @@ public: | ||
22 | value.convertString(nic_.placement); | ||
23 | } | ||
24 | ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); } | ||
25 | + public: | ||
26 | + PageFloatFlowObj() {} | ||
27 | private: | ||
28 | PageFloatNIC nic_; | ||
29 | StringC name_; | ||
30 | @@ -101,6 +103,8 @@ public: | ||
31 | fotb.endPageFootnote(); | ||
32 | } | ||
33 | ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); } | ||
34 | + public: | ||
35 | + PageFootnoteFlowObj() {} | ||
36 | private: | ||
37 | }; | ||
38 | ////////////////////////////////////////////////////////////////////// | ||
39 | --- a/jade/TransformFOTBuilder.cxx | ||
40 | +++ b/jade/TransformFOTBuilder.cxx | ||
41 | @@ -41,6 +41,7 @@ public: | ||
42 | }; | ||
43 | class EntityRefFlowObj : public TransformExtensionFlowObj { | ||
44 | public: | ||
45 | + EntityRefFlowObj() {} | ||
46 | void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { | ||
47 | fotb.entityRef(name_); | ||
48 | } | ||
49 | @@ -56,6 +57,7 @@ public: | ||
50 | }; | ||
51 | class ProcessingInstructionFlowObj : public TransformExtensionFlowObj { | ||
52 | public: | ||
53 | + ProcessingInstructionFlowObj() {} | ||
54 | void atomic(TransformFOTBuilder &fotb, const NodePtr &) const { | ||
55 | fotb.processingInstruction(data_); | ||
56 | } | ||
57 | @@ -98,6 +100,8 @@ public: | ||
58 | } | ||
59 | } | ||
60 | ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); } | ||
61 | + public: | ||
62 | + EmptyElementFlowObj() {} | ||
63 | private: | ||
64 | ElementNIC nic_; | ||
65 | }; | ||
66 | @@ -133,6 +137,8 @@ public: | ||
67 | } | ||
68 | } | ||
69 | ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); } | ||
70 | + public: | ||
71 | + ElementFlowObj() {} | ||
72 | private: | ||
73 | ElementNIC nic_; | ||
74 | }; | ||
75 | @@ -150,6 +156,8 @@ public: | ||
76 | value.convertString(systemId_); | ||
77 | } | ||
78 | ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); } | ||
79 | + public: | ||
80 | + EntityFlowObj() {} | ||
81 | private: | ||
82 | StringC systemId_; | ||
83 | }; | ||
84 | @@ -174,6 +182,8 @@ public: | ||
85 | } | ||
86 | } | ||
87 | ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); } | ||
88 | + public: | ||
89 | + DocumentTypeFlowObj() {} | ||
90 | private: | ||
91 | DocumentTypeNIC nic_; | ||
92 | }; | ||
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb deleted file mode 100644 index 8b15b0c7ec..0000000000 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ /dev/null | |||
@@ -1,121 +0,0 @@ | |||
1 | SUMMARY = "Tools for working with DSSSL stylesheets for SGML and XML documents" | ||
2 | DESCRIPTION = "OpenJade is a suite of tools for validating, \ | ||
3 | processing, and applying DSSSL (Document Style Semantics and \ | ||
4 | Specification Language) stylesheets to SGML and XML documents." | ||
5 | HOMEPAGE = "http://openjade.sourceforge.net" | ||
6 | SECTION = "base" | ||
7 | LICENSE = "BSD" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045" | ||
9 | |||
10 | PR = "r5" | ||
11 | |||
12 | DEPENDS = "opensp-native sgml-common-native" | ||
13 | RDEPENDS_${PN} = "sgml-common-native" | ||
14 | |||
15 | SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/openjade-${PV}.tar.gz \ | ||
16 | file://makefile.patch \ | ||
17 | file://msggen.pl.patch \ | ||
18 | file://reautoconf.patch \ | ||
19 | file://user-declared-default-constructor.patch \ | ||
20 | file://fix-regex.patch \ | ||
21 | file://no-libtool.patch" | ||
22 | |||
23 | SRC_URI[md5sum] = "7df692e3186109cc00db6825b777201e" | ||
24 | SRC_URI[sha256sum] = "1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1" | ||
25 | |||
26 | UPSTREAM_CHECK_URI = "http://openjade.sourceforge.net/download.html" | ||
27 | |||
28 | inherit autotools-brokensep native | ||
29 | |||
30 | # Statically link local libs to avoid gold link issue [YOCTO #2972] | ||
31 | PACKAGECONFIG ?= "static-only-libs" | ||
32 | PACKAGECONFIG[static-only-libs] = "--enable-static --disable-shared,--enable-static --enable-shared,," | ||
33 | |||
34 | EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \ | ||
35 | --enable-splibdir=${STAGING_LIBDIR}" | ||
36 | |||
37 | # We need to set datadir explicitly, but adding it to EXTRA_OECONF | ||
38 | # results in it being specified twice when configure is run. | ||
39 | CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadir}', '--datadir=${STAGING_DATADIR}/sgml/openjade-${PV}')}" | ||
40 | |||
41 | # CONFIGUREOPTS has hard coded paths so we need to ignore it's vardeps | ||
42 | # there are other bits in there too but they are picked up by other variable | ||
43 | # dependencies so it all works out | ||
44 | oe_runconf[vardepsexclude] += "CONFIGUREOPTS" | ||
45 | |||
46 | CFLAGS =+ "-I${S}/include" | ||
47 | CXXFLAGS += "-fno-tree-dse" | ||
48 | |||
49 | SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst" | ||
50 | SYSROOT_PREPROCESS_FUNCS += "openjade_sysroot_preprocess" | ||
51 | |||
52 | # configure.in needs to be reloacted to trigger reautoconf | ||
53 | do_extraunpack () { | ||
54 | cp ${S}/config/configure.in ${S}/ | ||
55 | } | ||
56 | addtask extraunpack after do_patch before do_configure | ||
57 | |||
58 | # We need to do this else the source interdependencies aren't generated and | ||
59 | # build failures can result (e.g. zero size style/Makefile.dep file) | ||
60 | do_compile_prepend () { | ||
61 | oe_runmake depend | ||
62 | } | ||
63 | |||
64 | do_install() { | ||
65 | # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html | ||
66 | # for details. | ||
67 | install -d ${D}${bindir} ${D}${libdir} | ||
68 | if ${@bb.utils.contains('PACKAGECONFIG', 'static-only-libs', 'true', 'false', d)}; then | ||
69 | install -m 0755 jade/openjade ${D}${bindir}/openjade | ||
70 | oe_libinstall -a -C style libostyle ${D}${libdir} | ||
71 | oe_libinstall -a -C spgrove libospgrove ${D}${libdir} | ||
72 | oe_libinstall -a -C grove libogrove ${D}${libdir} | ||
73 | else | ||
74 | install -m 0755 jade/.libs/openjade ${D}${bindir}/openjade | ||
75 | oe_libinstall -a -so -C style libostyle ${D}${libdir} | ||
76 | oe_libinstall -a -so -C spgrove libospgrove ${D}${libdir} | ||
77 | oe_libinstall -a -so -C grove libogrove ${D}${libdir} | ||
78 | fi | ||
79 | ln -sf openjade ${D}${bindir}/jade | ||
80 | |||
81 | install -d ${D}${datadir}/sgml/openjade-${PV} | ||
82 | install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV} | ||
83 | install -m 644 dsssl/*.dtd ${D}${datadir}/sgml/openjade-${PV} | ||
84 | install -m 644 dsssl/*.dsl ${D}${datadir}/sgml/openjade-${PV} | ||
85 | install -m 644 dsssl/*.sgm ${D}${datadir}/sgml/openjade-${PV} | ||
86 | |||
87 | install -d ${datadir}/sgml/openjade-${PV} | ||
88 | install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV}/catalog | ||
89 | |||
90 | install -d ${D}${sysconfdir}/sgml | ||
91 | echo "CATALOG ${datadir}/sgml/openjade-${PV}/catalog" > \ | ||
92 | ${D}${sysconfdir}/sgml/openjade-${PV}.cat | ||
93 | } | ||
94 | |||
95 | openjade_sstate_postinst() { | ||
96 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | ||
97 | then | ||
98 | # Ensure that the catalog file sgml-docbook.cat is properly | ||
99 | # updated when the package is installed from sstate cache. | ||
100 | ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \ | ||
101 | --add ${sysconfdir}/sgml/sgml-docbook.bak \ | ||
102 | ${sysconfdir}/sgml/openjade-${PV}.cat | ||
103 | ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade \ | ||
104 | --add ${sysconfdir}/sgml/sgml-docbook.cat \ | ||
105 | ${sysconfdir}/sgml/openjade-${PV}.cat | ||
106 | cat << EOF > ${SSTATE_INST_POSTRM} | ||
107 | #!/bin/sh | ||
108 | # Ensure that the catalog file sgml-docbook.cat is properly | ||
109 | # updated when the package is removed from sstate cache. | ||
110 | files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat" | ||
111 | for f in \$files; do | ||
112 | [ ! -f \$f ] || sed -i '/\/sgml\/openjade-${PV}.cat/d' \$f | ||
113 | done | ||
114 | EOF | ||
115 | fi | ||
116 | } | ||
117 | |||
118 | openjade_sysroot_preprocess () { | ||
119 | install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ | ||
120 | install -m 755 ${STAGING_BINDIR_NATIVE}/install-catalog ${SYSROOT_DESTDIR}${bindir_crossscripts}/install-catalog-openjade | ||
121 | } | ||
diff --git a/meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch b/meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch deleted file mode 100644 index 42218a6d68..0000000000 --- a/meta/recipes-devtools/opensp/opensp-1.5.2/obsolete_automake_macros.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Upstream-Status: Submitted [https://sourceforge.net/tracker/?func=detail&aid=3599291&group_id=2115&atid=102115] | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd OpenSP-1.5.2/configure.in OpenSP-1.5.2/configure.in | ||
5 | --- OpenSP-1.5.2/configure.in 2005-12-23 16:15:21.000000000 +0200 | ||
6 | +++ OpenSP-1.5.2/configure.in 2013-01-03 09:04:51.922645689 +0200 | ||
7 | @@ -16,7 +16,7 @@ | ||
8 | AM_INIT_AUTOMAKE(OpenSP, 1.5.2, no-define) | ||
9 | AM_MAINTAINER_MODE | ||
10 | AC_PREREQ(2.53) | ||
11 | -AM_CONFIG_HEADER(config.h) | ||
12 | +AC_CONFIG_HEADERS(config.h) | ||
13 | AM_SANITY_CHECK | ||
14 | |||
15 | dnl Autoheader definitions | ||
diff --git a/meta/recipes-devtools/opensp/opensp_1.5.2.bb b/meta/recipes-devtools/opensp/opensp_1.5.2.bb deleted file mode 100644 index 60a7d2e47e..0000000000 --- a/meta/recipes-devtools/opensp/opensp_1.5.2.bb +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | SUMMARY = "An SGML parser" | ||
2 | DESCRIPTION = "An SGML parser used by the OpenJade suite of utilities." | ||
3 | HOMEPAGE = "http://openjade.sourceforge.net" | ||
4 | SECTION = "libs" | ||
5 | LICENSE = "BSD" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=641ff1e4511f0a87044ad42f87cb1045" | ||
7 | |||
8 | PR = "r1" | ||
9 | |||
10 | # At -Os it encounters calls to some inline functions which are then | ||
11 | # not found in any other objects with gcc 4.5 | ||
12 | FULL_OPTIMIZATION += "-O2" | ||
13 | |||
14 | SRC_URI = "${SOURCEFORGE_MIRROR}/openjade/OpenSP-${PV}.tar.gz \ | ||
15 | file://obsolete_automake_macros.patch \ | ||
16 | " | ||
17 | |||
18 | SRC_URI[md5sum] = "670b223c5d12cee40c9137be86b6c39b" | ||
19 | SRC_URI[sha256sum] = "57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce" | ||
20 | |||
21 | S = "${WORKDIR}/OpenSP-${PV}" | ||
22 | |||
23 | inherit autotools gettext | ||
24 | |||
25 | EXTRA_OECONF = "--disable-doc-build" | ||
26 | |||
27 | EXTRA_OECONF_class-native = "\ | ||
28 | --disable-doc-build \ | ||
29 | --enable-default-catalog=${sysconfdir}/sgml/catalog \ | ||
30 | --enable-default-search-path=${datadir}/sgml \ | ||
31 | " | ||
32 | |||
33 | do_install_append() { | ||
34 | # Set up symlinks to often-used alternate names. See | ||
35 | # http://www.linuxfromscratch.org/blfs/view/stable/pst/opensp.html | ||
36 | cd ${D}${libdir} | ||
37 | ln -sf libosp.so libsp.so | ||
38 | |||
39 | cd ${D}${bindir} | ||
40 | for util in nsgmls sgmlnorm spam spcat spent sx; do | ||
41 | ln -sf o$util $util | ||
42 | done | ||
43 | ln -sf osx sgml2xml | ||
44 | } | ||
45 | |||
46 | do_install_append_class-native() { | ||
47 | for util in nsgmls sgmlnorm spam spcat spent sx; do | ||
48 | create_cmdline_wrapper ${D}/${bindir}/$util \ | ||
49 | -D ${sysconfdir}/sgml | ||
50 | done | ||
51 | } | ||
52 | |||
53 | FILES_${PN} += "${datadir}/OpenSP/" | ||
54 | |||
55 | BBCLASSEXTEND = "native" | ||
56 | |||
57 | # http://errors.yoctoproject.org/Errors/Details/20489/ | ||
58 | ARM_INSTRUCTION_SET_armv4 = "arm" | ||
59 | ARM_INSTRUCTION_SET_armv5 = "arm" | ||
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch deleted file mode 100644 index 1f39b03300..0000000000 --- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/autohell.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | Patch obtained from OpenEmbedded. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
6 | |||
7 | --- sgml-common-0.6.3/bin/Makefile.am~autohell.patch 2001-01-30 15:42:21.000000000 +0100 | ||
8 | +++ sgml-common-0.6.3/bin/Makefile.am 2004-06-17 11:51:11.000000000 +0200 | ||
9 | @@ -1,6 +1,5 @@ | ||
10 | primitive_scripts = sgmlwhich | ||
11 | |||
12 | -bindir = $(prefix)/bin | ||
13 | bin_SCRIPTS = install-catalog $(primitive_scripts) | ||
14 | |||
15 | EXTRA_DIST = install-catalog.in $(primitive_scripts) | ||
16 | --- /dev/null 2003-09-23 19:59:22.000000000 +0200 | ||
17 | +++ sgml-common-0.6.3/bin/sgmlwhich.in 2004-06-17 11:51:11.000000000 +0200 | ||
18 | @@ -0,0 +1,7 @@ | ||
19 | +#!/bin/sh | ||
20 | +# Location of the main configuration file for consistency with non-LSB platforms | ||
21 | +# Send any comments to Eric Bischoff <eric@caldera.de> | ||
22 | +# This program is under GPL license. See LICENSE file for details. | ||
23 | + | ||
24 | +echo "@sysconfdir@/sgml/sgml.conf" | ||
25 | +# Simple, isn't it? ;-) | ||
26 | --- /dev/null 2003-09-23 19:59:22.000000000 +0200 | ||
27 | +++ sgml-common-0.6.3/config/sgml.conf.in 2004-06-17 11:51:11.000000000 +0200 | ||
28 | @@ -0,0 +1,2 @@ | ||
29 | +SGML_BASE_DIR=@datadir@/sgml | ||
30 | +SGML_CATALOGS_DIR=@sysconfdir@/sgml | ||
31 | --- sgml-common-0.6.3/configure.in~autohell.patch 2001-05-25 18:40:54.000000000 +0200 | ||
32 | +++ sgml-common-0.6.3/configure.in 2004-06-17 11:53:22.000000000 +0200 | ||
33 | @@ -3,11 +3,6 @@ | ||
34 | |||
35 | AM_INIT_AUTOMAKE(sgml-common, 0.6.3) | ||
36 | |||
37 | -docdir='$(prefix)/doc' | ||
38 | -AC_SUBST(docdir) | ||
39 | - | ||
40 | -dnl Checks for programs. | ||
41 | - | ||
42 | dnl Checks for libraries. | ||
43 | |||
44 | dnl Checks for header files. | ||
45 | @@ -18,6 +13,5 @@ | ||
46 | |||
47 | AC_OUTPUT(Makefile \ | ||
48 | bin/Makefile bin/install-catalog \ | ||
49 | - config/Makefile \ | ||
50 | - doc/Makefile doc/HTML/Makefile doc/man/Makefile doc/refentry/Makefile \ | ||
51 | + config/Makefile config/sgml.conf bin/sgmlwhich \ | ||
52 | sgml-iso-entities/Makefile xml-iso-entities/Makefile) | ||
53 | |||
54 | --- sgml-common-0.6.3/Makefile.am~no-docs 2001-05-25 18:22:01.000000000 +0200 | ||
55 | +++ sgml-common-0.6.3/Makefile.am 2004-06-17 11:49:09.000000000 +0200 | ||
56 | @@ -1,4 +1,4 @@ | ||
57 | -SUBDIRS = bin config doc sgml-iso-entities xml-iso-entities | ||
58 | +SUBDIRS = bin config sgml-iso-entities xml-iso-entities | ||
59 | |||
60 | sgmlcodir = $(prefix)/share/sgml | ||
61 | sgmlco_DATA = xml.dcl | ||
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch b/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch deleted file mode 100644 index 54b3f54494..0000000000 --- a/meta/recipes-devtools/sgml-common/sgml-common-0.6.3/license.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | The COPYING file sgml-common ships with is just a symlink to | ||
2 | /usr/share/automake/COPYING, which means we can't verify it | ||
3 | using our normal means. We workaround this by using this patch | ||
4 | to create our own license file. | ||
5 | |||
6 | Upstream was notified about this on 2011-01-24. When upgrading | ||
7 | this recipe, this should be fixed and you should remove this | ||
8 | patch. | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
13 | |||
14 | diff -urN sgml-common-0.6.3.orig/LICENSE-GPLv2 sgml-common-0.6.3/LICENSE-GPLv2 | ||
15 | --- sgml-common-0.6.3.orig/LICENSE-GPLv2 1969-12-31 16:00:00.000000000 -0800 | ||
16 | +++ sgml-common-0.6.3/LICENSE-GPLv2 2011-01-28 17:05:17.299528001 -0800 | ||
17 | @@ -0,0 +1,12 @@ | ||
18 | +Copyright (C) 1997 Christian Schwarz <schwarz@debian.org>. | ||
19 | +Copyright (C) 2001-2004 Ardo van Rangelrooij <ardo@debian.org> | ||
20 | + | ||
21 | +This is free software; you may redistribute it and/or modify it under | ||
22 | +the terms of the GNU General Public License as published by the Free | ||
23 | +Software Foundation; either version 2, or (at your option) any later | ||
24 | +version. | ||
25 | + | ||
26 | +This is distributed in the hope that it will be useful, but without | ||
27 | +any warranty; without even the implied warranty of merchantability or | ||
28 | +fitness for a particular purpose. See the GNU General Public License | ||
29 | +for more details. | ||
diff --git a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb b/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb deleted file mode 100644 index 97b308a88b..0000000000 --- a/meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | SUMMARY = "Base utilities for working with SGML and XML" | ||
2 | DESCRIPTION = "The sgml-common package gathers very basic \ | ||
3 | stuff necessary to work with SGML and XML, such as xml.dcl, \ | ||
4 | a SGML declaration of XML; iso-entities, a list of the basic \ | ||
5 | SGML ISO entities; and install-catalog, a script used to \ | ||
6 | add entries to (or remove entries from) centralized catalogs \ | ||
7 | whose entries are pointers to SGML open catalogs, \ | ||
8 | as defined by OASIS." | ||
9 | HOMEPAGE = "http://sources.redhat.com/docbook-tools/" | ||
10 | LICENSE = "GPLv2+" | ||
11 | # See the comments in license.patch when upgrading this recipe. | ||
12 | # This is inteded to be a temporary workaround. | ||
13 | LIC_FILES_CHKSUM = "file://LICENSE-GPLv2;md5=ab8a50abe86dfc859e148baae043c89b" | ||
14 | SECTION = "base" | ||
15 | |||
16 | PR = "r1" | ||
17 | |||
18 | require sgml-common_${PV}.bb | ||
19 | inherit native | ||
20 | |||
21 | S = "${WORKDIR}/sgml-common-${PV}" | ||
22 | |||
23 | SYSROOT_PREPROCESS_FUNCS += "sgml_common_native_mangle" | ||
24 | SSTATEPOSTINSTFUNCS += "sgml_common_sstate_postinst" | ||
25 | |||
26 | do_install_append() { | ||
27 | # install-catalog script contains hard-coded references to | ||
28 | # {sysconfdir}. Change it to ${D}${sysconfdir}. | ||
29 | sed -i -e "s|${sysconfdir}/sgml|${D}${sysconfdir}/sgml|g" ${D}${bindir}/install-catalog | ||
30 | |||
31 | ${D}${bindir}/install-catalog \ | ||
32 | --add ${D}${sysconfdir}/sgml/sgml-ent.cat \ | ||
33 | ${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog | ||
34 | |||
35 | # The sgml-docbook.cat will be regenerated by sstate_postinst | ||
36 | rm -f ${D}${sysconfdir}/sgml/sgml-docbook.cat | ||
37 | } | ||
38 | |||
39 | sgml_common_native_mangle () { | ||
40 | # Revert back to ${sysconfdir} path in install-catalog | ||
41 | sed -i -e "s|${D}${sysconfdir}/sgml|${sysconfdir}/sgml|g" ${SYSROOT_DESTDIR}${STAGING_BINDIR}/install-catalog | ||
42 | # Change path from ${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog to ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog in sgml-ent.cat | ||
43 | sed -i -e "s|${D}${datadir}/sgml/sgml-iso-entities-8879.1986/catalog|${datadir}/sgml/sgml-iso-entities-8879.1986/catalog|g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/sgml-ent.cat | ||
44 | # Remove ${D} path from catalog file created by install-catalog script | ||
45 | sed -i -e "s|${D}||g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/catalog | ||
46 | } | ||
47 | |||
48 | sgml_common_sstate_postinst() { | ||
49 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | ||
50 | then | ||
51 | ${bindir}/install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat ${sysconfdir}/sgml/sgml-ent.cat | ||
52 | if [ -e ${sysconfdir}/sgml/sgml-docbook.bak ]; then | ||
53 | for catalog in `awk '{print $2}' ${sysconfdir}/sgml/sgml-docbook.bak`; do | ||
54 | if [ ! `grep $catalog ${sysconfdir}/sgml/sgml-docbook.cat 1> /dev/null 2>&1` ]; then | ||
55 | ${bindir}/install-catalog \ | ||
56 | --add ${sysconfdir}/sgml/sgml-docbook.cat $catalog | ||
57 | fi | ||
58 | done | ||
59 | fi | ||
60 | cat << EOF > ${SSTATE_INST_POSTRM} | ||
61 | #!/bin/sh | ||
62 | |||
63 | # Ensure that the catalog file sgml-docbook.cat is properly | ||
64 | # updated when the package is removed from sstate cache. | ||
65 | if [ -f ${sysconfdir}/sgml/sgml-docbook.cat ]; then | ||
66 | sed -i '/\/sgml\/sgml-ent.cat/d' ${sysconfdir}/sgml/sgml-docbook.cat | ||
67 | fi | ||
68 | EOF | ||
69 | fi | ||
70 | } | ||
diff --git a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb deleted file mode 100644 index 6098673a35..0000000000 --- a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb +++ /dev/null | |||
@@ -1,68 +0,0 @@ | |||
1 | SUMMARY = "Base utilities for working with SGML and XML" | ||
2 | DESCRIPTION = "The sgml-common package gathers very basic \ | ||
3 | stuff necessary to work with SGML and XML, such as xml.dcl, \ | ||
4 | a SGML declaration of XML; iso-entities, a list of the basic \ | ||
5 | SGML ISO entities; and install-catalog, a script used to \ | ||
6 | add entries to (or remove entries from) centralized catalogs \ | ||
7 | whose entries are pointers to SGML open catalogs, \ | ||
8 | as defined by OASIS." | ||
9 | HOMEPAGE = "http://sources.redhat.com/docbook-tools/" | ||
10 | LICENSE = "GPLv2+" | ||
11 | # See the comments in license.patch when upgrading this recipe. | ||
12 | # This is inteded to be a temporary workaround. | ||
13 | LIC_FILES_CHKSUM = "file://LICENSE-GPLv2;md5=ab8a50abe86dfc859e148baae043c89b" | ||
14 | SECTION = "base" | ||
15 | |||
16 | PR = "r1" | ||
17 | |||
18 | SRC_URI = "ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-${PV}.tgz \ | ||
19 | file://autohell.patch \ | ||
20 | file://license.patch" | ||
21 | |||
22 | SRC_URI[md5sum] = "103c9828f24820df86e55e7862e28974" | ||
23 | SRC_URI[sha256sum] = "7dc418c1d361123ffc5e45d61f1b97257940a8eb35d0bfbbc493381cc5b1f959" | ||
24 | |||
25 | inherit autotools | ||
26 | |||
27 | do_compile_append() { | ||
28 | # install-catalog script contains hardcoded references to /etc/sgml | ||
29 | sed -i -e 's|\([ "]\+\)/etc/sgml|\1${sysconfdir}/sgml|g' bin/install-catalog | ||
30 | } | ||
31 | |||
32 | FILES_${PN} += "${datadir}/sgml" | ||
33 | |||
34 | pkg_postinst_${PN}() { | ||
35 | if [ "x$D" = "x" ]; then | ||
36 | install-catalog \ | ||
37 | --add ${sysconfdir}/sgml/sgml-ent.cat \ | ||
38 | ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog | ||
39 | |||
40 | install-catalog \ | ||
41 | --add ${sysconfdir}/sgml/sgml-docbook.cat \ | ||
42 | ${sysconfdir}/sgml/sgml-ent.cat | ||
43 | else | ||
44 | if ! grep -q ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog $D${sysconfdir}/sgml/sgml-ent.cat; then | ||
45 | echo "CATALOG ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog" >> $D${sysconfdir}/sgml/sgml-ent.cat | ||
46 | fi | ||
47 | if ! grep -q ${sysconfdir}/sgml/sgml-ent.cat $D${sysconfdir}/sgml/catalog; then | ||
48 | echo "CATALOG ${sysconfdir}/sgml/sgml-ent.cat" >> $D${sysconfdir}/sgml/catalog | ||
49 | fi | ||
50 | |||
51 | if ! grep -q ${sysconfdir}/sgml/sgml-ent.cat $D${sysconfdir}/sgml/sgml-docbook.cat; then | ||
52 | echo "CATALOG ${sysconfdir}/sgml/sgml-ent.cat" >> $D${sysconfdir}/sgml/sgml-docbook.cat | ||
53 | fi | ||
54 | if ! grep -q ${sysconfdir}/sgml/sgml-docbook.cat $D${sysconfdir}/sgml/catalog; then | ||
55 | echo "CATALOG ${sysconfdir}/sgml/sgml-docbook.cat" >> $D${sysconfdir}/sgml/catalog | ||
56 | fi | ||
57 | fi | ||
58 | } | ||
59 | |||
60 | pkg_postrm_${PN}() { | ||
61 | install-catalog \ | ||
62 | --remove ${sysconfdir}/sgml/sgml-ent.cat \ | ||
63 | ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog | ||
64 | |||
65 | install-catalog \ | ||
66 | --remove ${sysconfdir}/sgml/sgml-docbook.cat \ | ||
67 | ${sysconfdir}/sgml/sgml-ent.cat | ||
68 | } | ||
diff --git a/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb b/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb deleted file mode 100644 index 01581c14cc..0000000000 --- a/meta/recipes-devtools/sgmlspl/sgmlspl-native_git.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "A simple post-processor for SGMLS and NSGMLS" | ||
2 | HOMEPAGE = "https://github.com/gitpan/SGMLSpm" | ||
3 | SECTION = "libs" | ||
4 | LICENSE = "GPLv2+" | ||
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" | ||
6 | |||
7 | UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" | ||
8 | SRC_URI = "git://github.com/gitpan/SGMLSpm \ | ||
9 | " | ||
10 | |||
11 | SRCREV = "71595b9b5e36bfc00046995e058926bd27793fef" | ||
12 | |||
13 | PV = "1.1+git${SRCPV}" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | inherit native cpan | ||
18 | |||
19 | do_install_append() { | ||
20 | ln -s sgmlspl.pl ${D}${bindir}/sgmlspl | ||
21 | } | ||