forked from OpenIndiana/oi-userland
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
There two ways to generate zziplib man pages and both have their distinct problems. Man page generation via xmlto gets correct man pages (with a docbook-xsl fix) but some man pages are not being generated, plus xmlto way is to be deprecated in the future anyway. The other method is via dbk2man.py but it generates correct amount of man pages but they are broken in the same way xmlto-generated man pages are without the docbook-xsl fix (filed gdraheim/zziplib#56). So, disable `xmlto` and manually fix incorrect man pages via `sed`.
- Loading branch information
Showing
4 changed files
with
25 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
components/archiver/zziplib/patches/03-disable-xmlto.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- zziplib-0.13.69/configure.ac 2018-03-17 13:46:45.000000000 +0000 | ||
+++ zziplib-0.13.69/configure.ac 2018-08-03 07:09:25.865903598 +0000 | ||
@@ -90,7 +90,7 @@ AX_PAX_TAR_EXTRACT | ||
AC_PATH_PROGS(PERL, perl5 perl, echo no perl found for) | ||
AC_PATH_PROGS(PYTHON, python, echo no python found for) | ||
AC_PATH_PROGS(MKZIP, zip pkzip, :) | ||
-AC_PATH_PROGS(XMLTO, xmlto, :) | ||
+AC_PATH_PROGS(XMLTO, :, :) | ||
|
||
AC_C_INLINE | ||
AC_C_CONST |
11 changes: 11 additions & 0 deletions
11
components/archiver/zziplib/patches/04-fix-man-pages.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
--- zziplib-0.13.69/docs/Makefile.am 2018-03-17 13:46:45.000000000 +0000 | ||
+++ zziplib-0.13.69/docs/Makefile.am 2018-08-03 08:44:03.111721716 +0000 | ||
@@ -166,6 +166,8 @@ manpages.tar : zziplib.xml zzipmmapped.x | ||
; mv man3_/man3 man3; rm -r man3_; fi \ | ||
; echo 'chmod 664 man3/*.3' \ | ||
; chmod 664 man3/*.3 \ | ||
+ ; echo "sed -i -e 's@^.so @.so man3/@' man3/*.3" \ | ||
+ ; sed -i -e 's@^.so @.so man3/@' man3/*.3 \ | ||
; echo '$(PAX_TAR_CREATE) "$@" man3/' \ | ||
; $(PAX_TAR_CREATE) "$@" man3/ \ | ||
; echo '$(DELETE); rm man3/*.3 ; rmdir man3' \ |