Github messages for voidlinux
 help / color / mirror / Atom feed
From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] curl: use mdocml instead of groff to build manual
Date: Wed, 09 Jun 2021 13:21:55 +0200
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31376@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1914 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages curl-no-groff
https://github.com/void-linux/void-packages/pull/31376

curl: use mdocml instead of groff to build manual
Break circular dependencies:
elfutils > curl > groff > ghostscript
 ^                         v
glib < p11-kit < gnutls < cups

Technically, it's not necessary to bump revision, since diffoscope
reports same contents.

Fix: 10985815eb, (groff: obtain devpdf fonts from ghostscript, 2021-05-25)

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/31376.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-curl-no-groff-31376.patch --]
[-- Type: text/x-diff, Size: 2087 bytes --]

From 261575a30ebe63fc9f4bd467d91a06111be92958 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 9 Jun 2021 18:21:06 +0700
Subject: [PATCH] curl: use mdocml instead of groff to build manual

Break circular dependencies:
elfutils > curl > groff > ghostscript
 ^                         v
glib < p11-kit < gnutls < cups

Technically, it's not necessary to bump revision, since diffoscope
reports same contents.

Fix: 10985815eb, (groff: obtain devpdf fonts from ghostscript, 2021-05-25)
---
 srcpkgs/curl/template | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index 46a1388c000c..8f9026309bfe 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,20 +1,23 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.77.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="ac_cv_sizeof_off_t=8 --enable-threaded-resolver --enable-ipv6
  $(vopt_with rtmp) $(vopt_with gssapi) $(vopt_enable ldap) $(vopt_with gnutls)
  $(vopt_enable ldap ldaps) $(vopt_with ssh libssh2) $(vopt_with ssl) $(vopt_with zstd)
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2"
-hostmakedepends="groff perl pkg-config"
+ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --without-libidn2
+ ac_cv_path_NROFF=/usr/bin/mandoc"
+# Use mdocml instead of groff to generate builtin manual to avoid cyclic
+# dependencies.
+hostmakedepends="perl pkg-config mdocml"
 makedepends="nghttp2-devel zlib-devel $(vopt_if gnutls 'gnutls-devel')
  $(vopt_if gssapi 'mit-krb5-devel') $(vopt_if ldap 'libldap-devel')
  $(vopt_if rtmp 'librtmp-devel') $(vopt_if ssh 'libssh2-devel')
  $(vopt_if ssl 'openssl-devel') $(vopt_if zstd 'libzstd-devel')"
 depends="ca-certificates"
 # openssh isn't in checkdepends, because test 581 locks up
-checkdepends="perl python3 stunnel nghttp2 groff"
+checkdepends="python3 stunnel nghttp2"
 short_desc="Client that groks URLs"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

             reply	other threads:[~2021-06-09 11:21 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-09 11:21 sgn [this message]
2021-06-09 15:30 ` [PR PATCH] [Merged]: " sgn

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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31376@inbox.vuxu.org \
    --to=sgn@users.noreply.github.com \
    --cc=ml@inbox.vuxu.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

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git