From ee2de3eb4ea26a85b457735e62ce4ad41e992176 Mon Sep 17 00:00:00 2001 From: James Larrowe Date: Sun, 2 Sep 2018 12:54:23 -0400 Subject: [PATCH] Fix docbook packages (#2551) * Fixed gtk_doc, docbook, and tools to skip creation of binaries. * Cleaned up a little. * Fix circular dependency that leaves gtk_doc to hang. * Removed docbook_xsl dependency from gtk_doc * Added libxslt dependency to gtk_doc * Fixed circular dependencies * Reverted docbook_xml source sha256sum, firewall threw it off. * Added libxml2_python dependency to libxslt * Removed libxml2 and unzip dependencies from packages * Made sure to use crew variables instead of hardcoded paths. * added files to docbook package. * Fixed packages to create the catalog in the postinstall * Removed exclusions of those packages for binary builds * Removed some lines from the packages that conflicted with the other package's files. * Forces to recreate the catalog and the docbook catalog every time package is reinstalled. * Updated docbook_xsl to track the XML catalog. * The catalog and docbook files are now tracked in both packages. Fully tested and working. * Now uses variables for docbook version numbers, removed the warning about binaries. Fixes @uberhacker's requests. --- packages/docbook.rb | 14 ++--- packages/docbook_xml.rb | 116 ++++++++++++++++++---------------------- packages/docbook_xsl.rb | 64 +++++++++------------- packages/gtk_doc.rb | 21 +------- packages/libxslt.rb | 15 ++---- 5 files changed, 86 insertions(+), 144 deletions(-) diff --git a/packages/docbook.rb b/packages/docbook.rb index 9a7ef58f65..707e91a903 100644 --- a/packages/docbook.rb +++ b/packages/docbook.rb @@ -3,25 +3,17 @@ require 'package' class Docbook < Package description 'DocBook is an XML vocabulary that lets you create documents in a presentation-neutral form that captures the logical structure of your content.' homepage 'http://docbook.sourceforge.net/' - version '1.79.1' + version '1.79.1-1' source_url 'https://downloads.sourceforge.net/project/docbook/docbook-xsl/1.79.1/docbook-xsl-1.79.1.tar.bz2' source_sha256 '725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/docbook-1.79.1-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/docbook-1.79.1-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/docbook-1.79.1-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/docbook-1.79.1-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '46c4bc0ba85310a7dbd317ccf82d1a01d84fed57844fe1ab402c97e7dfff214b', - armv7l: '46c4bc0ba85310a7dbd317ccf82d1a01d84fed57844fe1ab402c97e7dfff214b', - i686: 'f920e1e335360b845136dcd6ae16d6802db8c6a363f728122b25ba9b272d5f22', - x86_64: '4cb9846d4a824f015b86a7c633877e8716a52fa2f3d76cc2a9d1149ef3b49b3a', }) def self.install - system "mkdir -p #{CREW_DEST_DIR}/usr/local/docbook" - system "cp -r . #{CREW_DEST_DIR}/usr/local/docbook" + system "mkdir -p #{CREW_DEST_PREFIX}/docbook" + system "cp -r . #{CREW_DEST_PREFIX}/docbook" end end diff --git a/packages/docbook_xml.rb b/packages/docbook_xml.rb index 4227ea2484..efd501f0ab 100644 --- a/packages/docbook_xml.rb +++ b/packages/docbook_xml.rb @@ -5,100 +5,90 @@ require 'package' class Docbook_xml < Package description 'document type definitions for verification of XML data files against the DocBook rule set' homepage 'http://www.docbook.org' - version '4.3' + version '4.3-1' source_url 'http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip' source_sha256 '23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/docbook_xml-4.3-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/docbook_xml-4.3-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/docbook_xml-4.3-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/docbook_xml-4.3-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'd52eb60b394b51945c4ebcefe915664fb835308e68e81a03f63da6b524f2b8db', - armv7l: 'd52eb60b394b51945c4ebcefe915664fb835308e68e81a03f63da6b524f2b8db', - i686: '432c69d99add5b330b8c3a43bbf937e10a2cee93081296e7fb43cd2e35cf3bd6', - x86_64: '43652bc703c27c907372133db6e93c39a90b8d671a94e6136a3c2e453672a02d', }) - depends_on 'unzip' - depends_on 'libxml2' depends_on 'docbook' - def self.build - end - def self.install - system "install -v -d -m755 #{CREW_DEST_DIR}/usr/local/share/xml/docbook/xml-dtd-4.3" - system "install -v -d -m755 #{CREW_DEST_DIR}/usr/local/etc/xml" - - system "if [ ! -e #{CREW_DEST_DIR}/usr/local/etc/xml/docbook ]; then - xmlcatalog --noout --create #{CREW_DEST_DIR}/usr/local/etc/xml/docbook - fi && + + xml_dtd = 'xml-dtd-4.3' + xml_version = 'xml/4.3' + vxml = 'V4.3' + + system "install -v -d -m755 #{CREW_DEST_PREFIX}/share/xml/docbook/#{xml_dtd}" + system "install -v -d -m755 #{CREW_DEST_PREFIX}/etc/xml" + system "cp -rpa . #{CREW_DEST_PREFIX}/share/xml/docbook/#{xml_dtd}/" + system "rm -f #{CREW_PREFIX}/etc/xml/docbook && \ + xmlcatalog --noout --create #{CREW_DEST_PREFIX}/etc/xml/docbook && \ xmlcatalog --noout --add 'public' \ - '-//OASIS//DTD DocBook XML V4.3//EN' \ - 'http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + '-//OASIS//DTD DocBook XML #{vxml}//EN' \ + 'http://www.oasis-open.org/docbook/#{xml_version}/docbookx.dtd' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'public' \ - '-//OASIS//DTD DocBook XML CALS Table Model V4.3//EN' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3/calstblx.dtd' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + '-//OASIS//DTD DocBook XML CALS Table Model #{vxml}//EN' \ + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}/calstblx.dtd' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'public' \ '-//OASIS//DTD XML Exchange Table Model 19990315//EN' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3/soextblx.dtd' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}/soextblx.dtd' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'public' \ - '-//OASIS//ELEMENTS DocBook XML Information Pool V4.3//EN' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3/dbpoolx.mod' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + '-//OASIS//ELEMENTS DocBook XML Information Pool #{vxml}//EN' \ + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}/dbpoolx.mod' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'public' \ - '-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.3//EN' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3/dbhierx.mod' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + '-//OASIS//ELEMENTS DocBook XML Document Hierarchy #{vxml}//EN' \ + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}/dbhierx.mod' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'public' \ - '-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3/htmltblx.mod' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + '-//OASIS//ELEMENTS DocBook XML HTML Tables #{vxml}//EN' \ + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}/htmltblx.mod' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'public' \ - '-//OASIS//ENTITIES DocBook XML Notations V4.3//EN' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3/dbnotnx.mod' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + '-//OASIS//ENTITIES DocBook XML Notations #{vxml}//EN' \ + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}/dbnotnx.mod' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'public' \ - '-//OASIS//ENTITIES DocBook XML Character Entities V4.3//EN' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3/dbcentx.mod' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + '-//OASIS//ENTITIES DocBook XML Character Entities #{vxml}//EN' \ + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}/dbcentx.mod' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'public' \ - '-//OASIS//ENTITIES DocBook XML Additional General Entities V4.3//EN' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3/dbgenent.mod' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + '-//OASIS//ENTITIES DocBook XML Additional General Entities #{vxml}//EN' \ + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}/dbgenent.mod' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'rewriteSystem' \ - 'http://www.oasis-open.org/docbook/xml/4.3' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook && + 'http://www.oasis-open.org/docbook/#{xml_version}' \ + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook && xmlcatalog --noout --add 'rewriteURI' \ - 'http://www.oasis-open.org/docbook/xml/4.3' \ - 'file:///usr/local/share/xml/docbook/xml-dtd-4.3' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/docbook" + 'http://www.oasis-open.org/docbook/#{xml_version}' \ + 'file://#{CREW_PREFIX}/share/xml/docbook/#{xml_dtd}' \ + #{CREW_DEST_PREFIX}/etc/xml/docbook" - system "if [ ! -e #{CREW_DEST_DIR}/usr/local/etc/xml/catalog ]; then - xmlcatalog --noout --create #{CREW_DEST_DIR}/usr/local/etc/xml/catalog - fi && + system "rm -f #{CREW_PREFIX}/etc/xml/catalog && \ + xmlcatalog --noout --create #{CREW_DEST_PREFIX}/etc/xml/catalog && \ xmlcatalog --noout --add 'delegatePublic' \ '-//OASIS//ENTITIES DocBook XML' \ - 'file:///usr/local/etc/xml/docbook' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/catalog && + 'file://#{CREW_PREFIX}/etc/xml/docbook' \ + #{CREW_DEST_PREFIX}/etc/xml/catalog && xmlcatalog --noout --add 'delegatePublic' \ '-//OASIS//DTD DocBook XML' \ - 'file:///usr/local/etc/xml/docbook' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/catalog && + 'file://#{CREW_PREFIX}/etc/xml/docbook' \ + #{CREW_DEST_PREFIX}/etc/xml/catalog && xmlcatalog --noout --add 'delegateSystem' \ 'http://www.oasis-open.org/docbook/' \ - 'file:///usr/local/etc/xml/docbook' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/catalog && + 'file://#{CREW_PREFIX}/etc/xml/docbook' \ + #{CREW_DEST_PREFIX}/etc/xml/catalog && xmlcatalog --noout --add 'delegateURI' \ 'http://www.oasis-open.org/docbook/' \ - 'file:///usr/local/etc/xml/docbook' \ - #{CREW_DEST_DIR}/usr/local/etc/xml/catalog" + 'file://#{CREW_PREFIX}/etc/xml/docbook' \ + #{CREW_DEST_PREFIX}/etc/xml/catalog" end end diff --git a/packages/docbook_xsl.rb b/packages/docbook_xsl.rb index 694732fe29..819f180735 100644 --- a/packages/docbook_xsl.rb +++ b/packages/docbook_xsl.rb @@ -5,66 +5,50 @@ require 'package' class Docbook_xsl < Package description 'The DocBook XSL Stylesheets package contains XSL stylesheets. These are useful for performing transformations on XML DocBook files.' homepage 'https://github.com/docbook/xslt10-stylesheets' - version '1.79.1' + version '1.79.1-1' source_url 'http://downloads.sourceforge.net/docbook/docbook-xsl-1.79.1.tar.bz2' source_sha256 '725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/docbook_xsl-1.79.1-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/docbook_xsl-1.79.1-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/docbook_xsl-1.79.1-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/docbook_xsl-1.79.1-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'dc78b57e5e4219ea92f0c2f077806c8f1f88f66577cec829d23691319d812ad6', - armv7l: 'dc78b57e5e4219ea92f0c2f077806c8f1f88f66577cec829d23691319d812ad6', - i686: '46834cf7ee7510cd02417a50b874fe0aceb806fc656ca13600e3bfa7dee25c5c', - x86_64: '6713dae4909337fde776f610cf3dee9b6b0ca88a8b35ffb02cc213022f6b85ba', }) - depends_on 'unzip' - depends_on 'libxml2' - depends_on 'libxslt' depends_on 'docbook_xml' - depends_on 'docbook' - - def self.build - end def self.install - system "install -v -m755 -d #{CREW_DEST_DIR}/usr/local/share/xml/docbook/xsl-stylesheets-1.79.1 && - cp -v -R VERSION assembly common eclipse epub epub3 extensions fo \ - highlighting html htmlhelp images javahelp lib manpages params \ - profiling roundtrip slides template tests tools webhelp website \ - xhtml xhtml-1_1 xhtml5 \ - #{CREW_DEST_DIR}/usr/local/share/xml/docbook/xsl-stylesheets-1.79.1 && - - ln -s VERSION #{CREW_DEST_DIR}/usr/local/share/xml/docbook/xsl-stylesheets-1.79.1/VERSION.xsl && - - install -v -m644 -D README \ - #{CREW_DEST_DIR}/usr/local/share/doc/docbook-xsl-1.79.1/README.txt && + + xsl_stylesheets = 'xsl-stylesheets-1.79.1' + docbook_xsl_ = 'docbook-xsl-1.79.1' + xsl_version = 'xsl/1.79.1' + + system "install -v -m755 -d #{CREW_DEST_PREFIX}/share/xml/docbook/#{xsl_stylesheets} && + cp -v -R . \ + #{CREW_DEST_PREFIX}/share/xml/docbook/#{xsl_stylesheets}/" + system "install -v -m644 -D README \ + #{CREW_DEST_PREFIX}/share/doc/#{docbook_xsl_}/README.txt && install -v -m644 RELEASE-NOTES* NEWS* \ - #{CREW_DEST_DIR}/usr/local/share/doc/docbook-xsl-1.79.1" - + #{CREW_DEST_PREFIX}/share/doc/#{docbook_xsl_}" + FileUtils.mkdir_p "#{CREW_DEST_PREFIX}/etc/xml" system "xmlcatalog --noout --add 'rewriteSystem' \ - 'http://docbook.sourceforge.net/release/xsl/1.79.1' \ - '#{CREW_DEST_DIR}/usr/local/share/xml/docbook/xsl-stylesheets-1.79.1' \ - /usr/local/etc/xml/catalog && + 'http://docbook.sourceforge.net/release/#{xsl_version}' \ + '#{CREW_PREFIX}/share/xml/docbook/#{xsl_stylesheets}' \ + #{CREW_PREFIX}/etc/xml/catalog && xmlcatalog --noout --add 'rewriteURI' \ - 'http://docbook.sourceforge.net/release/xsl/1.79.1' \ - '#{CREW_DEST_DIR}/usr/local/share/xml/docbook/xsl-stylesheets-1.79.1' \ - /usr/local/etc/xml/catalog && + 'http://docbook.sourceforge.net/release/#{xsl_version}' \ + '#{CREW_PREFIX}/share/xml/docbook/#{xsl_stylesheets}' \ + #{CREW_PREFIX}/etc/xml/catalog && xmlcatalog --noout --add 'rewriteSystem' \ 'http://docbook.sourceforge.net/release/xsl/current' \ - '#{CREW_DEST_DIR}/usr/local/share/xml/docbook/xsl-stylesheets-1.79.1' \ - /usr/local/etc/xml/catalog && + '#{CREW_PREFIX}/share/xml/docbook/#{xsl_stylesheets}' \ + #{CREW_PREFIX}/etc/xml/catalog && xmlcatalog --noout --add 'rewriteURI' \ 'http://docbook.sourceforge.net/release/xsl/current' \ - '#{CREW_DEST_DIR}/usr/local/share/xml/docbook/xsl-stylesheets-1.79.1' \ - /usr/local/etc/xml/catalog" - + '#{CREW_PREFIX}/share/xml/docbook/#{xsl_stylesheets}' \ + #{CREW_PREFIX}/etc/xml/catalog" + system "mv #{CREW_PREFIX}/etc/xml/catalog #{CREW_DEST_PREFIX}/etc/xml/" end end diff --git a/packages/gtk_doc.rb b/packages/gtk_doc.rb index 0b4c41853c..e3e2b19bf6 100644 --- a/packages/gtk_doc.rb +++ b/packages/gtk_doc.rb @@ -8,32 +8,15 @@ class Gtk_doc < Package source_sha256 'f0bcb1ff8268136fdbf426d7862f4f092e70b24a73632cfe0a3d31ed0d924b5c' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/gtk_doc-1.26-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/gtk_doc-1.26-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/gtk_doc-1.26-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/gtk_doc-1.26-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: '0341eb6a16c9e6198a72bb2d5f091d3b4f45aa0a0237d92e2ba706736805f9b0', - armv7l: '0341eb6a16c9e6198a72bb2d5f091d3b4f45aa0a0237d92e2ba706736805f9b0', - i686: '867b201b1456d42848e209c7896c6651fc7bcbc84b42ea3e885a4559c27fdc49', - x86_64: '03b2df2209431070c71579a0446f68f900e2b435b2d1f47c895128dd4a5cf501', }) - depends_on 'python3' - depends_on 'python27' - depends_on 'autoconf' - depends_on 'automake' - depends_on 'libxml2' - depends_on 'libxslt' - depends_on 'docbook' - depends_on 'docbook_xml' - depends_on 'docbook_xsl' depends_on 'six' + depends_on 'libxslt' def self.build - system './autogen.sh --with-xml-catalog=/usr/local/etc/xml/catalog' - system './configure --with-xml-catalog=/usr/local/etc/xml/catalog' + system "./autogen.sh --prefix=#{CREW_PREFIX} --libdir=#{CREW_LIB_PREFIX} --with-xml-catalog=#{CREW_PREFIX}/etc/xml/catalog" system 'make' end diff --git a/packages/libxslt.rb b/packages/libxslt.rb index 787aa79b7f..d891f0a53a 100644 --- a/packages/libxslt.rb +++ b/packages/libxslt.rb @@ -3,30 +3,23 @@ require 'package' class Libxslt < Package description 'Libxslt is the XSLT C library developed for the GNOME project.' homepage 'http://xmlsoft.org/libxslt/' - version '1.1.32' + version '1.1.32-1' source_url 'http://xmlsoft.org/sources/libxslt-1.1.32.tar.gz' source_sha256 '526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460' binary_url ({ - aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libxslt-1.1.32-chromeos-armv7l.tar.xz', - armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libxslt-1.1.32-chromeos-armv7l.tar.xz', - i686: 'https://dl.bintray.com/chromebrew/chromebrew/libxslt-1.1.32-chromeos-i686.tar.xz', - x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libxslt-1.1.32-chromeos-x86_64.tar.xz', }) binary_sha256 ({ - aarch64: 'c9edcdbefad60a9b0b054fb8570adf6d7d27f711bd78fc7d608e9fca789cbba4', - armv7l: 'c9edcdbefad60a9b0b054fb8570adf6d7d27f711bd78fc7d608e9fca789cbba4', - i686: 'acd156aaa74e26070d956fb5cdb6d7ef4613b3cb38f7ae7f48c3998987a5e88d', - x86_64: '3b34fc2e1c0178f51017d739ccb3765e3dc360f30c5a578942c9da612ed0c92a', }) - depends_on 'libxml2' + depends_on 'libxml2_python' + depends_on 'libgcrypt' + depends_on 'docbook_xsl' def self.build system './configure', "--prefix=#{CREW_PREFIX}", "--libdir=#{CREW_LIB_PREFIX}", - '--without-python', '--disable-static' system 'make' end