1 |
commit: b38043e8e56bc7ceeee547fcb5c9dbf0a713f28a |
2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 7 15:23:23 2022 +0000 |
4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 7 15:32:51 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b38043e8 |
7 |
|
8 |
app-crypt/gcr: Version bump to 3.41.0 |
9 |
|
10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
11 |
|
12 |
app-crypt/gcr/Manifest | 1 + |
13 |
.../gcr-3.41.0-Unbreak-build-without-systemd.patch | 27 +++++++ |
14 |
app-crypt/gcr/gcr-3.41.0.ebuild | 89 ++++++++++++++++++++++ |
15 |
3 files changed, 117 insertions(+) |
16 |
|
17 |
diff --git a/app-crypt/gcr/Manifest b/app-crypt/gcr/Manifest |
18 |
index cc0e9da4b4eb..c24bb8c5bd97 100644 |
19 |
--- a/app-crypt/gcr/Manifest |
20 |
+++ b/app-crypt/gcr/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST gcr-3.40.0.tar.xz 1011044 BLAKE2B 6b1016f74e5fd3ace32a534a59575db9c39b5deefd2f4f3a747ef7e87a43c7c00b33500d8151009347af9fe6b073c390895bb6e17c577c6e150c780c487b997e SHA512 7118608e7bef7d0cf2eea33cb3286b7f9c3622a38892ce88cf33ed453d343cc33e070831e7b4d0c5cdb43c2e57b3f0b91c7cbd6aa8463982d3af8844b59bcb81 |
23 |
+DIST gcr-3.41.0.tar.xz 1039744 BLAKE2B c646a04168310051d5b582a9d2f7ab9da89eef095e856e56b8d730600debead051ad8bb40eddb7457b1be2be3e092227dd886f647258a9c6a81d4bab728245f7 SHA512 455acc40ed77feeb35f9845b00229f468b322b7eda0b1b5abb0153f0a6ba29f3d0364df22225143f4caf130254a1258b3c7f934370e5142f2f64e1c3084b6f6e |
24 |
|
25 |
diff --git a/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch |
26 |
new file mode 100644 |
27 |
index 000000000000..eac12c0a34a2 |
28 |
--- /dev/null |
29 |
+++ b/app-crypt/gcr/files/gcr-3.41.0-Unbreak-build-without-systemd.patch |
30 |
@@ -0,0 +1,27 @@ |
31 |
+From 96e76ee482dad2a0d71f9a5a5a6558d272d538ca Mon Sep 17 00:00:00 2001 |
32 |
+From: Antoine Jacoutot <ajacoutot@×××××.org> |
33 |
+Date: Sun, 24 Oct 2021 10:26:03 +0200 |
34 |
+Subject: [PATCH] Unbreak build without systemd. |
35 |
+ |
36 |
+This fixes the check for WITH_SYSTEMD and prevents a fatal error: |
37 |
+'systemd/sd-daemon.h' file not found when building with systemd disabled. |
38 |
+--- |
39 |
+ gcr/gcr-ssh-agent-service.c | 2 +- |
40 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
41 |
+ |
42 |
+diff --git a/gcr/gcr-ssh-agent-service.c b/gcr/gcr-ssh-agent-service.c |
43 |
+index 3b5a4ca..b7e8928 100644 |
44 |
+--- a/gcr/gcr-ssh-agent-service.c |
45 |
++++ b/gcr/gcr-ssh-agent-service.c |
46 |
+@@ -39,7 +39,7 @@ |
47 |
+ #include <glib/gstdio.h> |
48 |
+ #include <gcr/gcr-base.h> |
49 |
+ |
50 |
+-#ifdef WITH_SYSTEMD |
51 |
++#if WITH_SYSTEMD |
52 |
+ #include <systemd/sd-daemon.h> |
53 |
+ #endif |
54 |
+ |
55 |
+-- |
56 |
+2.35.1 |
57 |
+ |
58 |
|
59 |
diff --git a/app-crypt/gcr/gcr-3.41.0.ebuild b/app-crypt/gcr/gcr-3.41.0.ebuild |
60 |
new file mode 100644 |
61 |
index 000000000000..6a5988f3730b |
62 |
--- /dev/null |
63 |
+++ b/app-crypt/gcr/gcr-3.41.0.ebuild |
64 |
@@ -0,0 +1,89 @@ |
65 |
+# Copyright 1999-2022 Gentoo Authors |
66 |
+# Distributed under the terms of the GNU General Public License v2 |
67 |
+ |
68 |
+EAPI=8 |
69 |
+PYTHON_COMPAT=( python3_{8..10} ) |
70 |
+ |
71 |
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg |
72 |
+ |
73 |
+DESCRIPTION="Libraries for cryptographic UIs and accessing PKCS#11 modules" |
74 |
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gcr" |
75 |
+ |
76 |
+LICENSE="GPL-2+ LGPL-2+" |
77 |
+SLOT="0/1" # subslot = suffix of libgcr-base-3 and co |
78 |
+ |
79 |
+IUSE="gtk gtk-doc +introspection systemd test +vala" |
80 |
+REQUIRED_USE="vala? ( introspection )" |
81 |
+RESTRICT="!test? ( test )" |
82 |
+ |
83 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" |
84 |
+ |
85 |
+DEPEND=" |
86 |
+ >=dev-libs/glib-2.44.0:2 |
87 |
+ >=dev-libs/libgcrypt-1.2.2:0= |
88 |
+ >=app-crypt/p11-kit-0.19.0 |
89 |
+ >=app-crypt/libsecret-0.20 |
90 |
+ systemd? ( sys-apps/systemd:= ) |
91 |
+ gtk? ( >=x11-libs/gtk+-3.22:3[introspection?] ) |
92 |
+ >=sys-apps/dbus-1 |
93 |
+ introspection? ( >=dev-libs/gobject-introspection-1.58:= ) |
94 |
+" |
95 |
+RDEPEND="${DEPEND}" |
96 |
+PDEPEND="app-crypt/gnupg" |
97 |
+BDEPEND=" |
98 |
+ ${PYTHON_DEPS} |
99 |
+ gtk? ( dev-libs/libxml2:2 ) |
100 |
+ dev-util/gdbus-codegen |
101 |
+ dev-util/glib-utils |
102 |
+ gtk-doc? ( |
103 |
+ >=dev-util/gtk-doc-1.9 |
104 |
+ app-text/docbook-xml-dtd:4.1.2 |
105 |
+ ) |
106 |
+ >=sys-devel/gettext-0.19.8 |
107 |
+ test? ( app-crypt/gnupg ) |
108 |
+ virtual/pkgconfig |
109 |
+ vala? ( $(vala_depend) ) |
110 |
+" |
111 |
+ |
112 |
+PATCHES=( |
113 |
+ "${FILESDIR}"/3.38.0-optional-vapi.patch |
114 |
+ "${FILESDIR}"/${PN}-3.40.0-meson-0.61-build.patch |
115 |
+ "${FILESDIR}"/${P}-Unbreak-build-without-systemd.patch |
116 |
+) |
117 |
+ |
118 |
+pkg_setup() { |
119 |
+ python-any-r1_pkg_setup |
120 |
+} |
121 |
+ |
122 |
+src_prepare() { |
123 |
+ default |
124 |
+ use vala && vala_setup |
125 |
+ xdg_environment_reset |
126 |
+} |
127 |
+ |
128 |
+src_configure() { |
129 |
+ local emesonargs=( |
130 |
+ $(meson_use introspection) |
131 |
+ $(meson_use gtk) |
132 |
+ $(meson_use gtk-doc gtk_doc) |
133 |
+ -Dgpg_path="${EPREFIX}"/usr/bin/gpg |
134 |
+ -Dssh_agent=true |
135 |
+ $(meson_feature systemd) |
136 |
+ $(meson_use vala vapi) |
137 |
+ ) |
138 |
+ meson_src_configure |
139 |
+} |
140 |
+ |
141 |
+src_test() { |
142 |
+ dbus-run-session meson test -C "${BUILD_DIR}" || die 'tests failed' |
143 |
+} |
144 |
+ |
145 |
+pkg_postinst() { |
146 |
+ xdg_pkg_postinst |
147 |
+ gnome2_schemas_update |
148 |
+} |
149 |
+ |
150 |
+pkg_postrm() { |
151 |
+ xdg_pkg_postrm |
152 |
+ gnome2_schemas_update |
153 |
+} |