diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-01-30 04:59:13 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-01-30 08:59:48 +0100 |
| commit | 51327bd0f57ceb2ecbb378d64c48fade02ecb361 (patch) | |
| tree | 3eb60c17bee1b2a2124079af5723f890f2830bcb /source/ap/linuxdoc-tools | |
| parent | 3646186e415cbb43f06bae8bd87a8512577acf3d (diff) | |
| download | current-51327bd0f57ceb2ecbb378d64c48fade02ecb361.tar.gz current-51327bd0f57ceb2ecbb378d64c48fade02ecb361.tar.xz | |
Thu Jan 30 04:59:13 UTC 202020200130045913
a/kernel-generic-5.4.16-x86_64-1.txz: Upgraded.
a/kernel-huge-5.4.16-x86_64-1.txz: Upgraded.
a/kernel-modules-5.4.16-x86_64-1.txz: Upgraded.
ap/linuxdoc-tools-0.9.73-x86_64-5.txz: Rebuilt.
gnome-doc-tools: Make '/usr/bin/xml2po' and its accompanying Python module
build against Python3.
Thanks to bassmadrigal and ponce on LQ for the report and the patch.
docbook2x: Removed '--disable-maintainer-mode' configuration flag because
it's no longer valid.
Thanks to Stuart Winter.
d/kernel-headers-5.4.16-x86-1.txz: Upgraded.
k/kernel-source-5.4.16-noarch-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/ap/linuxdoc-tools')
| -rw-r--r-- | source/ap/linuxdoc-tools/ChangeLog.txt | 9 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/linuxdoc-tools.build | 11 | ||||
| -rwxr-xr-x | source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools | 2 |
3 files changed, 14 insertions, 8 deletions
diff --git a/source/ap/linuxdoc-tools/ChangeLog.txt b/source/ap/linuxdoc-tools/ChangeLog.txt index 56b327cb6..0dbdf9303 100644 --- a/source/ap/linuxdoc-tools/ChangeLog.txt +++ b/source/ap/linuxdoc-tools/ChangeLog.txt @@ -1,3 +1,12 @@ +Wed Jan 29 09:11:40 GMT 2020 + linuxdoc-tools 0.9.73, build 5. + Stuart Winter <mozes@slackware.com> + * gnome-doc-tools: Make '/usr/bin/xml2po' and its accompanying Python module + build against Python3. + Thanks to bassmadrigal and ponce on LQ for the report and the patch. + * docbook2x: Removed '--disable-maintainer-mode' configuration flag + because it's no longer valid. + Thu Jan 2 11:47:35 GMT 2020 linuxdoc-tools 0.9.73, build 4. Stuart Winter <mozes@slackware.com> diff --git a/source/ap/linuxdoc-tools/linuxdoc-tools.build b/source/ap/linuxdoc-tools/linuxdoc-tools.build index 444a2a5fe..2a30a4bb3 100755 --- a/source/ap/linuxdoc-tools/linuxdoc-tools.build +++ b/source/ap/linuxdoc-tools/linuxdoc-tools.build @@ -112,6 +112,9 @@ autoreconf -v # Install: if [ "$1" = "nodocs" ]; then + echo "*********************************************************************" + echo "*** Building asciidoc without documentation - expect errors below ***" + echo "*********************************************************************" make -i install echo "******************************************************************" echo "*** Built asciidoc without documentation - expect errors above ***" @@ -1047,6 +1050,7 @@ done || exit 1 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CPPFLAGS="$SLKCFLAGS" \ +PYTHON=/usr/bin/python3 \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ @@ -1057,12 +1061,6 @@ 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 @@ -1200,7 +1198,6 @@ CPPFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/docbook2X-$DOCBOOK2XVER \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-maintainer-mode \ --disable-dependency-tracking \ --program-transform-name="s/^docbook2/docbook2x-/" \ --with-html-xsl \ diff --git a/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools b/source/ap/linuxdoc-tools/trackbuild.linuxdoc-tools index 7317d9630..ef4a4ff7c 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:-4} +BUILD=${BUILD:-5} PKGEXT=${PKGEXT:-txz} export CWD=$PWD |