diff --git a/47.patch b/47.patch new file mode 100644 index 0000000..ea3fd7b --- /dev/null +++ b/47.patch @@ -0,0 +1,45 @@ +From 5da08f0aeb4fd4f30c5c4f8aac662d03883bbf1a Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Tue, 2 Aug 2022 11:07:49 +0200 +Subject: [PATCH 1/3] build: Build against new gcr-4 library + +Rather than the old gcr-base-3. +--- + gdata/gdata-service.c | 2 +- + meson.build | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c +index 6e1f0d40..a59a23be 100644 +--- a/gdata/gdata-service.c ++++ b/gdata/gdata-service.c +@@ -46,7 +46,7 @@ + + #ifdef HAVE_GNOME + #define GCR_API_SUBJECT_TO_CHANGE +-#include ++#include + #endif /* HAVE_GNOME */ + + #include "gdata-service.h" +diff --git a/meson.build b/meson.build +index 68eb0b1a..b860afd8 100644 +--- a/meson.build ++++ b/meson.build +@@ -107,11 +107,11 @@ gtk_dep = dependency( + not_found_message: 'GTK+ support requested but gtk+-3.0 ' + gtk_dep_req_version + ' could not be found', + ) + +-# GNOME support, which pulls in gcr-base-3 to provide non-pageable memory +-gcr_dep = dependency('gcr-base-3', required: get_option('gnome')) ++# GNOME support, which pulls in gcr-4 to provide non-pageable memory ++gcr_dep = dependency('gcr-4', required: get_option('gnome')) + enable_gnome = gcr_dep.found() + if enable_gnome +- gdata_private_deps += dependency('gcr-base-3') ++ gdata_private_deps += dependency('gcr-4') + endif + config_h.set('HAVE_GNOME', enable_gnome) + +-- +GitLab diff --git a/libgdata.spec b/libgdata.spec index d749c3d..b28046e 100644 --- a/libgdata.spec +++ b/libgdata.spec @@ -1,12 +1,16 @@ Name: libgdata Version: 0.18.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Library for the GData protocol License: LGPLv2+ URL: https://wiki.gnome.org/Projects/libgdata Source0: https://download.gnome.org/sources/%{name}/0.18/%{name}-%{version}.tar.xz +# https://gitlab.gnome.org/GNOME/libgdata/-/merge_requests/47 +# Build against gcr 4 +Patch0: 47.patch + BuildRequires: gcr-devel BuildRequires: gettext BuildRequires: glib2-devel @@ -88,6 +92,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{_datadir}/vala/ %changelog +* Wed Aug 03 2022 Kalev Lember - 0.18.1-6 +- Build against gcr 4 (thanks Bastien Nocera!) + * Thu Jul 21 2022 Fedora Release Engineering - 0.18.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild