diff options
Diffstat (limited to 'source/ap/linuxdoc-tools/sources')
4 files changed, 104 insertions, 113 deletions
diff --git a/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch b/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch new file mode 100644 index 000000000..d6d45df0b --- /dev/null +++ b/source/ap/linuxdoc-tools/sources/asciidoc-0001-a2x-Write-manifests-in-UTF-8-by-default.patch @@ -0,0 +1,38 @@ +From adb0929f0db4da533a9d5b317e6f49a91feb3b3e Mon Sep 17 00:00:00 2001 +From: Stanislav Ochotnicky <sochotnicky@redhat.com> +Date: Tue, 3 Dec 2013 18:03:13 +0100 +Subject: [PATCH] [a2x] Write manifests in UTF-8 by default + +This is a workaround for rhbz#968308 where a2x tries to write non-ASCII content +epub manifest. Since the write_file is mostly used to write xml content which +defaults to UTF-8 this seems fairly safe +--- + a2x.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/a2x.py b/a2x.py +index 1b192a2..ad163e3 100755 +--- a/a2x.py ++++ b/a2x.py +@@ -21,6 +21,7 @@ import urlparse + import zipfile + import xml.dom.minidom + import mimetypes ++import codecs + + PROG = os.path.basename(os.path.splitext(__file__)[0]) + VERSION = '8.6.8' +@@ -144,8 +145,8 @@ def find_executable(file_name): + result = _find_executable(file_name) + return result + +-def write_file(filename, data, mode='w'): +- f = open(filename, mode) ++def write_file(filename, data, mode='w', encoding='utf-8'): ++ f = codecs.open(filename, mode, encoding) + try: + f.write(data) + finally: +-- +1.8.4.2 + diff --git a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch b/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch deleted file mode 100644 index ba3da2ee8..000000000 --- a/source/ap/linuxdoc-tools/sources/linuxdoc-tools-0.9.68-flex.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- linuxdoc-tools-0.9.68/rtf-fix/rtf2rtf.l 2008-05-28 18:16:36.000000000 +0200 -+++ linuxdoc-tools-0.9.68/rtf-fix/rtf2rtf.l-patched 2013-02-19 11:10:25.367016000 +0100 -@@ -72,7 +72,14 @@ - int skipnewline = 0; - - extern char *yytext; -+ -+#if YY_FLEX_MAJOR_VERSION > 2 \ -+ || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION > 5) \ -+ || (YY_FLEX_MAJOR_VERSION == 2 && YY_FLEX_MINOR_VERSION == 5 && YY_FLEX_SUBMINOR_VERSION > 35) -+extern yy_size_t yyleng; -+#else - extern int yyleng; -+#endif - - #define CHAPTER 1 - #define SECTION 2 diff --git a/source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl b/source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl deleted file mode 100644 index 5b18fe009..000000000 --- a/source/ap/linuxdoc-tools/sources/openjade-1.3-getopts.pl +++ /dev/null @@ -1,65 +0,0 @@ -;# getopts.pl - a better getopt.pl -# -# This library is no longer being maintained, and is included for backward -# compatibility with Perl 4 programs which may require it. -# -# In particular, this should not be used as an example of modern Perl -# programming techniques. -# -# Suggested alternatives: Getopt::Long or Getopt::Std -# -;# Usage: -;# do Getopts('a:bc'); # -a takes arg. -b & -c not. Sets opt_* as a -;# # side effect. - -sub Getopts { - local($argumentative) = @_; - local(@args,$_,$first,$rest); - local($errs) = 0; - - @args = split( / */, $argumentative ); - while(@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) { - ($first,$rest) = ($1,$2); - $pos = index($argumentative,$first); - if($pos >= 0) { - if($args[$pos+1] eq ':') { - shift(@ARGV); - if($rest eq '') { - ++$errs unless(@ARGV); - $rest = shift(@ARGV); - } - eval " - push(\@opt_$first, \$rest); - if (!defined \$opt_$first or \$opt_$first eq '') { - \$opt_$first = \$rest; - } - else { - \$opt_$first .= ' ' . \$rest; - } - "; - } - else { - eval "\$opt_$first = 1"; - if($rest eq '') { - shift(@ARGV); - } - else { - $ARGV[0] = "-$rest"; - } - } - } - else { - print STDERR "Unknown option: $first\n"; - ++$errs; - if($rest ne '') { - $ARGV[0] = "-$rest"; - } - else { - shift(@ARGV); - } - } - } - $errs == 0; -} - -1; diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download index d723574cb..e30a191d8 100755 --- a/source/ap/linuxdoc-tools/sources/source.download +++ b/source/ap/linuxdoc-tools/sources/source.download @@ -1,3 +1,11 @@ +# Extract all SRPM URLs to make it easy to download. +# Often there's nothing that's changed between the version of the SRPM we hold, and +# the upstream version - the version was increased due to a rebuild within Fedora. +# However, I update our copy of the SRPM regardless, since it eases maintenance. +# +# egrep "^wget.*src.rpm$" source.download +# + # Incase you're wondering why we're using source RPMs, this is because # they contain patches required to either fix build or runtime problems, # and it's easier to maintain this hunk of a package when the patches & @@ -9,7 +17,7 @@ # https://packages.debian.org/sid/linuxdoc-tools # # This provides things such as sgml2txt. -wget -c http://ftp.de.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.69.orig.tar.gz +wget -c http://http.debian.net/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0.9.72.orig.tar.gz # We're taking some patches from here - now separated out: #wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/l/linuxdoc-tools-0.9.68-3.fc19.src.rpm @@ -17,32 +25,26 @@ wget -c http://ftp.de.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tool # http://openjade.sourceforge.net/download.html # wget -c http://kent.dl.sourceforge.net/sourceforge/openjade/OpenSP-1.5.2.tar.gz # -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/opensp-1.5.2-22.fc23.src.rpm +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/ +# +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/opensp-1.5.2-24.fc26.src.rpm # OpenJade: # http://openjade.sourceforge.net/ # We're using a gcc 4.6 patch from Fedora's SRPM: -# ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/o/openjade-1.3.2-39.fc17.src.rpm -# And we're using the old Perl 4 core libraries (as a dirty but effective build time work-around) taken from: -# http://packages.debian.org/sid/libperl4-corelibs-perl -# http://ftp.de.debian.org/debian/pool/main/libp/libperl4-corelibs-perl/libperl4-corelibs-perl_0.003.orig.tar.gz -wget -c http://downloads.sourceforge.net/openjade/openjade-1.3.3-pre1.tar.gz +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/ +# +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/openjade-1.3.2-55.fc27.src.rpm # sgmltools-common. # It's broken and needs patching so we'll use Fedora's. #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/sgml-common-0.6.3.tgz -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/s/sgml-common-0.6.3-43.fc23.src.rpm - - -# DocBook docs: -# http://www.oasis-open.org/docbook/sgml/ # -#wget -c http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip -#wget -c http://www.docbook.org/sgml/4.5/docbook-4.5.zip -# We use Debian's source because it's more convenient since they package all versions in one archive: -# https://packages.debian.org/search?keywords=docbook&searchon=names&suite=all§ion=all -wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/ # +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/sgml-common-0.6.3-47.fc28.src.rpm + # http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html # Check versions: # http://sourceforge.net/projects/docbook/files/ @@ -50,32 +52,46 @@ wget -c ftp://ftp.linux.ee/pub/gentoo/distfiles/distfiles/docbook-dsssl-1.79.tar wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1.79.tar.bz2 # Why don't they put the patches into the distributed source...??? #wget -c ftp://sources.redhat.com/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-utils-0.6.14-39.fc23.src.rpm # # -# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook.html -wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip -# https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608 +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/ +# +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-utils-0.6.14-43.fc27.src.rpm # -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook-style-xsl-1.78.1-4.fc23.src.rpm # + + # We use the Fedora "docbook-style-xsl" SRPM for this rather than the original source which is why # these "docbook-xsl*" files aren't in our sources directory. #wget -c "http://downloads.sourceforge.net/project/docbook/docbook-xsl/1.75.2/docbook-xsl-1.75.2.tar.bz2?use_mirror=freefr" ##wget -c "http://downloads.sourceforge.net/project/docbook/docbook-xsl-doc/1.75.2/docbook-xsl-doc-1.75.2.tar.bz2?use_mirror=freefr" +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/ +# +wget -c https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-style-xsl-1.79.2-6.fc28.src.rpm +# http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook.html +wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip +# https://sourceforge.net/project/showfiles.php?group_id=21935&package_id=16608 +# # gnome-doc-utils, needed to build gtk-doc: # Recompressed with LZMA after download. # I guess this mirror is out of date now. It's easier to just look at Fedora's development # directory anyway :-) # wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.0.tar.bz2 -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/g/gnome-doc-utils-0.20.10-7.fc23.src.rpm +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/ +# +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gnome-doc-utils-0.20.10-13.fc27.src.rpm # gtk-doc: # There aren't any patches taken from the SRPM, but you can check the version used in Fedora # and see if any are being applied. We will pull the source archive from the SRPM: -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/g/gtk-doc-1.24-2.fc23.src.rpm +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/ +# +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.26-2.fc27.src.rpm #wget -c http://ftp.acc.umu.se/pub/GNOME/sources/gtk-doc/1.21/gtk-doc-1.21.tar.xz # http://git.gnome.org/browse/gtk-doc/commit/?id=2bffebcf9c125f5610b8fb660d42c3c5b9dfd4f0 @@ -84,27 +100,46 @@ wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/ # http://packages.debian.org/search?keywords=sgmlspl&searchon=names&suite=all§ion=all # There's nothing in the FTP download site at this time, so I'll take it from Debian. wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii.orig.tar.gz -wget -c http://ftp.debian.org/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-33.debian.tar.xz +wget -c http://http.debian.net/debian/pool/main/libs/libsgmls-perl/libsgmls-perl_1.03ii-36.debian.tar.xz # xmlto # https://fedorahosted.org/releases/x/m/xmlto # wget -c --no-check-certificate https://fedorahosted.org/releases/x/m/xmlto/xmlto-0.0.23.tar.bz2 # Fedora includes a patch, so we'll take it: -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/x/xmlto-0.0.26-4.fc23.src.rpm +# +# https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/x +# +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/x/xmlto-0.0.28-5.fc27.src.rpm # AsciiDoc # http://www.methods.co.nz/asciidoc/ -#wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/a/asciidoc-8.6.8-1.fc19.src.rpm +# Taken some patches from Fedora. +wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/a/asciidoc-8.6.8-12.fc27.src.rpm # docbook2X: # # Pre-requisite PERL modules for docbook2X: -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-NamespaceSupport-1.11-16.fc23.src.rpm -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-SAX-Base-1.08-14.fc23.src.rpm -wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/p/perl-XML-SAX-0.99-15.fc23.src.rpm +# https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/ +# +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-NamespaceSupport-1.12-3.fc27.src.rpm +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-0.99-20.fc27.src.rpm +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-Base-1.09-3.fc27.src.rpm # #http://packages.debian.org/sid/docbook2x # Fedora keep it here, but Debian have a couple of (what look to be useful) patches. #wget -c ftp://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/source/SRPMS/d/docbook2X-0.8.8-14.fc19.src.rpm +# +# https://packages.debian.org/search?keywords=docbook2x&searchon=names&suite=all§ion=all wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8.orig.tar.gz -wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook2x/docbook2x_0.8.8-9.debian.tar.gz +wget -c http://http.debian.net/debian/pool/main/d/docbook2x/docbook2x_0.8.8-15.debian.tar.xz + + +# DocBook docs: +# http://www.oasis-open.org/docbook/sgml/ +# +#wget -c http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip +#wget -c http://www.docbook.org/sgml/4.5/docbook-4.5.zip +# We use Debian's source because it's more convenient since they package all versions in one archive: +# https://packages.debian.org/search?keywords=docbook&searchon=names&suite=all§ion=all +wget -c http://ftp.de.debian.org/debian/pool/main/d/docbook/docbook_4.5.orig.tar.gz +# |