Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (157adedc341b379c1aaf3b53473bcc6736b8b128)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ismael Luceno (157adedc341b379c1aaf3b53473bcc6736b8b128)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (157adedc341b379c1aaf3b53473bcc6736b8b128)
  • Date: Fri, 16 Jul 2021 19:53:44 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

latex/latex-mk/HISTORY | 5
latex/latex-mk/PRE_BUILD | 4
latex/latex-mk/patches/fix-documentation.patch | 31 +++
latex/latex-mk/patches/new-nomencl.patch | 29 +++
latex/latex-mk/patches/use-fancyhdr.patch | 197
+++++++++++++++++++++++++
net/xinetd/BUILD | 9 +
net/xinetd/DEPENDS | 6
net/xinetd/HISTORY | 3
net/xinetd/PRE_BUILD | 2
9 files changed, 284 insertions(+), 2 deletions(-)

New commits:
commit 157adedc341b379c1aaf3b53473bcc6736b8b128
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

xinetd: Fix build against musl

Requires libtirpc.

commit 3a119603d3cc54032bfcaec67019be66b095c989
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

latex-mk: Fix build with newer texlive & texinfo

commit 5d33f120e87c6a18d9380804908ea51ecb4489a3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

latex-mk: Fix build against musl

diff --git a/latex/latex-mk/HISTORY b/latex/latex-mk/HISTORY
index 54e21e3..8146f43 100644
--- a/latex/latex-mk/HISTORY
+++ b/latex/latex-mk/HISTORY
@@ -1,3 +1,8 @@
+2021-07-16 Ismael Luceno <ismael AT sourcemage.org>
+ * PRE_BUILD: Fixed build against musl
+ * patches/fix-documentation.patch, patches/new-nomencl.patch,
+ patches/use-fancyhdr.patch: Fixed build with newer texlive & texinfo
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/latex/latex-mk/PRE_BUILD b/latex/latex-mk/PRE_BUILD
new file mode 100755
index 0000000..49ddb90
--- /dev/null
+++ b/latex/latex-mk/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub
diff --git a/latex/latex-mk/patches/fix-documentation.patch
b/latex/latex-mk/patches/fix-documentation.patch
new file mode 100644
index 0000000..c4b24f7
--- /dev/null
+++ b/latex/latex-mk/patches/fix-documentation.patch
@@ -0,0 +1,31 @@
+From: Christoph Biedl <debian.axhn AT manchmal.in-ulm.de>
+Subject: Fix error when creating the documentation
+Date: Wed, 21 Dec 2016 02:02:44 +0100
+
+Reported-by: Martin Michlmayr <tbm AT hpe.com>
+Ref: https://bugs.debian.org/790534
+Origin: Debian
+
+---
+ doc/latex-mk.texi | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/doc/latex-mk.texi
++++ b/doc/latex-mk.texi
+@@ -3,7 +3,6 @@
+ @c %**start of header
+ @setfilename latex-mk.info
+ @settitle LaTeX-Mk
+-@setcontentsaftertitlepage
+ @c %**end of header
+
+ @include version.texi
+@@ -133,7 +132,7 @@
+ @end menu
+
+ @page
+-@c @contents
++@contents
+
+ @node Introduction, Targets, Top, Top
+ @chapter Introduction
diff --git a/latex/latex-mk/patches/new-nomencl.patch
b/latex/latex-mk/patches/new-nomencl.patch
new file mode 100644
index 0000000..9154c65
--- /dev/null
+++ b/latex/latex-mk/patches/new-nomencl.patch
@@ -0,0 +1,29 @@
+From: Rafael Laboissiere <rafael AT debian.org>
+Subject: Make one of the tests work with a recent version of nomencl.sty
+
+Origin: Debian
+
+---
+ testsuite/texfiles/nomencl.tex | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/testsuite/texfiles/nomencl.tex
++++ b/testsuite/texfiles/nomencl.tex
+@@ -14,7 +14,7 @@
+ \rhead{Doc with Nomenclatures}
+ \usepackage{hyperref}
+
+-\makeglossary
++\makenomenclature
+
+ \begin{document}
+ \maketitle
+@@ -27,7 +27,7 @@
+ \nomenclature{$m$}{Mass}%
+ \nomenclature{$c$}{Speed of light}%
+
+-\printglossary
++\printnomenclature
+
+ \end{document}
+
diff --git a/latex/latex-mk/patches/use-fancyhdr.patch
b/latex/latex-mk/patches/use-fancyhdr.patch
new file mode 100644
index 0000000..5c6043c
--- /dev/null
+++ b/latex/latex-mk/patches/use-fancyhdr.patch
@@ -0,0 +1,197 @@
+From: Rafael Laboissiere <rafael AT debian.org>
+Subject: Use fancyhdr.sty instead of fancyheadings.sty
+ fancyheadings.sty cannot be found in TeXLive
+
+Origin: Debian
+
+---
+ example/ex2.tex | 2 +-
+ example/ex3.tex | 2 +-
+ example/ex4.tex | 2 +-
+ example/ex5.tex | 2 +-
+ example/example.tex | 2 +-
+ testsuite/texfiles/bibliography.tex | 2 +-
+ testsuite/texfiles/bibliography2.tex | 2 +-
+ testsuite/texfiles/index.tex | 2 +-
+ testsuite/texfiles/nomencl.tex | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/example/ex2.tex
++++ b/example/ex2.tex
+@@ -8,7 +8,7 @@
+ \date{\today}
+
+ \usepackage{graphicx}
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Notes on Sleep}
+ \usepackage{hyperref}
+--- a/example/ex3.tex
+ example/ex2.tex | 2 +-
+ example/ex3.tex | 2 +-
+ example/ex4.tex | 2 +-
+ example/ex5.tex | 2 +-
+ example/example.tex | 2 +-
+ testsuite/texfiles/bibliography.tex | 2 +-
+ testsuite/texfiles/bibliography2.tex | 2 +-
+ testsuite/texfiles/index.tex | 2 +-
+ testsuite/texfiles/nomencl.tex | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/example/ex3.tex
+@@ -7,7 +7,7 @@
+ \author{Anonymous}
+ \date{\today}
+
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{RE: LaTeX-Mk}
+ \usepackage{hyperref}
+--- a/example/ex4.tex
+ example/ex2.tex | 2 +-
+ example/ex3.tex | 2 +-
+ example/ex4.tex | 2 +-
+ example/ex5.tex | 2 +-
+ example/example.tex | 2 +-
+ testsuite/texfiles/bibliography.tex | 2 +-
+ testsuite/texfiles/bibliography2.tex | 2 +-
+ testsuite/texfiles/index.tex | 2 +-
+ testsuite/texfiles/nomencl.tex | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/example/ex4.tex
+@@ -7,7 +7,7 @@
+ \author{Someone}
+ \date{\today}
+
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Unreferenced Notes}
+ \usepackage{hyperref}
+--- a/example/ex5.tex
+ example/ex2.tex | 2 +-
+ example/ex3.tex | 2 +-
+ example/ex4.tex | 2 +-
+ example/ex5.tex | 2 +-
+ example/example.tex | 2 +-
+ testsuite/texfiles/bibliography.tex | 2 +-
+ testsuite/texfiles/bibliography2.tex | 2 +-
+ testsuite/texfiles/index.tex | 2 +-
+ testsuite/texfiles/nomencl.tex | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/example/ex5.tex
+@@ -9,7 +9,7 @@
+ \author{Someone}
+ \date{\today}
+
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Indexed Doc}
+ \usepackage{hyperref}
+--- a/example/example.tex
+ example/ex2.tex | 2 +-
+ example/ex3.tex | 2 +-
+ example/ex4.tex | 2 +-
+ example/ex5.tex | 2 +-
+ example/example.tex | 2 +-
+ testsuite/texfiles/bibliography.tex | 2 +-
+ testsuite/texfiles/bibliography2.tex | 2 +-
+ testsuite/texfiles/index.tex | 2 +-
+ testsuite/texfiles/nomencl.tex | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/example/example.tex
+@@ -8,7 +8,7 @@
+ \date{\today}
+
+ \usepackage{graphicx}
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Notes on Sleep}
+ \usepackage{hyperref}
+--- a/testsuite/texfiles/bibliography2.tex
+ example/ex2.tex | 2 +-
+ example/ex3.tex | 2 +-
+ example/ex4.tex | 2 +-
+ example/ex5.tex | 2 +-
+ example/example.tex | 2 +-
+ testsuite/texfiles/bibliography.tex | 2 +-
+ testsuite/texfiles/bibliography2.tex | 2 +-
+ testsuite/texfiles/index.tex | 2 +-
+ testsuite/texfiles/nomencl.tex | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/testsuite/texfiles/bibliography2.tex
+@@ -9,7 +9,7 @@
+ \author{Dan}
+ \date{\today}
+
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Referenced Notes}
+ \usepackage{hyperref}
+--- a/testsuite/texfiles/bibliography.tex
+ example/ex2.tex | 2 +-
+ example/ex3.tex | 2 +-
+ example/ex4.tex | 2 +-
+ example/ex5.tex | 2 +-
+ example/example.tex | 2 +-
+ testsuite/texfiles/bibliography.tex | 2 +-
+ testsuite/texfiles/bibliography2.tex | 2 +-
+ testsuite/texfiles/index.tex | 2 +-
+ testsuite/texfiles/nomencl.tex | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/testsuite/texfiles/bibliography.tex
+@@ -7,7 +7,7 @@
+ \author{Dan}
+ \date{\today}
+
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Referenced Notes}
+ \usepackage{hyperref}
+--- a/testsuite/texfiles/index.tex
+ example/ex2.tex | 2 +-
+ example/ex3.tex | 2 +-
+ example/ex4.tex | 2 +-
+ example/ex5.tex | 2 +-
+ example/example.tex | 2 +-
+ testsuite/texfiles/bibliography.tex | 2 +-
+ testsuite/texfiles/bibliography2.tex | 2 +-
+ testsuite/texfiles/index.tex | 2 +-
+ testsuite/texfiles/nomencl.tex | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/testsuite/texfiles/index.tex
+@@ -9,7 +9,7 @@
+ \author{Dan}
+ \date{\today}
+
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Indexed Doc}
+ \usepackage{hyperref}
+--- a/testsuite/texfiles/nomencl.tex
+ example/ex2.tex | 2 +-
+ example/ex3.tex | 2 +-
+ example/ex4.tex | 2 +-
+ example/ex5.tex | 2 +-
+ example/example.tex | 2 +-
+ testsuite/texfiles/bibliography.tex | 2 +-
+ testsuite/texfiles/bibliography2.tex | 2 +-
+ testsuite/texfiles/index.tex | 2 +-
+ testsuite/texfiles/nomencl.tex | 2 +-
+ 9 files changed, 9 insertions(+), 9 deletions(-)
++++ b/testsuite/texfiles/nomencl.tex
+@@ -9,7 +9,7 @@
+ \author{Dan}
+ \date{\today}
+
+-\usepackage{fancyheadings}
++\usepackage{fancyhdr}
+ \pagestyle{fancy}
+ \rhead{Doc with Nomenclatures}
+ \usepackage{hyperref}
diff --git a/net/xinetd/BUILD b/net/xinetd/BUILD
index 87f2e17..c58882b 100755
--- a/net/xinetd/BUILD
+++ b/net/xinetd/BUILD
@@ -1,4 +1,11 @@
-export LIBS=$LDFLAGS && # Makes stripping work
+case "$HOST" in
+ (*-musl)
+ CFLAGS+=" $(pkg-config libtirpc --cflags)" &&
+ LIBS+=" $(pkg-config libtirpc --libs)" &&
+ OPTS+=' xinetd_cv_type_rlim_t=yes'
+esac &&
+LIBS+=" $LDFLAGS" && # Makes stripping work
+export LIBS &&

