[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated (96caeae8b -> 62d08e3b8)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [gnunet] branch master updated (96caeae8b -> 62d08e3b8) |
|
Date: |
Tue, 26 Sep 2017 17:03:14 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a change to branch master
in repository gnunet.
from 96caeae8b remove debug logic
new 72e116bbf contrib/packages/guix: use texinfo-5.2 for some packages.
Start backporting Texlive-2012.
new 504c048c9 doc: Remove some control characters.
new 708243c5c some more changes in doc.
new 62d08e3b8 Merge branch 'master' of gnunet.org:gnunet
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
contrib/packages/guix/gnunet-doc.scm | 44 +++--
contrib/packages/guix/guix-env.scm | 2 +-
.../guix/packages/gnunet/packages/texlive.scm | 182 +++++++++++++++++++++
doc/Makefile.am | 101 +++++++-----
doc/chapters/developer.texi | 5 +-
doc/chapters/installation.texi | 2 +-
doc/{ => images}/structure.dot | 0
7 files changed, 277 insertions(+), 59 deletions(-)
create mode 100644 contrib/packages/guix/packages/gnunet/packages/texlive.scm
rename doc/{ => images}/structure.dot (100%)
diff --git a/contrib/packages/guix/gnunet-doc.scm
b/contrib/packages/guix/gnunet-doc.scm
index 9b3293a17..a988e1125 100644
--- a/contrib/packages/guix/gnunet-doc.scm
+++ b/contrib/packages/guix/gnunet-doc.scm
@@ -46,6 +46,7 @@
(gnu packages gstreamer)
(gnu packages gtk)
(gnu packages guile)
+ (gnu packages graphviz)
(gnu packages image)
(gnu packages image-viewers)
(gnu packages libidn)
@@ -64,6 +65,7 @@
(gnu packages video)
(gnu packages web)
(gnu packages xiph)
+ ;;(gnunet packages texlive) ;GNUnet module including texlive-2012 WIP
((guix licenses) #:prefix license:))
(define %source-dir (string-append (current-source-directory)
@@ -115,13 +117,14 @@
("bluez" ,bluez) ; for optional bluetooth feature
("glib" ,glib)
;;("texlive-minimal" ,texlive-minimal) ; optional.
- ("texlive" ,texlive)
+ ("texlive" ,texlive) ;TODO: Stabilize Texlive-2012 package
("libogg" ,libogg)))
(native-inputs
`(("pkg-config" ,pkg-config)
("autoconf" ,autoconf)
("automake" ,automake)
("gnu-gettext" ,gnu-gettext)
+ ("graphviz" ,graphviz) ; dot
("texinfo-5" ,texinfo-5) ; Debian stable
("libtool" ,libtool)))
(arguments
@@ -140,22 +143,29 @@
(chdir "doc")
(zero? (system* "make" "doc-all-give-me-the-noise"))))
(replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
- (doc (string-append out "/share/doc/gnunet")))
- (mkdir-p doc)
- (mkdir-p (string-append doc "/gnunet"))
- (install-file "gnunet.pdf" doc)
- (install-file "gnunet.info" doc)
- (copy-recursively "gnunet"
- (string-append doc
- "/gnunet"))
- (install-file "gnunet-c-tutorial.pdf" doc)
- (install-file "gnunet-c-tutorial.info" doc)
- (copy-recursively "gnunet-c-tutorial"
- (string-append doc
- "/gnunet-c-tutorial")))
- #t)))))
+ (lambda _
+ (zero? (system* "make" "doc-all-install")))))))
+ ;;(lambda* (#:key outputs #:allow-other-keys)
+ ;; (let* ((out (assoc-ref outputs "out"))
+ ;; (doc (string-append out "/share/doc/gnunet")))
+ ;; (mkdir-p doc)
+ ;; (copy-recursively "images"
+ ;; (string-append doc
+ ;; "/images"))
+ ;; (mkdir-p (string-append doc "/gnunet"))
+ ;; (install-file "gnunet.pdf" doc)
+ ;; (install-file "gnunet.info" doc)
+ ;; (install-file "gnunet.log" doc) ;TODO: Move to 'dev'
output?
+ ;; (copy-recursively "gnunet"
+ ;; (string-append doc
+ ;; "/gnunet"))
+ ;; (install-file "gnunet-c-tutorial.pdf" doc)
+ ;; (install-file "gnunet-c-tutorial.info" doc)
+ ;; (install-file "gnunet-c-tutorial.log" doc) ;TODO: Move to
'dev' output?
+ ;; (copy-recursively "gnunet-c-tutorial"
+ ;; (string-append doc
+ ;; "/gnunet-c-tutorial")))
+ ;; #t)))))
(synopsis "Documentation of GNUnet")
(description
"GNUnet documentation build")
diff --git a/contrib/packages/guix/guix-env.scm
b/contrib/packages/guix/guix-env.scm
index 6946fee57..1182eb08d 100644
--- a/contrib/packages/guix/guix-env.scm
+++ b/contrib/packages/guix/guix-env.scm
@@ -146,7 +146,7 @@
("autoconf" ,autoconf)
("automake" ,automake)
("gnu-gettext" ,gnu-gettext)
- ("texinfo" ,texinfo)
+ ("texinfo" ,texinfo-5.2) ; Debian stable.
("libtool" ,libtool)))
;; TODO: To make use of out:debug, which carries the symbols,
;; this file needs to fixed.
diff --git a/contrib/packages/guix/packages/gnunet/packages/texlive.scm
b/contrib/packages/guix/packages/gnunet/packages/texlive.scm
new file mode 100644
index 000000000..65430d693
--- /dev/null
+++ b/contrib/packages/guix/packages/gnunet/packages/texlive.scm
@@ -0,0 +1,182 @@
+;;; This file is part of GNUnet.
+;;; Copyright (C) 2017 GNUnet e.V.
+;;;
+;;; GNUnet is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation; either version 3, or (at your
+;;; option) any later version.
+;;;
+;;; GNUnet is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+;;; General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNUnet; see the file COPYING. If not, write to the
+;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;; Boston, MA 02110-1301, USA.
+
+;; Initially based on Guix commit eb0119efde826590a13973ab928c173780a7f257
+
+(define-module (gnunet packages texlive)
+ #:use-module ((guix licenses)
+ #:renamer (symbol-prefix-proc 'license:))
+ #:use-module (guix packages)
+ #:use-module (guix download)
+ #:use-module (guix build-system gnu)
+ #:use-module (gnu packages)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages icu4c)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages pdf)
+ #:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages compression))
+
+(define texlive-extra-src
+ (origin
+ (method url-fetch)
+ (uri
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2012/texlive-20120701-extra.tar.xz";)
+ ;;(uri
"ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-extra.tar.xz";)
+ (sha256 (base32
+ "0cb8fnv4x281gy5ka779f00ssdmdpjj4x3pkh9j9vq45hrwg3522"))))
+
+(define texlive-texmf-src
+ (origin
+ (method url-fetch)
+ (uri
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2012/texlive-20120701-texmf.tar.xz";)
+ ;;(uri
"ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-texmf.tar.xz";)
+ (sha256 (base32
+ "1fn1dg9k7pnh8a80j23zfkbrfnqyc4c2w4ss30dpkqj490nxsywq"))))
+
+;; Note that right now this does not include security fixes!
+;; FIXME: Needs more fixes, currently this fails building!
+
+(define-public texlive
+ (package
+ (name "texlive")
+ (version "2012")
+ (source (origin
+ (method url-fetch)
+ (uri
"http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2012/texlive-20120701-source.tar.xz";)
+ ;;(uri
"ftp://tug.org/historic/systems/texlive/2012/texlive-20120701-source.tar.xz";)
+ (sha256 (base32
+
"10bcrdfsqnc6y3gqcb8ndnjy07i5kz63as39irbq4gmcbmyn2rln"))))
+ (build-system gnu-build-system)
+ (inputs `(("texlive-extra-src" ,texlive-extra-src)
+ ("texlive-texmf-src" ,texlive-texmf-src)
+ ("fontconfig" ,fontconfig)
+ ("freetype" ,freetype)
+ ("icu4c" ,icu4c)
+ ("ghostscript" ,ghostscript)
+ ("libpng" ,libpng)
+ ("perl" ,perl)
+ ("poppler" ,poppler)
+ ("pkg-config" ,pkg-config)
+ ;; FIXME: Add interpreters csh, fontforge and ruby,
+ ;; once they are available.
+ ("python" ,python)
+ ("teckit" ,teckit)
+ ("t1lib" ,t1lib)
+ ("zlib" ,zlib)
+ ("zziplib" ,zziplib)))
+ (outputs '("out" "data"))
+ (arguments
+ `(#:out-of-source? #t
+ #:configure-flags
+ `("--disable-native-texlive-build"
+ ;; Although the texmf and texmf-dist data is taken from
+ ;; texlive-texmf, setting datarootdir is still useful:
+ ;; "make install" creates symbolic links to scripts in this place.
+ ,(string-append "--datarootdir=" (assoc-ref %outputs "data"))
+ ,(string-append "--infodir=" (assoc-ref %outputs "out") "/share/info")
+ ,(string-append "--mandir=" (assoc-ref %outputs "out") "/share/man")
+ "--without-x" ; FIXME: Drop as soon as X is available.
+ "--with-system-freetype2"
+ ;; "--with-system-gd"
+ ;; "--with-system-graphite"
+ "--with-system-icu"
+ "--with-system-libgs"
+ "--with-system-libpng"
+ "--with-system-poppler"
+ "--with-system-t1lib"
+ "--with-system-teckit"
+ "--with-system-xpdf"
+ "--with-system-zlib"
+ "--with-system-zziplib")
+ #:phases
+ (alist-replace
+ 'configure
+ (lambda* (#:key outputs #:allow-other-keys #:rest args)
+ (let ((configure (assoc-ref %standard-phases 'configure)))
+ (substitute* "utils/psutils/Makefile.in"
+ (("/usr/bin/env perl") (which "perl")))
+ (apply configure args)))
+ (alist-cons-after
+ 'install 'postinst
+ (lambda* (#:key inputs outputs #:allow-other-keys #:rest args)
+ (let ((texlive-extra (assoc-ref inputs "texlive-extra-src"))
+ (texlive-texmf (assoc-ref inputs "texlive-texmf-src"))
+ (out (assoc-ref outputs "out"))
+ (data (assoc-ref outputs "data"))
+ (unpack (assoc-ref %standard-phases 'unpack))
+ (patch-source-shebangs
+ (assoc-ref %standard-phases 'patch-source-shebangs)))
+ ;; Create symbolic links for the latex variants and their
+ ;; man pages.
+ (with-directory-excursion (string-append out "/bin/")
+ (for-each symlink
+ '("pdftex" "pdftex" "xetex" "luatex")
+ '("latex" "pdflatex" "xelatex" "lualatex")))
+ (with-directory-excursion (string-append out "/share/man/man1/")
+ (symlink "luatex.1" "lualatex.1"))
+ ;; Delete texmf and texmf-dist from "data", since they
+ ;; will be reinstalled from texlive-texmf.
+ (system* "rm" "-r" (string-append data "/texmf"))
+ (system* "rm" "-r" (string-append data "/texmf-dist"))
+ ;; Unpack texlive-extra and install tlpkg.
+ (mkdir "texlive-extra")
+ (with-directory-excursion "texlive-extra"
+ (apply unpack (list #:source texlive-extra))
+ (apply patch-source-shebangs (list #:source texlive-extra))
+ (system* "mv" "tlpkg" data)
+ (chdir ".."))
+ ;; Unpack and install texlive-texmf.
+ (mkdir "texlive-texmf")
+ (with-directory-excursion "texlive-texmf"
+ (apply unpack (list #:source texlive-texmf))
+ (apply patch-source-shebangs (list #:source texlive-texmf))
+ ;; Register "data" for kpathsea in texmf.cnf.
+ (substitute* "texmf/web2c/texmf.cnf"
+ (("TEXMFROOT = \\$SELFAUTOPARENT")
+ (string-append "TEXMFROOT = " data)))
+ (system* "mv" "texmf" data)
+ (system* "mv" "texmf-dist" data)
+ (chdir ".."))
+ ;; texmf.cnf must also be placed in "out", since kpsewhich does
+ ;; not know about "data" until it has found this file.
+ (mkdir (string-append out "/share/texmf"))
+ (mkdir (string-append out "/share/texmf/web2c"))
+ (copy-file (string-append data "/texmf/web2c/texmf.cnf")
+ (string-append out "/share/texmf/web2c/texmf.cnf"))))
+ (alist-cons-after 'patch-shebangs 'texconfig
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; Configure the texlive system; inspired from
+ ;;
http://slackbuilds.org/repository/13.37/office/texlive/
+ (setenv "PATH" (string-append (getenv "PATH")
":" out "/bin"))
+ (system* "updmap-sys" "--nohash"
"--syncwithtrees")
+ (system* "mktexlsr")
+ (system* "fmtutil-sys" "--all")))
+ %standard-phases)))))
+ (synopsis "Tex Live, a package of the TeX typesetting system")
+ (description
+ "TeX Live provides a comprehensive TeX document production system.
+It includes all the major TeX-related programs, macro packages, and fonts
+that are free software, including support for many languages around the
+world.")
+ (license (license:fsf-free "http://tug.org/texlive/copying.html";))
+ (home-page "http://www.tug.org/texlive/";)))
diff --git a/doc/Makefile.am b/doc/Makefile.am
index ee735f171..cbb5fb462 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -5,39 +5,42 @@ docdir = $(datadir)/doc/gnunet/
infoimagedir = $(infodir)/images
-dist_infoimage_DATA = \
- images/gnunet-gtk-0-10-gns-a-done.png \
- images/gnunet-gtk-0-10-gns-a.png \
- images/daemon_lego_block.png \
- images/gnunet-gtk-0-10-gns.png \
- images/gnunet-0-10-peerinfo.png \
- images/gnunet-gtk-0-10-identity.png \
- images/gnunet-fs-gtk-0-10-star-tab.png \
- images/gnunet-gtk-0-10.png \
- images/gnunet-gtk-0-10-download-area.png \
- images/gnunet-gtk-0-10-search-selected.png \
- images/gnunet-gtk-0-10-fs-menu.png \
- images/gnunet-gtk-0-10-traffic.png \
- images/gnunet-gtk-0-10-fs.png \
- images/gnunet-namestore-gtk-phone.png \
- images/gnunet-gtk-0-10-fs-publish-editing.png \
- images/gnunet-namestore-gtk-vpn.png \
- images/gnunet-gtk-0-10-fs-published.png \
- images/gnunet-setup-exit.png \
- images/gnunet-gtk-0-10-fs-publish.png \
- images/iceweasel-preferences.png \
- images/gnunet-gtk-0-10-fs-publish-select.png \
- images/iceweasel-proxy.png \
- images/gnunet-gtk-0-10-fs-publish-with-file_0.png \
- images/service_lego_block.png \
- images/gnunet-gtk-0-10-fs-publish-with-file.png \
- images/service_stack.png \
- images/gnunet-gtk-0-10-fs-search.png \
- images/gnunet-tutorial-service.png \
- images/gnunet-tutorial-system.png \
- images/daemon_lego_block.svg \
- images/lego_stack.svg \
- images/service_lego_block.svg
+DOT_FILES = images/$(wildcard *.dot)
+
+DOT_VECTOR_GRAPHICS =
\
+ $(DOT_FILES:%.dot=%.eps)
\
+ $(DOT_FILES:%.dot=%.pdf)
+
+dist_infoimage_DATA =
\
+ images/$(wildcard *.png)
\
+ images/$(wildcard *.svg)
\
+ $(DOT_FILES:%.dot=%.png)
+
+DOT_OPTIONS =
\
+ -Gratio=.9 -Gnodesep=.005 -Granksep=.00005
\
+ -Nfontsite=9 -Nheight=.1 -Nwidth=.1
+
+.dot.png:
+ $(AM_V_DOT)$(DOT) -Tpng $(DOT_OPTIONS) < "$<" >
"$(srcdir)/address@hidden"; \
+ mv "$(srcdir)/address@hidden" "$(srcdir)/$@"
+
+.dot.pdf:
+ $(AM_V_DOT)$(DOT) -Tpdf $(DOT_OPTIONS) < "$<" >
"$(srcdir)/address@hidden"; \
+ mv "$(srcdir)/address@hidden" "$(srcdir)/$@"
+
+.dot.eps:
+ $(AM_V_DOT)$(DOT) -Teps $(DOT_OPTIONS) < "$<" >
"$(srcdir)/address@hidden"; \
+ mv "$(srcdir)/address@hidden" "$(srcdir)/$@"
+
+.png.eps:
+ $(AM_V_GEN)convert "$<" "address@hidden"; \
+ mv "address@hidden" "$@"
+
+pdf-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.pdf)
+info-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.png)
+ps-local: $(DOT_FILES=%.dot=$(top_srcdir)/%.eps) \
+ $(top_srcdir)/%D%/images/coreutils-size-map.eps
+dvi-local: ps-local
gnunet_tutorial_examples = \
001.c \
@@ -83,11 +86,13 @@ gnunet_TEXINFOS = \
fdl-1.3.texi \
gpl-3.0.texi
-EXTRA_DIST = \
- $(gnunet_TEXINFOS) \
- $(gnunet_tutorial_examples) \
- outdated-and-old-installation-instructions.txt \
- gnunet-c-tutorial-v1.pdf \
+EXTRA_DIST =
\
+ $(gnunet_TEXINFOS)
\
+ $(gnunet_tutorial_examples)
\
+ $(DOT_FILES)
\
+ $(DOT_VECTOR_GRAPHICS)
\
+ outdated-and-old-installation-instructions.txt
\
+ gnunet-c-tutorial-v1.pdf
\
README.txt
daemon_lego_block.png: images/daemon_lego_block.svg
@@ -146,4 +151,24 @@ doc-info-tutorial-noise: version.texi
doc-all-give-me-the-noise: doc-pdf-noise doc-html-noise doc-info-noise
doc-pdf-tutorial-noise doc-html-tutorial-noise doc-info-tutorial-noise
+doc-all-install: doc-all-give-me-the-noise
+ @mkdir -p $(DESTDIR)/$(docdir)
+ @mkdir -p $(DESTDIR)/$(infoimagedir)
+ @mkdir -p $(DESTDIR)/$(infodir)
+ @install -m 0755 gnunet.pdf $(DESTDIR)/$(docdir)
+ @install -m 0755 gnunet-c-tutorial.pdf $(DESTDIR)/$(docdir)
+ @install -m 0755 gnunet-c-tutorial.info $(DESTDIR)/$(infodir)
+ @install -m 0755 gnunet.info $(DESTDIR)/$(infodir)
+ @cp -r gnunet $(DESTDIR)/$(docdir)
+ @cp -r gnunet-c-tutorial $(DESTDIR)/$(docdir)
+ @cp -r images $(DESTDIR)/$(infoimagedir)
+
+CLEANFILES = \
+ gnunet.log \
+ gnunet-c-tutorial.log \
+ $(wildcard *.aux) \
+ $(wildcard *.toc) \
+ $(wildcard *.cp) \
+ $(wildcard *.cps)
+
.PHONY: version.texi
diff --git a/doc/chapters/developer.texi b/doc/chapters/developer.texi
index e7f507746..f5493fd63 100644
--- a/doc/chapters/developer.texi
+++ b/doc/chapters/developer.texi
@@ -7261,13 +7261,14 @@ the research report.
@subsubsection Namespace Advertisements
@c %**end of header
address@hidden %**FIXME: all zeroses -> ?
-An @code{SBlock} with identifier â²all zerosâ² is a signed
+An @code{SBlock} with identifier all zeros is a signed
advertisement for a namespace. This special @code{SBlock} contains metadata
describing the content of the namespace. Instead of the name of the identifier
for a potential update, it contains the identifier for the root of the
namespace. The URI should always be empty. The @code{SBlock} is signed with
-the content provderâ²s RSA private key (just like any other SBlock). Peers
+the content provder's RSA private key (just like any other SBlock). Peers
can search for @code{SBlock}s in order to find out more about a namespace.
@node KSBlocks
diff --git a/doc/chapters/installation.texi b/doc/chapters/installation.texi
index edbad84de..14c10d2b0 100644
--- a/doc/chapters/installation.texi
+++ b/doc/chapters/installation.texi
@@ -1687,7 +1687,7 @@ dlltool --input-def ../include/libmySQL.def --dllname
libmysql.dll
Copy include\* to include\mysql\
@item
- Pass "--with-mysql=/c/mysql" to ./configure and copy libmysql.dll to your
PATH or GNUnetâ²s bin\ directory
+ Pass "--with-mysql=/c/mysql" to ./configure and copy libmysql.dll to your
PATH or GNUnet's @file{bin} directory
@end itemize
diff --git a/doc/structure.dot b/doc/images/structure.dot
similarity index 100%
rename from doc/structure.dot
rename to doc/images/structure.dot
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (96caeae8b -> 62d08e3b8),
gnunet <=