Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] p11-kit: remove glib-devel from makedepends
@ 2021-06-09 12:10 sgn
  2021-06-09 15:28 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 1 reply; 2+ messages in thread
From: sgn @ 2021-06-09 12:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/sgn/void-packages p11-kit-not-need-glib
https://github.com/void-linux/void-packages/pull/31378

p11-kit: remove glib-devel from makedepends
Breake this circular:
elfutils > libmicrohttpd
   ^               v
p11-kit < glib < gnutls

<!-- 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/31378.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-p11-kit-not-need-glib-31378.patch --]
[-- Type: text/x-diff, Size: 2132 bytes --]

From 0eb4daa04c28835482b80132c23d6eab6f66617d 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 19:07:44 +0700
Subject: [PATCH] p11-kit: remove glib-devel from makedepends

Breake this circular:
elfutils > libmicrohttpd
   ^               v
p11-kit < glib < gnutls
---
 srcpkgs/p11-kit/patches/we-know-glib-prefix.patch | 13 +++++++++++++
 srcpkgs/p11-kit/template                          |  3 +--
 2 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/p11-kit/patches/we-know-glib-prefix.patch

diff --git a/srcpkgs/p11-kit/patches/we-know-glib-prefix.patch b/srcpkgs/p11-kit/patches/we-know-glib-prefix.patch
new file mode 100644
index 000000000000..4586dbe9effc
--- /dev/null
+++ b/srcpkgs/p11-kit/patches/we-know-glib-prefix.patch
@@ -0,0 +1,13 @@
+Index: p11-kit-0.23.22/doc/manual/meson.build
+===================================================================
+--- p11-kit-0.23.22.orig/doc/manual/meson.build
++++ p11-kit-0.23.22/doc/manual/meson.build
+@@ -60,7 +60,7 @@ if get_option('gtk_doc')
+     'annotation-glossary.xml'
+   ]
+ 
+-  glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
++  glib_prefix = '/usr'
+   fixxref_args = [
+     '--html-dir=' + (prefix / gnome.gtkdoc_html_dir(meson.project_name())),
+     '--extra-dir=' + (glib_prefix / gnome.gtkdoc_html_dir('glib')),
diff --git a/srcpkgs/p11-kit/template b/srcpkgs/p11-kit/template
index 65291fecc026..9947a2ec6567 100644
--- a/srcpkgs/p11-kit/template
+++ b/srcpkgs/p11-kit/template
@@ -7,8 +7,7 @@ configure_args="-Dlibffi=enabled -Dsystemd=disabled -Dbash_completion=disabled
  -Dgtk_doc=true -Dman=true -Dnls=true -Dtrust_module=enabled
  -Dtrust_paths=/etc/ssl/certs/ca-certificates.crt"
 hostmakedepends="pkg-config gettext gtk-doc libxslt libtasn1-tools"
-# glib-devel for gtk-doc
-makedepends="libtasn1-devel libffi-devel glib-devel"
+makedepends="libtasn1-devel libffi-devel"
 short_desc="Provides a way to load and enumerate PKCS#11 modules"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-06-09 15:28 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-09 12:10 [PR PATCH] p11-kit: remove glib-devel from makedepends sgn
2021-06-09 15:28 ` [PR PATCH] [Merged]: " sgn

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