OPTS="$XINETD_IPV6 \
$XINETD_LOADAVG \
diff --git a/net/xinetd/DEPENDS b/net/xinetd/DEPENDS
index 6bc3731..b14a51b 100755
--- a/net/xinetd/DEPENDS
+++ b/net/xinetd/DEPENDS
@@ -1,3 +1,9 @@
+case "$HOST" in
+ (*-musl)
+ depends pkgconfig &&
+ depends libtirpc
+ ;;
+esac &&
depends SYSTEM-LOGGER &&

optional_depends tcp_wrappers \
diff --git a/net/xinetd/HISTORY b/net/xinetd/HISTORY
index e36025e..79ed9b9 100644
--- a/net/xinetd/HISTORY
+++ b/net/xinetd/HISTORY
@@ -1,3 +1,6 @@
+2021-07-16 Ismael Luceno <ismael AT sourcemage.org>
+ * BUILD, DEPENDS, PRE_BUILD: Fixed build against musl
+
2016-05-05 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated mirror to ftp.sourcemage.us

diff --git a/net/xinetd/PRE_BUILD b/net/xinetd/PRE_BUILD
index b462536..e26a0a4 100755
--- a/net/xinetd/PRE_BUILD
+++ b/net/xinetd/PRE_BUILD
@@ -1,4 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
+sedit 's!maybe_os in$!& linux-musl*|\\!' config.sub &&
patch -p1 < "$SPELL_DIRECTORY/tcpmux.patch"


  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (157adedc341b379c1aaf3b53473bcc6736b8b128), Ismael Luceno, 07/16/2021

Archive powered by MHonArc 2.6.24.

Top of Page