|
 |
45fb3d5 |
From 5da08f0aeb4fd4f30c5c4f8aac662d03883bbf1a Mon Sep 17 00:00:00 2001
|
|
|
45fb3d5 |
From: Bastien Nocera <hadess@hadess.net>
|
|
|
45fb3d5 |
Date: Tue, 2 Aug 2022 11:07:49 +0200
|
|
|
45fb3d5 |
Subject: [PATCH 1/3] build: Build against new gcr-4 library
|
|
|
45fb3d5 |
|
|
|
45fb3d5 |
Rather than the old gcr-base-3.
|
|
|
45fb3d5 |
---
|
|
|
45fb3d5 |
gdata/gdata-service.c | 2 +-
|
|
|
45fb3d5 |
meson.build | 6 +++---
|
|
|
45fb3d5 |
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
45fb3d5 |
|
|
|
45fb3d5 |
diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
|
|
|
45fb3d5 |
index 6e1f0d40..a59a23be 100644
|
|
|
45fb3d5 |
--- a/gdata/gdata-service.c
|
|
|
45fb3d5 |
+++ b/gdata/gdata-service.c
|
|
|
45fb3d5 |
@@ -46,7 +46,7 @@
|
|
|
45fb3d5 |
|
|
|
45fb3d5 |
#ifdef HAVE_GNOME
|
|
|
45fb3d5 |
#define GCR_API_SUBJECT_TO_CHANGE
|
|
|
45fb3d5 |
-#include <gcr/gcr-base.h>
|
|
|
45fb3d5 |
+#include <gcr/gcr.h>
|
|
|
45fb3d5 |
#endif /* HAVE_GNOME */
|
|
|
45fb3d5 |
|
|
|
45fb3d5 |
#include "gdata-service.h"
|
|
|
45fb3d5 |
diff --git a/meson.build b/meson.build
|
|
|
45fb3d5 |
index 68eb0b1a..b860afd8 100644
|
|
|
45fb3d5 |
--- a/meson.build
|
|
|
45fb3d5 |
+++ b/meson.build
|
|
|
45fb3d5 |
@@ -107,11 +107,11 @@ gtk_dep = dependency(
|
|
|
45fb3d5 |
not_found_message: 'GTK+ support requested but gtk+-3.0 ' + gtk_dep_req_version + ' could not be found',
|
|
|
45fb3d5 |
)
|
|
|
45fb3d5 |
|
|
|
45fb3d5 |
-# GNOME support, which pulls in gcr-base-3 to provide non-pageable memory
|
|
|
45fb3d5 |
-gcr_dep = dependency('gcr-base-3', required: get_option('gnome'))
|
|
|
45fb3d5 |
+# GNOME support, which pulls in gcr-4 to provide non-pageable memory
|
|
|
45fb3d5 |
+gcr_dep = dependency('gcr-4', required: get_option('gnome'))
|
|
|
45fb3d5 |
enable_gnome = gcr_dep.found()
|
|
|
45fb3d5 |
if enable_gnome
|
|
|
45fb3d5 |
- gdata_private_deps += dependency('gcr-base-3')
|
|
|
45fb3d5 |
+ gdata_private_deps += dependency('gcr-4')
|
|
|
45fb3d5 |
endif
|
|
|
45fb3d5 |
config_h.set('HAVE_GNOME', enable_gnome)
|
|
|
45fb3d5 |
|
|
|
45fb3d5 |
--
|
|
|
45fb3d5 |
GitLab
|