Skip to content

Commit c619f9d

Browse files
authored
Add patch to gcr allowing meson to build (#13951)
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
1 parent f091002 commit c619f9d

2 files changed

Lines changed: 41 additions & 1 deletion

File tree

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
diff --git a/gck/meson.build b/gck/meson.build
2+
index 756b486..a21a1e9 100644
3+
--- a/gck/meson.build
4+
+++ b/gck/meson.build
5+
@@ -131,7 +131,6 @@ if get_option('introspection')
6+
sources: gck_gir_sources,
7+
namespace: 'Gck',
8+
nsversion: '@0@'.format(gck_major_version),
9+
- packages: gck_deps,
10+
export_packages: 'gck-@0@'.format(gck_major_version),
11+
includes: [ 'GObject-2.0', 'Gio-2.0' ],
12+
header: 'gck/gck.h',
13+
diff --git a/gcr/meson.build b/gcr/meson.build
14+
index 06c3a63..f998336 100644
15+
--- a/gcr/meson.build
16+
+++ b/gcr/meson.build
17+
@@ -189,7 +189,6 @@ if get_option('introspection')
18+
sources: [ gcr_base_public_sources, gcr_base_headers ],
19+
namespace: 'Gcr',
20+
nsversion: '@0@'.format(gcr_major_version),
21+
- packages: gcr_base_deps,
22+
export_packages: 'gcr-base-@0@'.format(gcr_major_version),
23+
includes: [
24+
'GObject-2.0',
25+
diff --git a/ui/meson.build b/ui/meson.build
26+
index 477412d..d93c0ef 100644
27+
--- a/ui/meson.build
28+
+++ b/ui/meson.build
29+
@@ -153,7 +153,6 @@ if get_option('introspection')
30+
export_packages: 'gcr-ui-@0@'.format(gcr_major_version),
31+
identifier_prefix: 'Gcr',
32+
symbol_prefix: 'gcr',
33+
- packages: gcr_ui_deps,
34+
includes: [
35+
'GObject-2.0',
36+
'Gio-2.0',

SPECS-EXTENDED/gcr/gcr.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ Distribution: Azure Linux
88

99
Name: gcr
1010
Version: 3.38.1
11-
Release: 1%{?dist}
11+
Release: 2%{?dist}
1212
Summary: A library for bits of crypto UI and parsing
1313

1414
License: GPLv2
1515
URL: https://wiki.gnome.org/Projects/CryptoGlue
1616
Source0: https://download.gnome.org/sources/%{name}/%{majmin}/%{name}-%{version}.tar.xz
17+
Patch0: fix-meson-packages-build-keyword.patch
1718

1819
BuildRequires: gettext
1920
BuildRequires: gtk-doc
@@ -115,6 +116,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
115116
%{_libdir}/libgcr-base-3.so.*
116117

117118
%changelog
119+
* Tue Jun 03 2025 Andy Zaugg <azaugg@linkedin.com> - 3.38.1-2
120+
- Fix meson syntax to allow gcr to compile
121+
118122
* Mon Dec 30 2024 Pawel Winogrodzki <pawelwi@microsoft.com> - 3.38.1-1
119123
- Bump to 3.38.1 to fix missing OID header bug (GCR issue #48).
120124

0 commit comments

Comments
 (0)