All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: Gregor Zatko <gzatko@gmail.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>,
	 Gregor Zatko <gzatko@zoznam.sk>
Subject: Re: [OE-core] [PATCH] docbook-xml: update recipe to stick with the upstream
Date: Sat, 23 May 2020 22:57:01 +0200	[thread overview]
Message-ID: <CANNYZj_ZK+KFUnFunO_VLH2emOQWg7FZBkVLy4RjzOv5cgy7ZA@mail.gmail.com> (raw)
In-Reply-To: <20200523191238.1224501-1-gzatko@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 28531 bytes --]

Thanks, this looks fine now.

Alex

On Sat, 23 May 2020 at 21:12, Gregor Zatko <gzatko@gmail.com> wrote:

> From: Gregor Zatko <gzatko@zoznam.sk>
>
> Until now a Debian package has been used as a source.
> This change just switches it to project's upstream.
>
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=13270
>
> Signed-off-by: Gregor Zatko <gzatko@gmail.com>
> ---
>  .../docbook-xml-update-catalog.xml.patch      | 515 ------------------
>  .../docbook-xml/docbook-xml-dtd4_4.5.bb       |  65 ++-
>  2 files changed, 36 insertions(+), 544 deletions(-)
>  delete mode 100644
> meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
>
> diff --git
> a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
> b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
> deleted file mode 100644
> index 59703609ca..0000000000
> ---
> a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch
> +++ /dev/null
> @@ -1,515 +0,0 @@
> -docbook-xml: update catalog.xml
> -
> -Refer Ubuntu 13.04 to update catalog.xml
> -
> -Upstream-Status: Pending
> -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ----
> - docbook-4.0/catalog.xml   | 72
> +++++++++++++++++++++++++++++++++++++++++++++++
> - docbook-4.1.2/catalog.xml | 66
> +++++++++++++++++++++++++++++++++++++++++++
> - docbook-4.2/catalog.xml   | 69
> ++++++---------------------------------------
> - docbook-4.3/catalog.xml   | 72
> ++++++++---------------------------------------
> - docbook-4.4/catalog.xml   | 63 ++---------------------------------------
> - docbook-4.5/catalog.xml   | 63 ++---------------------------------------
> - 6 files changed, 165 insertions(+), 240 deletions(-)
> - create mode 100644 docbook-4.0/catalog.xml
> - create mode 100644 docbook-4.1.2/catalog.xml
> -
> -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml
> -new file mode 100644
> ---- /dev/null
> -+++ b/docbook-4.0/catalog.xml
> -@@ -0,0 +1,72 @@
> -+<?xml version='1.0'?>
> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog
> V1.0//EN"
> -+    "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
> ">
> -+
> -+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
> -+
> -+<!--
> ...................................................................... -->
> -+<!-- XML Catalog data for DocBook XML
> V4.0............................... -->
> -+<!-- File catalog.xml
> ..................................................... -->
> -+
> -+<!-- Please direct all questions, bug reports, or suggestions for
> -+     changes to the docbook@lists.oasis-open.org mailing list. For more
> -+     information, see http://www.oasis-open.org/.
> -+  -->
> -+
> -+<!-- This is the catalog data file for DocBook V4.0. It is provided as
> -+     a convenience in building your own catalog files. You need not use
> -+     the filenames listed here, and need not use the filename method of
> -+     identifying storage objects at all.  See the documentation for
> -+     detailed information on the files associated with the DocBook DTD.
> -+     See XML Catalogs at http://www.oasis-open.org/committees/entity/
> for
> -+     detailed information on supplying and using catalog data.
> -+  -->
> -+
> -+<!--
> ...................................................................... -->
> -+<!-- DocBook driver file
> .................................................. -->
> -+
> -+<public publicId="-//Norman Walsh//DTD DocBk XML V4.0//EN"
> -+        uri="docbookx.dtd"/>
> -+
> -+<!-- Other ways to refer to DocBook XML
> v4.0............................... -->
> -+<public publicId="-//Norman Walsh//DTD DocBook XML V4.0//EN"
> -+        uri="docbookx.dtd"/>
> -+
> -+<system systemId="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd
> "
> -+        uri="docbookx.dtd"/>
> -+
> -+<!--
> ...................................................................... -->
> -+<!-- DocBook modules
> ...................................................... -->
> -+
> -+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Notations
> V4.0//EN"
> -+        uri="dbnotnx.mod"/>
> -+
> -+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Character
> Entities V4.0//EN"
> -+        uri="dbcentx.mod"/>
> -+
> -+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Information Pool
> V4.0//EN"
> -+        uri="dbpoolx.mod"/>
> -+
> -+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Document
> Hierarchy V4.0//EN"
> -+        uri="dbhierx.mod"/>
> -+
> -+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Additional
> General Entities V4.0//EN"
> -+        uri="dbgenent.mod"/>
> -+
> -+<public publicId="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN"
> -+        uri="calstblx.dtd"/>
> -+
> -+<!-- UNOFFICIAL conversion of the exchange table model to XML, based on
> the OASIS Exchange -->
> -+<!--    Table Model PUBLIC "-//SGML Open//DTD Exchange Table Model
> 19960430//EN"           -->
> -+<public publicId="-//Normal Walsh//Exchange Table Model 19960430 XML
> V4.0//EN"
> -+        uri="soextblx.dtd"/>
> -+
> -+<!-- the following FPI is declared for the DTD inside the DTD, but we'll
> -->
> -+<!-- use the version from the latest DocBook
> -+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
> -+        uri="soextblx.dtd"/> -->
> -+
> -+<!-- End of catalog data for DocBook XML V4.0
> ............................. -->
> -+<!--
> ...................................................................... -->
> -+
> -+</catalog>
> -diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml
> -new file mode 100644
> ---- /dev/null
> -+++ b/docbook-4.1.2/catalog.xml
> -@@ -0,0 +1,66 @@
> -+<?xml version='1.0'?>
> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog
> V1.0//EN"
> -+    "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
> ">
> -+
> -+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
> -+
> -+<!--
> ...................................................................... -->
> -+<!-- XML Catalog data for DocBook XML
> V4.1.2............................... -->
> -+<!-- File catalog.xml
> ..................................................... -->
> -+
> -+<!-- Please direct all questions, bug reports, or suggestions for
> -+     changes to the docbook@lists.oasis-open.org mailing list. For more
> -+     information, see http://www.oasis-open.org/.
> -+  -->
> -+
> -+<!-- This is the catalog data file for DocBook V4.1.2. It is provided as
> -+     a convenience in building your own catalog files. You need not use
> -+     the filenames listed here, and need not use the filename method of
> -+     identifying storage objects at all.  See the documentation for
> -+     detailed information on the files associated with the DocBook DTD.
> -+     See XML Catalogs at http://www.oasis-open.org/committees/entity/
> for
> -+     detailed information on supplying and using catalog data.
> -+  -->
> -+
> -+<!--
> ...................................................................... -->
> -+<!-- DocBook driver file
> .................................................. -->
> -+
> -+<public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
> -+        uri="docbookx.dtd"/>
> -+
> -+<system systemId="
> http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
> -+        uri="docbookx.dtd"/>
> -+
> -+<system systemId="http://docbook.org/xml/4.1.2/docbookx.dtd"
> -+        uri="docbookx.dtd"/>
> -+
> -+<!--
> ...................................................................... -->
> -+<!-- DocBook modules
> ...................................................... -->
> -+
> -+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN"
> -+        uri="calstblx.dtd"/>
> -+
> -+  <!-- already included in docbook 4.2
> -+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
> -+        uri="soextblx.dtd"/> -->
> -+
> -+<public publicId="-//OASIS//ELEMENTS DocBook XML Information Pool
> V4.1.2//EN"
> -+        uri="dbpoolx.mod"/>
> -+
> -+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy
> V4.1.2//EN"
> -+        uri="dbhierx.mod"/>
> -+
> -+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities
> V4.1.2//EN"
> -+        uri="dbgenent.mod"/>
> -+
> -+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.1.2//EN"
> -+        uri="dbnotnx.mod"/>
> -+
> -+<public publicId="-//OASIS//ENTITIES DocBook Character Entities
> V4.1.2//EN"
> -+        uri="dbcentx.mod"/>
> -+
> -+
> -+<!-- End of catalog data for DocBook XML V4.1.2
> ............................. -->
> -+<!--
> ...................................................................... -->
> -+
> -+</catalog>
> -diff --git a/docbook-4.2/catalog.xml b/docbook-4.2/catalog.xml
> ---- a/docbook-4.2/catalog.xml
> -+++ b/docbook-4.2/catalog.xml
> -@@ -1,4 +1,7 @@
> - <?xml version='1.0'?>
> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog
> V1.0//EN"
> -+    "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
> ">
> -+
> - <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
> -
> - <!--
> ...................................................................... -->
> -@@ -25,6 +28,12 @@
> - <public publicId="-//OASIS//DTD DocBook XML V4.2//EN"
> -         uri="docbookx.dtd"/>
> -
> -+<system systemId="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd
> "
> -+        uri="docbookx.dtd"/>
> -+
> -+<system systemId="http://docbook.org/xml/4.2/docbookx.dtd"
> -+        uri="docbookx.dtd"/>
> -+
> - <!--
> ...................................................................... -->
> - <!-- DocBook modules
> ...................................................... -->
> -
> -@@ -49,66 +58,6 @@
> - <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
> -         uri="dbcentx.mod"/>
> -
> --<!--
> ...................................................................... -->
> --<!-- ISO entity sets
> ...................................................... -->
> --
> --<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
> --        uri="ent/iso-dia.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Numeric and Special
> Graphic//EN//XML"
> --        uri="ent/iso-num.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
> --        uri="ent/iso-pub.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
> --        uri="ent/iso-tech.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
> --        uri="ent/iso-lat1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
> --        uri="ent/iso-lat2.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
> --        uri="ent/iso-grk1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
> --        uri="ent/iso-grk2.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
> --        uri="ent/iso-grk3.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Alternative Greek
> Symbols//EN//XML"
> --        uri="ent/iso-grk4.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow
> Relations//EN//XML"
> --        uri="ent/iso-amsa.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary
> Operators//EN//XML"
> --        uri="ent/iso-amsb.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Delimiters//EN//XML"
> --        uri="ent/iso-amsc.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated
> Relations//EN//XML"
> --        uri="ent/iso-amsn.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Ordinary//EN//XML"
> --        uri="ent/iso-amso.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Relations//EN//XML"
> --        uri="ent/iso-amsr.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
> --        uri="ent/iso-box.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
> --        uri="ent/iso-cyr1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
> --        uri="ent/iso-cyr2.ent"/>
> --
> - <!-- End of catalog data for DocBook XML V4.2
> ............................. -->
> - <!--
> ...................................................................... -->
> -
> -diff --git a/docbook-4.3/catalog.xml b/docbook-4.3/catalog.xml
> ---- a/docbook-4.3/catalog.xml
> -+++ b/docbook-4.3/catalog.xml
> -@@ -1,4 +1,7 @@
> - <?xml version='1.0'?>
> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog
> V1.0//EN"
> -+    "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
> ">
> -+
> - <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
> -
> - <!--
> ...................................................................... -->
> -@@ -25,12 +28,21 @@
> - <public publicId="-//OASIS//DTD DocBook XML V4.3//EN"
> -         uri="docbookx.dtd"/>
> -
> -+<system systemId="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd
> "
> -+        uri="docbookx.dtd"/>
> -+
> -+<system systemId="http://docbook.org/xml/4.3/docbookx.dtd"
> -+        uri="docbookx.dtd"/>
> -+
> - <!--
> ...................................................................... -->
> - <!-- DocBook modules
> ...................................................... -->
> -
> - <public publicId="-//OASIS//DTD DocBook CALS Table Model V4.3//EN"
> -         uri="calstblx.dtd"/>
> -
> -+<public publicId="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN"
> -+        uri="htmltblx.mod"/>
> -+
> - <public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
> -         uri="soextblx.dtd"/>
> -
> -@@ -49,66 +61,6 @@
> - <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.3//EN"
> -         uri="dbcentx.mod"/>
> -
> --<!--
> ...................................................................... -->
> --<!-- ISO entity sets
> ...................................................... -->
> --
> --<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
> --        uri="ent/iso-dia.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Numeric and Special
> Graphic//EN//XML"
> --        uri="ent/iso-num.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
> --        uri="ent/iso-pub.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
> --        uri="ent/iso-tech.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
> --        uri="ent/iso-lat1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
> --        uri="ent/iso-lat2.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
> --        uri="ent/iso-grk1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
> --        uri="ent/iso-grk2.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
> --        uri="ent/iso-grk3.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Alternative Greek
> Symbols//EN//XML"
> --        uri="ent/iso-grk4.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow
> Relations//EN//XML"
> --        uri="ent/iso-amsa.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary
> Operators//EN//XML"
> --        uri="ent/iso-amsb.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Delimiters//EN//XML"
> --        uri="ent/iso-amsc.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated
> Relations//EN//XML"
> --        uri="ent/iso-amsn.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Ordinary//EN//XML"
> --        uri="ent/iso-amso.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Relations//EN//XML"
> --        uri="ent/iso-amsr.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
> --        uri="ent/iso-box.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
> --        uri="ent/iso-cyr1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
> --        uri="ent/iso-cyr2.ent"/>
> --
> - <!-- End of catalog data for DocBook XML V4.3
> ............................. -->
> - <!--
> ...................................................................... -->
> -
> -diff --git a/docbook-4.4/catalog.xml b/docbook-4.4/catalog.xml
> ---- a/docbook-4.4/catalog.xml
> -+++ b/docbook-4.4/catalog.xml
> -@@ -1,4 +1,7 @@
> - <?xml version='1.0'?>
> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog
> V1.0//EN"
> -+    "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
> ">
> -+
> - <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
> prefer="public">
> -
> - <!--
> ...................................................................... -->
> -@@ -58,66 +61,6 @@
> - <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
> -         uri="dbcentx.mod"/>
> -
> --<!--
> ...................................................................... -->
> --<!-- ISO entity sets
> ...................................................... -->
> --
> --<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
> --        uri="ent/isodia.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Numeric and Special
> Graphic//EN//XML"
> --        uri="ent/isonum.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
> --        uri="ent/isopub.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
> --        uri="ent/isotech.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
> --        uri="ent/isolat1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
> --        uri="ent/isolat2.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
> --        uri="ent/isogrk1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
> --        uri="ent/isogrk2.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
> --        uri="ent/isogrk3.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Alternative Greek
> Symbols//EN//XML"
> --        uri="ent/isogrk4.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow
> Relations//EN//XML"
> --        uri="ent/isoamsa.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary
> Operators//EN//XML"
> --        uri="ent/isoamsb.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Delimiters//EN//XML"
> --        uri="ent/isoamsc.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated
> Relations//EN//XML"
> --        uri="ent/isoamsn.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Ordinary//EN//XML"
> --        uri="ent/isoamso.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Relations//EN//XML"
> --        uri="ent/isoamsr.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
> --        uri="ent/isobox.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
> --        uri="ent/isocyr1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
> --        uri="ent/isocyr2.ent"/>
> --
> - <!-- End of catalog data for DocBook XML V4.4
> ............................. -->
> - <!--
> ...................................................................... -->
> -
> -diff --git a/docbook-4.5/catalog.xml b/docbook-4.5/catalog.xml
> ---- a/docbook-4.5/catalog.xml
> -+++ b/docbook-4.5/catalog.xml
> -@@ -1,4 +1,7 @@
> - <?xml version='1.0'?>
> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog
> V1.0//EN"
> -+    "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd
> ">
> -+
> - <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
> prefer="public">
> -
> - <!--
> ...................................................................... -->
> -@@ -58,66 +61,6 @@
> - <public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
> -         uri="dbcentx.mod"/>
> -
> --<!--
> ...................................................................... -->
> --<!-- ISO entity sets
> ...................................................... -->
> --
> --<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
> --        uri="ent/isodia.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Numeric and Special
> Graphic//EN//XML"
> --        uri="ent/isonum.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
> --        uri="ent/isopub.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
> --        uri="ent/isotech.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
> --        uri="ent/isolat1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
> --        uri="ent/isolat2.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
> --        uri="ent/isogrk1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
> --        uri="ent/isogrk2.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
> --        uri="ent/isogrk3.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Alternative Greek
> Symbols//EN//XML"
> --        uri="ent/isogrk4.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow
> Relations//EN//XML"
> --        uri="ent/isoamsa.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary
> Operators//EN//XML"
> --        uri="ent/isoamsb.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Delimiters//EN//XML"
> --        uri="ent/isoamsc.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated
> Relations//EN//XML"
> --        uri="ent/isoamsn.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Ordinary//EN//XML"
> --        uri="ent/isoamso.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols:
> Relations//EN//XML"
> --        uri="ent/isoamsr.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
> --        uri="ent/isobox.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
> --        uri="ent/isocyr1.ent"/>
> --
> --<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
> --        uri="ent/isocyr2.ent"/>
> --
> - <!-- End of catalog data for DocBook XML V4.5
> ............................. -->
> - <!--
> ...................................................................... -->
> -
> ---
> -1.8.1.2
> -
> diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
> b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
> index 6452c8d99f..39c4da418b 100644
> --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
> +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb
> @@ -1,9 +1,10 @@
>  SUMMARY = "Document type definitions for verification of XML data files"
>  DESCRIPTION = "Document type definitions for verification of XML data \
> -files against the DocBook rule set, it ships with the latest DocBook 4.5 \
> -XML DTD, as well as a selected set of legacy DTDs for use with older \
> -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4"
> -HOMEPAGE = "http://www.docbook.org/xml/"
> +files against the DocBook rule set. It ships with the latest DocBook 4.5 \
> +XML DTD, together with older version 4.2, 4.3 and 4.4."
> +HOMEPAGE = "https://www.docbook.org/xml/"
> +
> +PR = "r1"
>
>  LICENSE = "OASIS"
>  LIC_FILES_CHKSUM =
> "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e"
> @@ -11,42 +12,48 @@ LIC_FILES_CHKSUM =
> "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e763
>  # Note: the upstream sources are not distributed with a license file.
>  # LICENSE-OASIS is included as a "patch" to workaround this. When
>  # upgrading this recipe, please verify whether this is still needed.
> -SRC_URI = "
> http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz
> \
> -           file://LICENSE-OASIS \
> -           file://docbook-xml-update-catalog.xml.patch \
> +SRC_URI = "\
> +
> https://docbook.org/xml/4.2/catalog.xml;name=catalog-4_2;downloadfilename=catalog-4.2.xml
> \
> +
> https://docbook.org/xml/4.3/catalog.xml;name=catalog-4_3;downloadfilename=catalog-4.3.xml
> \
> +
> https://docbook.org/xml/4.4/catalog.xml;name=catalog-4_4;downloadfilename=catalog-4.4.xml
> \
> +
> https://docbook.org/xml/4.5/catalog.xml;name=catalog-4_5;downloadfilename=catalog-4.5.xml
> \
> +    file://LICENSE-OASIS \
>  "
> -
> -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e"
> -SRC_URI[sha256sum] =
> "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f"
> -
> -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/"
> -
> -S = "${WORKDIR}/docbook-xml-4.5.c31424"
> -
> -inherit allarch
> +SRC_URI[catalog-4_2.md5sum] = "37efa9b1f4ffa6e5b05126bbf9b9a9e0"
> +SRC_URI[catalog-4_2.sha256sum] =
> "274834261133669b98966d2a53e94a98b735a146c3e452901ee5002ab0b990a2"
> +SRC_URI[catalog-4_3.md5sum] = "dc8a64236d9c3d4aae5263a8afc3dbc3"
> +SRC_URI[catalog-4_3.sha256sum] =
> "2673ec05844517ed1965c5da74c76193cb00132e0cd1f72646bd9b55fc2fd24b"
> +SRC_URI[catalog-4_4.md5sum] = "5576531ac936f1655f717b3681f4f6b5"
> +SRC_URI[catalog-4_4.sha256sum] =
> "21d68015dfa64b8c90242b71dbaa5314785ec2e06f0bf02f25d35e109c0f851e"
> +SRC_URI[catalog-4_5.md5sum] = "1e948be9c9324edf05688f252697308a"
> +SRC_URI[catalog-4_5.sha256sum] =
> "9cf6672e30a61f2303491841741b2976785629ad85ed0323daf0c04baf7c8b2f"
> +
> +inherit allarch xmlcatalog
>  BBCLASSEXTEND = "native"
>
> -do_configure (){
> -    :
> -}
> +# the XMLCATALOGS variable is used in xmlcatalog BB class
> +XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml"
>
> -do_compile (){
> -    :
> -}
> +S = "${WORKDIR}"
> +
> +do_configure[noexec] = "1"
> +do_compile[noexec] = "1"
>
>  do_install () {
> +
>      install -d ${D}${sysconfdir}/xml/
>      xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml
>
> -    for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do
> -        DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION
> +    for catalog in $(ls catalog-4.*.xml); do
> +        dtdVersion=$(echo ${catalog} | sed -rn
> 's/^catalog-([0-9].[0-9])\.xml/\1/p')
> +        DEST=${datadir}/xml/docbook/schema/dtd/${dtdVersion}
>          install -d -m 755 ${D}$DEST
> -        cp -v -R docbook-$DTDVERSION/* ${D}$DEST
> +        cp -v -R catalog-${dtdVersion}.xml ${D}$DEST/catalog.xml
>          xmlcatalog --verbose --noout --add nextCatalog unused
> file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml
>      done
>  }
>
> -XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml"
> -inherit xmlcatalog
> -
> -FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml"
> +FILES_${PN} = "\
> +    ${datadir}/* \
> +    ${XMLCATALOGS} \
> +"
> --
> 2.26.2
>
> 
>

[-- Attachment #2: Type: text/html, Size: 37598 bytes --]

  reply	other threads:[~2020-05-23 20:57 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-23 19:12 [PATCH] docbook-xml: update recipe to stick with the upstream Gregor Zatko
2020-05-23 20:57 ` Alexander Kanavin [this message]
2020-05-24 15:24 ` [OE-core] " Richard Purdie
2020-05-28 21:12   ` Gregor Zatko
2020-05-29  9:36     ` Alexander Kanavin
  -- strict thread matches above, loose matches on Subject: below --
2020-05-23 17:20 Gregor Zatko
2020-05-23 18:50 ` [OE-core] " Alexander Kanavin
2020-05-23 18:55   ` Gregor Zatko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CANNYZj_ZK+KFUnFunO_VLH2emOQWg7FZBkVLy4RjzOv5cgy7ZA@mail.gmail.com \
    --to=alex.kanavin@gmail.com \
    --cc=gzatko@gmail.com \
    --cc=gzatko@zoznam.sk \
    --cc=openembedded-core@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.