diff options
Diffstat (limited to 'source/ap')
| -rw-r--r-- | source/ap/linuxdoc-tools/ChangeLog.txt | 7 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/linuxdoc-tools.build | 48 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/sources/source.download | 22 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools | 2 |
4 files changed, 61 insertions, 18 deletions
diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt index 0b8d32daa..56b327cb6 100644 --- a/source/ap/linuxdoc-tools/ChangeLog.txt +++ b/source/ap/linuxdoc-tools/ChangeLog.txt @@ -1,3 +1,10 @@ +Thu Jan 2 11:47:35 GMT 2020 + linuxdoc-tools 0.9.73, build 4. + Stuart Winter <mozes@slackware.com> + * Upgraded to gtk-doc-1.32 + * Upgraded to perl-XML-SAX-1.02 + * gnome-doc-tools: Migrated to use Python version 3. + Tue Feb 5 20:03:29 GMT 2019 linuxdoc-tools 0.9.73, build 1. Stuart Winter <mozes@slackware.com> diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build index 5eff9afb7..444a2a5fe 100755 --- a/source/ap/linuxdoc-tools/linuxdoc-tools.build +++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build @@ -31,7 +31,7 @@ SGMLDTD3VER=3.1 SGMLDTD4VER=4.5 XMLDTDVER=4.5 GNOMEDOCUTILSVER=0.20.10 -GTKDOCVER=1.29 +GTKDOCVER=1.32 SGMLSPLVER=1.03ii OPENJADEVER=1.3.2 OPENSPVER=1.5.2 @@ -45,7 +45,7 @@ XML_DOCBOOKCATALOG=/etc/xml/docbook # Determine the general CFLAGS for the known architectures: case $ARCH in - arm*) export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" + arm*) export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard -mtune=generic-armv7-a -mabi=aapcs-linux" export LIBDIRSUFFIX="" export HOSTTARGET="-gnueabihf" ;; @@ -155,7 +155,7 @@ find . \ -exec chmod 644 {} \; # Apply patches (these are included in the source rpm): -# Don't include the XML dir patch because we keep our stuff in /usr/share/sgml. +# Don't include the XML dir patch 'sgml-common-xmldir.patch' because we keep our stuff in /usr/share/sgml. for i in \ sgml-common-quotes.patch \ sgml-common-umask.patch ; do @@ -1018,7 +1018,9 @@ export PATH=$OPATH # Extract source: cd $TMP -tar xvf $CWD/sources/gnome-doc-utils-$GNOMEDOCUTILSVER.tar.*z* +mkdir gnome-doc-utils && cd gnome-doc-utils +rpm2cpio $CWD/sources/gnome-doc-utils-*.src.rpm | cpio -div || exit 1 +tar xvf gnome-doc-utils-$GNOMEDOCUTILSVER.tar.*z* cd gnome-doc-utils-*/ || exit 1 chown -R root:root . @@ -1028,6 +1030,19 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Apply patches: +# Extract patch set from Spec file: +# egrep '^Patch[0-9].*: ' *.spec | awk -F: '{print $2" \\"}' +# +# Note: exclude patch 'gnome-doc-utils-0.14.0-package.patch' as it's an RH bug from 2008 +# and we've never included it. +for i in \ + \ + gnome-doc-utils-0.20.10-python3.patch \ + \ + ; do patch --verbose -p1 < ../$i +done || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -1042,6 +1057,12 @@ CPPFLAGS="$SLKCFLAGS" \ --enable-build-utils \ --build=$ARCH-slackware-linux$HOSTTARGET || exit 1 +# Patch: +# +# Set python3 as the interpreter for 'xml2po'. It's already been patched (above) +# but the makefiles and other bits contain /usr/bin/python - which on Slackware is python2. +egrep -lr '/usr/bin/python$' xml2po | xargs sed -i 's?/usr/bin/python?/usr/bin/python3?g' + # No parallel build here because it doesn't work: make || exit 1 @@ -1058,8 +1079,11 @@ cp -fav \ # Extract source: cd $TMP -tar xvf $CWD/sources/gtk-doc-$GTKDOCVER.tar.*z* -cd gtk-doc-$GTKDOCVER || exit 1 +mkdir gtk-doc && cd gtk-doc +rpm2cpio $CWD/sources/gtk-doc-*.src.rpm | cpio -div || exit 1 +tar xvf gtk-doc-$GTKDOCVER.tar.*z* +cd gtk-doc-*/ || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -1067,6 +1091,18 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Apply patches: +# Extract patch set from Spec file: +# egrep '^Patch[0-9].*: ' *.spec | awk -F: '{print $2" \\"}' +# Note: exclude patch 'gnome-doc-utils-0.14.0-package.patch' as it's an RH bug from 2008 +# and we've never included it. +for i in \ + \ + 0001-Partially-revert-a-gtk-doc-1.31-change-that-broke-e-.patch \ + \ + ; do patch --verbose -p1 < ../$i +done || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/source/ap/linuxdoc-tools/sources/source.download b/source/ap/linuxdoc-tools/sources/source.download index f088f0ad4..bb27334ef 100755 --- a/source/ap/linuxdoc-tools/sources/source.download +++ b/source/ap/linuxdoc-tools/sources/source.download @@ -27,7 +27,7 @@ wget -c http://deb.debian.org/debian/pool/main/l/linuxdoc-tools/linuxdoc-tools_0 # # 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-31.fc30.src.rpm +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/o/opensp-1.5.2-33.fc31.src.rpm # OpenJade: # http://openjade.sourceforge.net/ @@ -45,7 +45,7 @@ wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everythin # # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/ # -wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/sgml-common-0.6.3-51.fc30.src.rpm +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/s/sgml-common-0.6.3-53.fc31.src.rpm # http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html # Check versions: @@ -58,7 +58,7 @@ wget -c http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-dsssl-doc-1 # # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/ # -wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-utils-0.6.14-46.fc29.src.rpm +wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-utils-0.6.14-48.fc31.src.rpm # # @@ -70,7 +70,7 @@ wget -c https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everyt # # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/ # -wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-style-xsl-1.79.2-8.fc29.src.rpm +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/d/docbook-style-xsl-1.79.2-10.fc31.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 @@ -85,7 +85,7 @@ wget -c http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip # # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/ # -wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gnome-doc-utils-0.20.10-16.fc29.src.rpm +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gnome-doc-utils-0.20.10-20.fc32.src.rpm # gtk-doc: # There aren't any patches taken from the SRPM, but you can check the version used in Fedora @@ -93,7 +93,7 @@ wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everythin # # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/ # -wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.29-1.fc30.src.rpm +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/g/gtk-doc-1.32-2.fc32.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 @@ -111,23 +111,23 @@ wget -c http://http.debian.net/debian/pool/main/libs/libsgmls-perl/libsgmls-perl # # https://ftp.mirrorservice.org/sites/download.fedora.redhat.com/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/x # -wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/x/xmlto-0.0.28-10.fc29.src.rpm +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/x/xmlto-0.0.28-12.fc31.src.rpm # AsciiDoc # http://www.methods.co.nz/asciidoc/ <<--- no longer updated. Taking src from Fedora's SRPM. # Also http://asciidoc.org/ # Taken some patches from Fedora. # -wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/a/asciidoc-8.6.10-0.8.20180605git986f99d.fc30.src.rpm +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/a/asciidoc-8.6.10-0.13.20180605git986f99d.fc32.src.rpm # docbook2X: # # Pre-requisite PERL modules for docbook2X: # https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/ # -wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-NamespaceSupport-1.12-6.fc29.src.rpm -wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-Base-1.09-6.fc29.src.rpm -wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-1.00-3.fc29.src.rpm +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-NamespaceSupport-1.12-9.fc31.src.rpm +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-Base-1.09-9.fc31.src.rpm +wget https://dl.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/source/tree/Packages/p/perl-XML-SAX-1.02-2.fc31.src.rpm # #http://packages.debian.org/sid/docbook2x diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools index ef91892ae..7317d9630 100755 --- a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools +++ b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools @@ -32,7 +32,7 @@ if [ -z "$ARCH" ]; then fi export PKGVERSION=0.9.73 # use the version of linuxdoc-tools as the package version. -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} PKGEXT=${PKGEXT:-txz} export CWD=$PWD |