From 23239e91ae204a2f1679b12b2d5cabbb1ac5b4ea Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Nov 2019 14:41:21 -0500 Subject: [PATCH] import gsettings-desktop-schemas-3.32.0-3.el8 --- .gitignore | 2 +- .gsettings-desktop-schemas.metadata | 2 +- ...hemas-Add-enable-hot-corners-setting.patch | 37 ++++++++++++ ...-storage-devices-as-read-only-option.patch | 34 +++++++++++ ...g.gnome.desktop.interface.gschema.override | 2 + SPECS/gsettings-desktop-schemas.spec | 56 +++++++++++++++---- 6 files changed, 121 insertions(+), 12 deletions(-) create mode 100644 SOURCES/0001-schemas-Add-enable-hot-corners-setting.patch create mode 100644 SOURCES/add-mount-removable-storage-devices-as-read-only-option.patch create mode 100644 SOURCES/org.gnome.desktop.interface.gschema.override diff --git a/.gitignore b/.gitignore index ffd0e26..08f08e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/gsettings-desktop-schemas-3.28.1.tar.xz +SOURCES/gsettings-desktop-schemas-3.32.0.tar.xz diff --git a/.gsettings-desktop-schemas.metadata b/.gsettings-desktop-schemas.metadata index 5bbea18..04517f0 100644 --- a/.gsettings-desktop-schemas.metadata +++ b/.gsettings-desktop-schemas.metadata @@ -1 +1 @@ -18458ea98fa1170b8d71d79107d28252e508c4af SOURCES/gsettings-desktop-schemas-3.28.1.tar.xz +628a2d779ff1cce0574febeff5cfed165de231e5 SOURCES/gsettings-desktop-schemas-3.32.0.tar.xz diff --git a/SOURCES/0001-schemas-Add-enable-hot-corners-setting.patch b/SOURCES/0001-schemas-Add-enable-hot-corners-setting.patch new file mode 100644 index 0000000..29612f9 --- /dev/null +++ b/SOURCES/0001-schemas-Add-enable-hot-corners-setting.patch @@ -0,0 +1,37 @@ +From 1e254151b13dbba244a2c8982c4e160a67f7b41b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Florian=20M=C3=BCllner?= +Date: Thu, 13 Jun 2019 14:40:56 +0000 +Subject: [PATCH] schemas: Add 'enable-hot-corners' setting + +Whether people love or hate gnome-shell's hot corner depends to large +extents on hardware sensitivity and habits, which is hard to get right +universally. So bite the bullet and add an option to enable or disable +hot corners ... + +https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/merge_requests/26 +--- + schemas/org.gnome.desktop.interface.gschema.xml.in | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/schemas/org.gnome.desktop.interface.gschema.xml.in b/schemas/org.gnome.desktop.interface.gschema.xml.in +index 22ef50d..1e47888 100644 +--- a/schemas/org.gnome.desktop.interface.gschema.xml.in ++++ b/schemas/org.gnome.desktop.interface.gschema.xml.in +@@ -228,6 +228,14 @@ + If true, display weekday in the clock, in addition to time. + + ++ ++ true ++ Enable hot corners ++ ++ If true, the activities overview can be accessed by moving the ++ mouse to the top-left corner. ++ ++ + + false + Show battery percentage +-- +2.21.0 + diff --git a/SOURCES/add-mount-removable-storage-devices-as-read-only-option.patch b/SOURCES/add-mount-removable-storage-devices-as-read-only-option.patch new file mode 100644 index 0000000..2f333a9 --- /dev/null +++ b/SOURCES/add-mount-removable-storage-devices-as-read-only-option.patch @@ -0,0 +1,34 @@ +From 1dec88b007a13860ae8da33687fe4d496053ec98 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy +Date: Tue, 14 May 2019 08:12:59 +0200 +Subject: [PATCH] schemas: Add "mount-removable-storage-devices-as-read-only" + option + +Add lockdown option to prevent users from writing or modifying files +on removable storage devices. If enabled, gvfs is going to mount removable +storage devices (i.e. flashdisks, mobile phones, cameras) as read-only. +--- + schemas/org.gnome.desktop.lockdown.gschema.xml.in | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/schemas/org.gnome.desktop.lockdown.gschema.xml.in b/schemas/org.gnome.desktop.lockdown.gschema.xml.in +index 0150b32..d31fb77 100644 +--- a/schemas/org.gnome.desktop.lockdown.gschema.xml.in ++++ b/schemas/org.gnome.desktop.lockdown.gschema.xml.in +@@ -71,5 +71,13 @@ + and removing users, as well as changing other users settings. + + ++ ++ false ++ Mount removable storage devices as read-only ++ ++ Prevent users from writing or modifying files on removable storage ++ devices (i.e. flash disks, mobile phones, cameras). ++ ++ + + +-- +2.21.0 + diff --git a/SOURCES/org.gnome.desktop.interface.gschema.override b/SOURCES/org.gnome.desktop.interface.gschema.override new file mode 100644 index 0000000..f474a79 --- /dev/null +++ b/SOURCES/org.gnome.desktop.interface.gschema.override @@ -0,0 +1,2 @@ +[org.gnome.desktop.interface] +monospace-font-name='Monospace 11' diff --git a/SPECS/gsettings-desktop-schemas.spec b/SPECS/gsettings-desktop-schemas.spec index 24d4202..8602a09 100644 --- a/SPECS/gsettings-desktop-schemas.spec +++ b/SPECS/gsettings-desktop-schemas.spec @@ -1,18 +1,25 @@ %global debug_package %{nil} Name: gsettings-desktop-schemas -Version: 3.28.1 -Release: 1%{?dist} +Version: 3.32.0 +Release: 3%{?dist} Summary: A collection of GSettings schemas License: LGPLv2+ # no homepage exists for this component URL: http://bugzilla.gnome.org/enter_bug.cgi?product=gsettings-desktop-schemas -Source0: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz +Source1: org.gnome.desktop.interface.gschema.override -BuildRequires: glib2-devel >= 2.31.0 -BuildRequires: intltool -BuildRequires: gobject-introspection-devel +# https://bugzilla.redhat.com/show_bug.cgi?id=1709937 +Patch0: add-mount-removable-storage-devices-as-read-only-option.patch +# Backport from 3.33.1 +Patch1: 0001-schemas-Add-enable-hot-corners-setting.patch + +BuildRequires: gettext +BuildRequires: glib2-devel >= 2.31.0 +BuildRequires: gobject-introspection-devel +BuildRequires: meson # Older versions need the "scroll-method" key that was removed in 3.19.3 Conflicts: control-center < 1:3.19.3 @@ -21,10 +28,15 @@ Conflicts: mutter < 3.19.3 Requires: glib2 >= 2.31.0 +# Recommend the default fonts set in the schemas +Recommends: font(cantarell) +Recommends: font(sourcecodepro) + %description gsettings-desktop-schemas contains a collection of GSettings schemas for settings shared by various components of a desktop. + %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -35,20 +47,28 @@ and header files for developing applications that use %{name}. %prep -%setup -q +%autosetup -p1 %build -%configure --disable-schemas-compile --enable-introspection=yes -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install + +# Restore old monospace default +cp -a %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas %find_lang %{name} --with-gnome +%check +# Test that the schemas compile +glib-compile-schemas --dry-run --strict $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas + + %files -f %{name}.lang %doc AUTHORS MAINTAINERS NEWS README %license COPYING @@ -65,6 +85,22 @@ make %{?_smp_mflags} %changelog +* Tue Jul 23 2019 Florian Müllner - 3.32-0-3 +- Backport 'enable-hot-corners' setting + Resolves: #1704355 + +* Tue Jun 04 2019 Florian Müllner - 3.32.0-2 +- Restore previous monospace font default + Resolves: #1715761 + +* Thu May 23 2019 Florian Müllner - 3.32.0-1 +- Update to 3.32.0 + Resolves: #1698930 + +* Wed May 15 2019 Ondrej Holy - 3.28.1-2 +- Add mount-removable-storage-devices-as-read-only option +- Resovles: #1709937 + * Tue Sep 04 2018 Kalev Lember - 3.28.1-1 - Update to 3.28.1