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?= 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 " license="BSD-3-Clause"