From patchwork Wed Jan 25 20:30:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6461 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4P2FpJ61YMz3wcl for ; Wed, 25 Jan 2023 20:30:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4P2FpH0Kwgz10R; Wed, 25 Jan 2023 20:30:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4P2FpG4xJ3z2yT2; Wed, 25 Jan 2023 20:30:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4P2FpF54Gvz2xKS for ; Wed, 25 Jan 2023 20:30:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4P2FpD5GTHzH7; Wed, 25 Jan 2023 20:30:28 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1674678629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=MemuvJPbupyaNpnOoFvSe9rkZHsOikUG8dsa7I/lJPQ=; b=gC+IaUIMfbp6YYoNRelpuwUAHUKLBVLkDeF2/Igv995MH5c8fSH9exf4F5JyUH0Rh4JtgC I7CapZqphiYoVUDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1674678629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=MemuvJPbupyaNpnOoFvSe9rkZHsOikUG8dsa7I/lJPQ=; b=b8wSdBehll6sRnHGunAoMiYEOG084YVAt8POEf+Dwi05QfUb8rJFILLD4P6O7jTLTaaz+5 13nYYEWNkelviaCEreUvCdlDjmMrBzVKhu9KN2ruOluVevk6IHh+sz4Mqwcck9O1UD9Wyp TrPgcn6YuPh3ArDA3W9JacAmQF2LxqpdJtSBxrHDFWhq2asshsGjs4rpiZHkKmXMJw+Pz3 SdaPE7DCsRujuQxjCZMY+1eoDF9ETCpFebgzpJnTBs6MyKTEPMRca/VH4v3vjy6xHvPhp6 XT1x+9xTafpI3Jq5jdmYSrbq4H9KKzkBNpGUOtHSiYcJkOSBBLeyIdIN5L5IYQ== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 1/2] docbook-xsl: Update to 1.79.2 Date: Wed, 25 Jan 2023 21:30:21 +0100 Message-Id: <20230125203022.133803-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This is an update to the latest available version. Signed-off-by: Stefan Schantl --- docbook-xsl/Makefile | 52 --- docbook-xsl/docbook-xsl.nm | 57 ++- .../patches/docbook-xsl-list-item-body.patch | 110 ----- docbook-xsl/patches/docbook-xsl-mandir.patch | 19 - .../patches/docbook-xsl-marginleft.patch | 100 ----- .../patches/docbook-xsl-newmethods.patch | 394 ------------------ ...docbook-xsl-non-constant-expressions.patch | 25 -- .../patches/docbook-xsl-pagesetup.patch | 227 ---------- 8 files changed, 36 insertions(+), 948 deletions(-) delete mode 100644 docbook-xsl/Makefile delete mode 100644 docbook-xsl/patches/docbook-xsl-list-item-body.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-mandir.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-marginleft.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-newmethods.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch delete mode 100644 docbook-xsl/patches/docbook-xsl-pagesetup.patch diff --git a/docbook-xsl/Makefile b/docbook-xsl/Makefile deleted file mode 100644 index 281656dec..000000000 --- a/docbook-xsl/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -BINDIR = /usr/bin -DESTDIR = ..overridden in spec file.. - -all: install - -install: install-xsl install-img install-extensions install-misc install-epub - -install-xsl: - mkdir -p $(DESTDIR)/{common,eclipse,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,xhtml-1_1,manpages,profiling,highlighting,roundtrip,website} - cp common/*.dtd $(DESTDIR)/common - cp common/*.ent $(DESTDIR)/common - cp common/*.xml $(DESTDIR)/common - cp common/*.xsl $(DESTDIR)/common - cp eclipse/*.xsl $(DESTDIR)/eclipse - cp fo/*.xml $(DESTDIR)/fo - cp fo/*.xsl $(DESTDIR)/fo - cp html/*.xml $(DESTDIR)/html - cp html/*.xsl $(DESTDIR)/html - cp htmlhelp/*.xsl $(DESTDIR)/htmlhelp - cp javahelp/*.xsl $(DESTDIR)/javahelp - cp lib/*.xsl $(DESTDIR)/lib - cp template/*.xsl $(DESTDIR)/template - cp xhtml/*.xsl $(DESTDIR)/xhtml - cp xhtml-1_1/*.xsl $(DESTDIR)/xhtml-1_1 - cp manpages/*.xsl $(DESTDIR)/manpages - cp profiling/*.xsl $(DESTDIR)/profiling - cp highlighting/*.xml $(DESTDIR)/highlighting - cp highlighting/*.xsl $(DESTDIR)/highlighting - cp roundtrip/*.xml $(DESTDIR)/roundtrip - cp roundtrip/*.xsl $(DESTDIR)/roundtrip - cp roundtrip/*.dtd $(DESTDIR)/roundtrip - cp website/*.xsl $(DESTDIR)/website - -install-img: - mkdir -p $(DESTDIR)/images/callouts - cp images/*.gif $(DESTDIR)/images - cp images/*.png $(DESTDIR)/images - cp images/*.svg $(DESTDIR)/images - cp images/callouts/*.png $(DESTDIR)/images/callouts - cp images/callouts/*.gif $(DESTDIR)/images/callouts - cp images/callouts/*.svg $(DESTDIR)/images/callouts - -install-extensions: - mkdir -p $(DESTDIR)/extensions - cp -r extensions/* $(DESTDIR)/extensions - -install-epub: - mkdir -p $(DESTDIR)/epub - cp -r epub/* ${DESTDIR}/epub - -install-misc: - cp VERSION $(DESTDIR) diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm index 028fdc8b6..f3a7a11b2 100644 --- a/docbook-xsl/docbook-xsl.nm +++ b/docbook-xsl/docbook-xsl.nm @@ -4,12 +4,12 @@ ############################################################################### name = docbook-xsl -version = 1.76.1 -release = 3 +version = 1.79.2 +release = 1 arch = noarch groups = Applications/Text -url = http://docbook.sourceforge.net/projects/xsl/ +url = https://docbook.sourceforge.net/projects/xsl/ license = GPLv2+ summary = Norman Walsh's XSL stylesheets for DocBook XML. @@ -18,29 +18,36 @@ description other formats, such as HTML, FO, and XHMTL. They are highly customizable. end -source_dl = http://prdownloads.sourceforge.net/docbook/ +source_dl = https://github.com/docbook/xslt10-stylesheets/releases/download/release/%{version}/ -sources =\ - %{thisapp}.tar.bz2 \ - %{name}-doc-%{version}.tar.bz2 +sources = %{thisapp}.tar.bz2 build - prepare_cmds - cp -av %{DIR_SOURCE}/Makefile %{DIR_APP}/Makefile + build + # Nothing to do. end - build = # empty + install + # Create directory layout. + mkdir -pv %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{version} - make_install_targets +=\ - BINDIR=%{BUILDROOT}/usr/bin \ - DESTDIR=%{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version} + # Install catalog files. + cp -avf [[:lower:]]* %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}/ + cp -avf VERSION %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}/VERSION.xsl + + ln -svf VERSION.xsl \ + %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets-%{version}/VERSION + ln -svf xsl-ns-stylesheets-%{version} \ + %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets + + # Don't ship install shell script. + rm -rvf %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-ns-stylesheets/install.sh - install_cmds # Remove buggy extensions. - rm -rfv %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/extensions/* + rm -rfv %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-stylesheets-%{version}/extensions/* # Remove unneeded tool for .epub formats. - rm -rvf %{BUILDROOT}/usr/share/sgml/docbook/xsl-stylesheets-%{version}/epub + rm -rvf %{BUILDROOT}/%{datadir}/sgml/docbook/xsl-stylesheets-%{version}/epub end end @@ -62,25 +69,33 @@ packages # Install catalog files. /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/%{version}" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog /usr/bin/xmlcatalog --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl/current" \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog + + /usr/bin/xmlcatalog --noout --add "rewriteSystem" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog + + /usr/bin/xmlcatalog --noout --add "rewriteURI" \ + "http://docbook.sourceforge.net/release/xsl-ns/current" \ + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog end script preun # Uninstall catalog files. /usr/bin/xmlcatalog --noout --del \ - "file:///usr/share/sgml/docbook/xsl-stylesheets-%{version}" /etc/xml/catalog + "file:///usr/share/sgml/docbook/xsl-ns-stylesheets-%{version}" /etc/xml/catalog end end end diff --git a/docbook-xsl/patches/docbook-xsl-list-item-body.patch b/docbook-xsl/patches/docbook-xsl-list-item-body.patch deleted file mode 100644 index a3d3819f7..000000000 --- a/docbook-xsl/patches/docbook-xsl-list-item-body.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl ---- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:41:27.000000000 +0200 -@@ -248,9 +248,17 @@ - - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -446,10 +454,18 @@ - - - -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -925,9 +941,17 @@ - - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -951,9 +975,17 @@ - - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -1141,9 +1173,17 @@ - - - -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/docbook-xsl/patches/docbook-xsl-mandir.patch b/docbook-xsl/patches/docbook-xsl-mandir.patch deleted file mode 100644 index d2c5a7e47..000000000 --- a/docbook-xsl/patches/docbook-xsl-mandir.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -urNp docbook-xsl-1.76.1-orig/manpages/other.xsl docbook-xsl-1.76.1/manpages/other.xsl ---- docbook-xsl-1.76.1-orig/manpages/other.xsl 2010-08-27 05:14:52.000000000 +0200 -+++ docbook-xsl-1.76.1/manpages/other.xsl 2011-09-06 17:17:07.973737258 +0200 -@@ -595,7 +595,14 @@ manvolnum - Note: - (soelim stub) - -- -+ -+ -+ -+ -+ -+ -+ -+ - - - diff --git a/docbook-xsl/patches/docbook-xsl-marginleft.patch b/docbook-xsl/patches/docbook-xsl-marginleft.patch deleted file mode 100644 index 31c1b84d2..000000000 --- a/docbook-xsl/patches/docbook-xsl-marginleft.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/lists.xsl docbook-xsl-1.74.0/fo/lists.xsl ---- docbook-xsl-1.74.0.orig/fo/lists.xsl 2008-06-01 23:36:39.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/lists.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -324,7 +324,7 @@ - - - -- -+ - - - -@@ -333,15 +333,7 @@ - - - -- -- -- -- em -- -- -- em * 0.60 -- -- -+ em - - - -@@ -350,15 +342,7 @@ - - - -- -- -- -- em -- -- -- em * 0.60 -- -- -+ em - - - -@@ -372,17 +356,7 @@ - - 1em - -- -- -- -- -- -- -- -- + -- -- -- -+ - - - -diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl ---- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 -@@ -133,8 +133,8 @@ - - always - -- -- -+ -+ - false - - -diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl ---- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 +0200 -+++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200 -@@ -30,16 +30,7 @@ - - - -- -- -- -- -- -- -- - -- -- -- -+ - - - diff --git a/docbook-xsl/patches/docbook-xsl-newmethods.patch b/docbook-xsl/patches/docbook-xsl-newmethods.patch deleted file mode 100644 index debc51ba0..000000000 --- a/docbook-xsl/patches/docbook-xsl-newmethods.patch +++ /dev/null @@ -1,394 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/html/docbook.xsl docbook-xsl-1.74.0/html/docbook.xsl ---- docbook-xsl-1.74.0.orig/html/docbook.xsl 2008-06-01 23:36:39.000000000 +0200 -+++ docbook-xsl-1.74.0/html/docbook.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -26,6 +26,7 @@ - - - -+ - - - -@@ -44,6 +45,7 @@ - - - -+ - - - -diff -ruNp docbook-xsl-1.74.0.orig/html/dtbl.xsl docbook-xsl-1.74.0/html/dtbl.xsl ---- docbook-xsl-1.74.0.orig/html/dtbl.xsl 1970-01-01 01:00:00.000000000 +0100 -+++ docbook-xsl-1.74.0/html/dtbl.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -0,0 +1,293 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ " -+ -+ " is not a known unit. Applying scaling factor of 1 instead. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ entering adjustColumnWidths( -+ -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ total relative widths = ( -+ -+ ) -+ -+ -+ total absolute widths = ( -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ all widths are absolute -+ -+ -+ -+ -+ -+ all widths are relative -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ result = ( -+ -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ first.bad.column = ( -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 1* -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ -+ -+ -+ -+ -+ -+ -+ -+ 0 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -ruNp docbook-xsl-1.74.0.orig/html/table.xsl docbook-xsl-1.74.0/html/table.xsl ---- docbook-xsl-1.74.0.orig/html/table.xsl 2008-06-01 23:36:39.000000000 +0200 -+++ docbook-xsl-1.74.0/html/table.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -5,7 +5,8 @@ - xmlns:xtbl="xalan://com.nwalsh.xalan.Table" - xmlns:lxslt="http://xml.apache.org/xslt" - xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table" -- exclude-result-prefixes="doc stbl xtbl lxslt ptbl" -+ xmlns:dtbl="http://docbook.sourceforge.net/dtbl" -+ exclude-result-prefixes="doc stbl xtbl lxslt ptbl dtbl" - version='1.0'> - - -@@ -365,6 +366,9 @@ - - -+ -+ -+ - - - -@@ -389,6 +393,9 @@ - - -+ -+ -+ - - - -diff -ruNp docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl docbook-xsl-1.74.0/lib/dumpfragment.xsl ---- docbook-xsl-1.74.0.orig/lib/dumpfragment.xsl 1970-01-01 01:00:00.000000000 +0100 -+++ docbook-xsl-1.74.0/lib/dumpfragment.xsl 2008-08-06 13:37:35.000000000 +0200 -@@ -0,0 +1,30 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ =" -+ -+ " -+ -+ -+ -+ < -+ -+ > -+ -+ </ -+ > -+ -+ -+ -diff -urNp docbook-xsl-1.76.0-orig/html/param.xsl docbook-xsl-1.76.0/html/param.xsl ---- docbook-xsl-1.76.0-orig/html/param.xsl 2010-08-31 09:27:22.000000000 +0200 -+++ docbook-xsl-1.76.0/html/param.xsl 2010-09-06 11:01:07.916914161 +0200 -@@ -68,6 +68,7 @@ div.annotation-close { position: absolut - http://docbook.sourceforge.net/release/images/annot-close.png - http://docbook.sourceforge.net/release/images/annot-open.png - -+ - - http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js - diff --git a/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch b/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch deleted file mode 100644 index 0c3f6be74..000000000 --- a/docbook-xsl/patches/docbook-xsl-non-constant-expressions.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl ---- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:38:36.000000000 +0200 -@@ -23,8 +23,8 @@ - always - always - -- -- -+ -+ - false - center - -@@ -334,8 +334,8 @@ set toc,title - bold - always - -- -- -+ -+ - 0pt - - diff --git a/docbook-xsl/patches/docbook-xsl-pagesetup.patch b/docbook-xsl/patches/docbook-xsl-pagesetup.patch deleted file mode 100644 index e4d77ffca..000000000 --- a/docbook-xsl/patches/docbook-xsl-pagesetup.patch +++ /dev/null @@ -1,227 +0,0 @@ -diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl ---- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-06-01 23:36:39.000000000 +0200 -+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200 -@@ -1697,36 +1697,81 @@ - - - -- -- -- proportional-column-width( -- -- header -- -- -- ) -- -- -- -- -- proportional-column-width( -- -- header -- -- -- ) -- -- -- -- -- proportional-column-width( -- -- header -- -- -- ) -- -- -+ -+ -+ -+ -+ -+ header -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ header -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ header -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ header -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ header -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ header -+ -+ -+ ) -+ -+ -+ -+ - - - -@@ -2021,36 +2066,81 @@ - - - -- -- -- proportional-column-width( -- -- footer -- -- -- ) -- -- -- -- -- proportional-column-width( -- -- footer -- -- -- ) -- -- -- -- -- proportional-column-width( -- -- footer -- -- -- ) -- -- -+ -+ -+ -+ -+ -+ footer -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ footer -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ footer -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ footer -+ -+ -+ ) -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ footer -+ -+ -+ % -+ -+ -+ -+ -+ -+ -+ proportional-column-width( -+ -+ footer -+ -+ -+ ) -+ -+ -+ -+ - - - From patchwork Wed Jan 25 20:30:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 6462 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4P2FpK60gxz3xG6 for ; Wed, 25 Jan 2023 20:30:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4P2FpH41h6z3j3; Wed, 25 Jan 2023 20:30:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4P2FpH0jrwz30Gq; Wed, 25 Jan 2023 20:30:31 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4P2FpF6zmwz2xKS for ; Wed, 25 Jan 2023 20:30:29 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4P2FpF4K02zYR; Wed, 25 Jan 2023 20:30:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1674678629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eJxhw3LBtUjk0C6UYFuE8K9bK6Fqp1udTLRQT1bDl/M=; b=QsiuG7iSrrp4W4fn0vPdYmsFZbpY+rX2MHHl7FdaZYWu3/Lu1dFRiPETdrtKu7o5YxJibH hn/k/zfeZ3WBQBCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1674678629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eJxhw3LBtUjk0C6UYFuE8K9bK6Fqp1udTLRQT1bDl/M=; b=OmeuVtHesFWhhhzDZpQiI6DRHJayaqIdf/LB+UCDvIPbzKDz8rsVrAk9HmL1orfZwCM64+ q0wBI/utJccZOa5KE7PxBQ8jz1eTxNOneBhN3NZbvYx0Mguuf0FV8RGYVdmHxTTXdmZrTs t71djqpuiNe7HJ+GCsGmLNfNREXPRnX96GQBGGaSP9X/4X3XaUdzE76thQsaFso0D3i5b3 EP1AesvgrgNdVQVHdmneFOWG5kvuD29YWdz/y8OihVq9lLJgu+Y/u8YO1tdC3LB3wdH75i s7uJPR+HNXD0HVDC7M9unBlZlIKOwZUPeoZ8mlUPY3iqreDddg+c71pLPwG46g== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 2/2] iputils: Generate manpages again. Date: Wed, 25 Jan 2023 21:30:22 +0100 Message-Id: <20230125203022.133803-2-stefan.schantl@ipfire.org> In-Reply-To: <20230125203022.133803-1-stefan.schantl@ipfire.org> References: <20230125203022.133803-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This requires the latest version of the XSL stylesheets. Fixes #13021. Signed-off-by: Stefan Schantl --- iputils/iputils.nm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iputils/iputils.nm b/iputils/iputils.nm index d5ea1b477..5bcab41e9 100644 --- a/iputils/iputils.nm +++ b/iputils/iputils.nm @@ -31,9 +31,9 @@ build meson ninja openssl-devel + docbook-xsl <= 1.79.2 end - # Generate manpages with docbook build %{meson} %{meson_build} @@ -44,10 +44,10 @@ build # Create ping6 as a symlink to ping ln -svf ping %{BUILDROOT}%{bindir}/ping6 - #ln -svf ping.8 %{BUILDROOT}%{mandir}/man/man8/ping6.8 + ln -svf ping.8 %{BUILDROOT}%{mandir}/man8/ping6.8 ln -svf tracepath %{BUILDROOT}%{bindir}/tracepath6 - #ln -svf tracepath.8 %{BUILDROOT}%{mandir}/man/man8/tracepath6.8 + ln -svf tracepath.8 %{BUILDROOT}%{mandir}/man8/tracepath6.8 # This currently does not work in pakfire #setcap cap_net_admin=ep %{BUILDROOT}%{bindir}/ping