From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/, app-doc/devmanual/files/
Date: Sun, 23 Jun 2019 18:10:59 +0000 (UTC) [thread overview]
Message-ID: <1561313400.e88a07653f941c6326cce8d45fccb654eaeab1d1.ulm@gentoo> (raw)
commit: e88a07653f941c6326cce8d45fccb654eaeab1d1
Author: Lucas Ramage <ramage.lucas <AT> protonmail <DOT> com>
AuthorDate: Sat Jan 5 23:34:05 2019 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 18:10:00 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e88a0765
app-doc/devmanual: Fix assets for offline browsing
Closes: https://bugs.gentoo.org/617724
Closes: https://github.com/gentoo/gentoo/pull/10974
Signed-off-by: Lucas Ramage <ramage.lucas <AT> protonmail.com>
[sed tweaks converted to patch]
Package-Manager: Portage-2.3.67, Repoman-2.3.15
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-doc/devmanual/devmanual-9999.ebuild | 13 +++--
app-doc/devmanual/files/devmanual-fallback.patch | 60 ++++++++++++++++++++++++
app-doc/devmanual/metadata.xml | 3 ++
3 files changed, 72 insertions(+), 4 deletions(-)
diff --git a/app-doc/devmanual/devmanual-9999.ebuild b/app-doc/devmanual/devmanual-9999.ebuild
index b71b4782005..8ad5f06a357 100644
--- a/app-doc/devmanual/devmanual-9999.ebuild
+++ b/app-doc/devmanual/devmanual-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit readme.gentoo-r1
@@ -10,7 +10,7 @@ HOMEPAGE="https://devmanual.gentoo.org/"
if [[ ${PV} == *9999 ]]; then
inherit git-r3
- EGIT_REPO_URI="git://anongit.gentoo.org/proj/devmanual.git"
+ EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/devmanual.git"
else
SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
@@ -18,11 +18,16 @@ fi
LICENSE="CC-BY-SA-3.0"
SLOT="0"
-IUSE=""
+IUSE="+fallback"
-DEPEND="dev-libs/libxslt
+BDEPEND="dev-libs/libxslt
media-gfx/imagemagick[truetype,svg,png]"
+src_prepare() {
+ default
+ use fallback && eapply "${FILESDIR}"/${PN}-fallback.patch
+}
+
src_compile() {
# Imagemagick uses inkscape (if present) to delegate
# svg conversions.
diff --git a/app-doc/devmanual/files/devmanual-fallback.patch b/app-doc/devmanual/files/devmanual-fallback.patch
new file mode 100644
index 00000000000..789451d13b2
--- /dev/null
+++ b/app-doc/devmanual/files/devmanual-fallback.patch
@@ -0,0 +1,60 @@
+Fix assets for offline browsing.
+https://bugs.gentoo.org/617724
+
+--- a/devbook.xsl
++++ b/devbook.xsl
+@@ -439,11 +439,9 @@
+ <xsl:with-param name="append">../</xsl:with-param>
+ </xsl:call-template>
+ </xsl:variable>
+- <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
++ <link rel="stylesheet" href="{$relative_path_depth_recursion}fallback.css" type="text/css" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." />
+- <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" />
+- <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen" />
+ <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" />
+ </head>
+ <body>
+@@ -476,9 +474,6 @@
+ </div>
+ <div class="logo">
+ <a href="/" title="Back to the homepage" class="site-logo">
+- <object data="https://assets.gentoo.org/tyrian/site-logo.svg" type="image/svg+xml">
+- <img src="https://assets.gentoo.org/tyrian/site-logo.png" alt="Gentoo Linux Logo" />
+- </object>
+ </a>
+ <span class="site-label">Development Guide</span>
+ </div>
+@@ -566,8 +561,6 @@
+ </div>
+ </div>
+ </footer>
+- <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
+- <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
+ </body>
+ </html>
+ </xsl:template>
+--- /dev/null
++++ b/fallback.css
+@@ -0,0 +1,20 @@
++body {
++ margin: 40px auto;
++ max-width: 650px;
++ line-height: 1.6;
++ font-size: 18px;
++ color: #454545;
++ padding: 0 10px;
++}
++
++h1,h2,h3,h4,h5,h6 {
++ line-height: 1.2;
++}
++
++.divider,
++.footerlinks,
++.navbar-toggle,
++.site-title,
++.tyrian-navbar {
++ display: none;
++}
diff --git a/app-doc/devmanual/metadata.xml b/app-doc/devmanual/metadata.xml
index 182bdeb954f..6179f643632 100644
--- a/app-doc/devmanual/metadata.xml
+++ b/app-doc/devmanual/metadata.xml
@@ -12,4 +12,7 @@
devmanual@gentoo.org
</description>
</maintainer>
+ <use>
+ <flag name="fallback">Use alternative minimal stylesheet instead of tyrian theme.</flag>
+ </use>
</pkgmetadata>
next reply other threads:[~2019-06-23 18:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-23 18:10 Ulrich Müller [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-01-27 21:21 [gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/, app-doc/devmanual/files/ Ulrich Müller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1561313400.e88a07653f941c6326cce8d45fccb654eaeab1d1.ulm@gentoo \
--to=ulm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox