Update to 43.beta
This commit is contained in:
parent
d69db38353
commit
eea1eed24f
@ -1,89 +0,0 @@
|
|||||||
From 30ff4e9f57f7a8f736ffd39cf595fc7893c8d52b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Milan Crha <mcrha@redhat.com>
|
|
||||||
Date: Tue, 19 Jul 2022 17:48:36 +0200
|
|
||||||
Subject: [PATCH] build: Use gcr4 by default, but have an option to use gcr3
|
|
||||||
too
|
|
||||||
|
|
||||||
The gcr4 replaces gcr3, thus make it possible to use either of the two,
|
|
||||||
while defaulting to gcr4, as it'll live for a longer time.
|
|
||||||
---
|
|
||||||
.gitlab-ci.yml | 2 +-
|
|
||||||
meson.build | 7 ++++++-
|
|
||||||
meson_options.txt | 1 +
|
|
||||||
plugins/wwan/gsd-wwan-manager.c | 4 ++++
|
|
||||||
plugins/wwan/meson.build | 2 +-
|
|
||||||
5 files changed, 13 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
|
|
||||||
index dd67d8f4..ae37234d 100644
|
|
||||||
--- a/.gitlab-ci.yml
|
|
||||||
+++ b/.gitlab-ci.yml
|
|
||||||
@@ -87,7 +87,7 @@ stages:
|
|
||||||
.Build procedure: &build_procedure
|
|
||||||
echo "== Building ==" &&
|
|
||||||
rm -rf _build/ &&
|
|
||||||
- meson . _build ${BUILD_OPTS} &&
|
|
||||||
+ meson . _build ${BUILD_OPTS} -Dgcr3=true &&
|
|
||||||
ninja -C _build 2>&1 | tee compilation.log
|
|
||||||
|
|
||||||
.Run Tests: &run_tests
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 3e7cb50d..7f880d75 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -214,7 +214,12 @@ endif
|
|
||||||
# wwan
|
|
||||||
enable_wwan = get_option('wwan')
|
|
||||||
if enable_wwan
|
|
||||||
- gcr_base_dep = dependency('gcr-base-3', version: '>= 3.7.5')
|
|
||||||
+ if get_option('gcr3')
|
|
||||||
+ gcr_dep = dependency('gcr-base-3', version: '>= 3.7.5')
|
|
||||||
+ config_h.set10('HAVE_GCR3', 1)
|
|
||||||
+ else
|
|
||||||
+ gcr_dep = dependency('gcr-4', version: '>= 3.90.0')
|
|
||||||
+ endif
|
|
||||||
mm_glib_dep = dependency('mm-glib', version: '>= 1.0')
|
|
||||||
endif
|
|
||||||
|
|
||||||
diff --git a/meson_options.txt b/meson_options.txt
|
|
||||||
index 3e04cf64..a5eb354f 100644
|
|
||||||
--- a/meson_options.txt
|
|
||||||
+++ b/meson_options.txt
|
|
||||||
@@ -11,4 +11,5 @@ option('smartcard', type: 'boolean', value: true, description: 'build with smart
|
|
||||||
option('usb-protection', type: 'boolean', value: true, description: 'build with usb-protection support')
|
|
||||||
option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
|
|
||||||
option('wwan', type: 'boolean', value: true, description: 'build with WWAN support')
|
|
||||||
+option('gcr3', type: 'boolean', value: false, description: 'build with gcr3, otherwise gcr4 is used')
|
|
||||||
option('colord', type: 'boolean', value: true, description: 'build with colord support')
|
|
||||||
diff --git a/plugins/wwan/gsd-wwan-manager.c b/plugins/wwan/gsd-wwan-manager.c
|
|
||||||
index 42109ef8..c2288375 100644
|
|
||||||
--- a/plugins/wwan/gsd-wwan-manager.c
|
|
||||||
+++ b/plugins/wwan/gsd-wwan-manager.c
|
|
||||||
@@ -31,7 +31,11 @@
|
|
||||||
#include <libmm-glib.h>
|
|
||||||
|
|
||||||
#define GCR_API_SUBJECT_TO_CHANGE
|
|
||||||
+#ifdef HAVE_GCR3
|
|
||||||
#include <gcr/gcr-base.h>
|
|
||||||
+#else
|
|
||||||
+#include <gcr/gcr.h>
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#include "gnome-settings-profile.h"
|
|
||||||
#include "cc-wwan-device.h"
|
|
||||||
diff --git a/plugins/wwan/meson.build b/plugins/wwan/meson.build
|
|
||||||
index 3f117fb3..238288c6 100644
|
|
||||||
--- a/plugins/wwan/meson.build
|
|
||||||
+++ b/plugins/wwan/meson.build
|
|
||||||
@@ -4,7 +4,7 @@ sources = files(
|
|
||||||
'main.c'
|
|
||||||
)
|
|
||||||
|
|
||||||
-deps = plugins_deps + [gio_dep, gcr_base_dep, mm_glib_dep, polkit_gobject_dep]
|
|
||||||
+deps = plugins_deps + [gio_dep, gcr_dep, mm_glib_dep, polkit_gobject_dep]
|
|
||||||
|
|
||||||
cflags += ['-DGNOMECC_DATA_DIR="@0@"'.format(gsd_pkgdatadir)]
|
|
||||||
|
|
||||||
--
|
|
||||||
2.35.1
|
|
||||||
|
|
@ -17,8 +17,8 @@
|
|||||||
%global major_version %%(echo %{version} | cut -f 1 -d '~' | cut -f 1 -d '.')
|
%global major_version %%(echo %{version} | cut -f 1 -d '~' | cut -f 1 -d '.')
|
||||||
|
|
||||||
Name: gnome-settings-daemon
|
Name: gnome-settings-daemon
|
||||||
Version: 43~alpha
|
Version: 43~beta
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
|
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
|
||||||
|
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -26,8 +26,6 @@ URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon
|
|||||||
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz
|
Source0: https://download.gnome.org/sources/%{name}/%{major_version}/%{name}-%{tarball_version}.tar.xz
|
||||||
Source1: org.gnome.settings-daemon.plugins.power.gschema.override
|
Source1: org.gnome.settings-daemon.plugins.power.gschema.override
|
||||||
|
|
||||||
Patch01: 0001-build-Use-gcr4-by-default-but-have-an-option-to-use-.patch
|
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: meson >= 0.49.0
|
BuildRequires: meson >= 0.49.0
|
||||||
@ -203,6 +201,9 @@ install -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
|
|||||||
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
|
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 10 2022 Kalev Lember <klember@redhat.com> - 43~beta-1
|
||||||
|
- Update to 43.beta
|
||||||
|
|
||||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 43~alpha-4
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 43~alpha-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (gnome-settings-daemon-43.alpha.tar.xz) = 2477a1a911292dcd1abc9e6f90ffde6807568de54e675924a7be68f2acdf6bf61cd0e69f1c9b8b38cd132fa8610204444fee4bf1f20773e805b8d0f37253d4e3
|
SHA512 (gnome-settings-daemon-43.beta.tar.xz) = d0e8364f71fe2e3546dcca09b4950c42605d101373d503b11eb3ab5bb5d40c3852716b29bef52fbc758bc263e364bd909a5e8377a188a5d5d60cf246c1f7c8af
|
||||||
|
Loading…
Reference in New Issue
Block a user