rpms
/
mate-settings-daemon
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to 1.20.1

This commit is contained in:
raveit65 2018-04-06 12:53:27 +02:00
parent 3d045a577d
commit 578fd6c3af
4 changed files with 20 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -38,3 +38,4 @@
/mate-settings-daemon-1.19.0.tar.xz
/mate-settings-daemon-1.19.1.tar.xz
/mate-settings-daemon-1.19.2.tar.xz
/mate-settings-daemon-1.20.1.tar.xz

43
mate-settings-daemon.spec
View File

@ -2,7 +2,7 @@
%global rel_build 1
# This is needed, because src-url contains branched part of versioning-scheme.
%global branch 1.19
%global branch 1.20
# Settings used for build from snapshots.
%{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921}
@ -13,7 +13,7 @@
%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
Name: mate-settings-daemon
Version: %{branch}.2
Version: %{branch}.1
%if 0%{?rel_build}
Release: 1%{?dist}
%else
@ -30,7 +30,9 @@ URL: http://mate-desktop.org
%{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
# fix rhbz (#1140329)
%if 0%{?rhel}
Patch1: mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
%endif
BuildRequires: dbus-glib-devel
BuildRequires: dconf-devel
@ -44,7 +46,7 @@ BuildRequires: libSM-devel
BuildRequires: libXxf86misc-devel
BuildRequires: mate-common
BuildRequires: mate-desktop-devel
BuildRequires: mate-polkit-devel
BuildRequires: polkit-devel
BuildRequires: nss-devel
BuildRequires: pulseaudio-libs-devel
@ -67,10 +69,10 @@ various parameters of a MATE session and the applications that run
under it.
%prep
%setup -q%{!?rel_build:n %{name}-%{commit}}
%if 0%{?rhel}
%patch1 -p1 -b .xrdb
%if 0%{?rel_build}
%autosetup -p1
%else
%autosetup -n %{name}-%{commit} -p1
%endif
%if 0%{?rel_build}
@ -101,24 +103,8 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/mate-settings-dae
%find_lang %{name} --with-gnome --all-name
%post
/sbin/ldconfig
/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
/bin/touch --no-create %{_datadir}/hicolor/mate &> /dev/null || :
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
/usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{name}.lang
@ -148,6 +134,13 @@ fi
%changelog
* Fri Apr 06 2018 Wolfgang Ulbrich <fedora@raveit.de> - 1.20.1-1
- update to 1.20.1
- drop IconCache scriptlets
- drop GSettings Schema rpm scriplet
- switch to autosetup
- use BR polkit-devel instead of mate-polkit-devel
* Thu Jan 25 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.19.2-1
- update to 1.19.2

95
mate-settings-daemon_0001-Fix-big-fonts-by-default-with-org.mate.desktop.font-.patch
View File

@ -1,95 +0,0 @@
From 788babedafaf59d8b7a36cb0ef3b0b1f0e5f732c Mon Sep 17 00:00:00 2001
From: Pablo Barciela <scow@riseup.net>
Date: Sat, 2 Dec 2017 01:15:07 +0100
Subject: [PATCH] Fix: big fonts by default with
"org.mate.desktop.font-rendering.dpi"
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1517547
---
.../a11y-keyboard/msd-a11y-preferences-dialog.c | 27 +++++-----------------
plugins/xsettings/msd-xsettings-manager.c | 24 ++++---------------
2 files changed, 11 insertions(+), 40 deletions(-)
diff --git a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
index 2dedd56..165d5b0 100644
--- a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
+++ b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
@@ -29,6 +29,7 @@
#include <glib/gi18n.h>
#include <glib-object.h>
#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
#include <dbus/dbus-glib.h>
@@ -177,27 +178,11 @@ get_dpi_from_x_server (void)
if (screen != NULL) {
double width_dpi;
double height_dpi;
- gint sc_width;
- gint sc_height;
-#if GTK_CHECK_VERSION (3, 22, 0)
- GdkDisplay *display;
- GdkMonitor *monitor;
-
-
- display = gdk_screen_get_display (screen);
- monitor = gdk_display_get_primary_monitor (display);
-#endif
-
- gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL,
- &sc_width, &sc_height);
-
-#if GTK_CHECK_VERSION (3, 22, 0)
- width_dpi = dpi_from_pixels_and_mm (sc_width, gdk_monitor_get_width_mm (monitor));
- height_dpi = dpi_from_pixels_and_mm (sc_height, gdk_monitor_get_height_mm (monitor));
-#else
- width_dpi = dpi_from_pixels_and_mm (sc_width, gdk_screen_get_width_mm (screen));
- height_dpi = dpi_from_pixels_and_mm (sc_height, gdk_screen_get_height_mm (screen));
-#endif
+
+ Screen *xscreen = gdk_x11_screen_get_xscreen (screen);
+
+ width_dpi = dpi_from_pixels_and_mm (WidthOfScreen (xscreen), WidthMMOfScreen (xscreen));
+ height_dpi = dpi_from_pixels_and_mm (HeightOfScreen (xscreen), HeightMMOfScreen (xscreen));
if (width_dpi < DPI_LOW_REASONABLE_VALUE
|| width_dpi > DPI_HIGH_REASONABLE_VALUE
diff --git a/plugins/xsettings/msd-xsettings-manager.c b/plugins/xsettings/msd-xsettings-manager.c
index a548dd4..a9635a8 100644
--- a/plugins/xsettings/msd-xsettings-manager.c
+++ b/plugins/xsettings/msd-xsettings-manager.c
@@ -237,25 +237,11 @@ get_dpi_from_x_server (void)
screen = gdk_screen_get_default ();
if (screen != NULL) {
double width_dpi, height_dpi;
- gint sc_width, sc_height;
-#if GTK_CHECK_VERSION (3, 22, 0)
- GdkDisplay *display;
- GdkMonitor *monitor;
-
- display = gdk_screen_get_display (screen);
- monitor = gdk_display_get_primary_monitor (display);
-#endif
-
- gdk_window_get_geometry (gdk_screen_get_root_window (screen), NULL, NULL,
- &sc_width, &sc_height);
-
-#if GTK_CHECK_VERSION (3, 22, 0)
- width_dpi = dpi_from_pixels_and_mm (sc_width, gdk_monitor_get_width_mm (monitor));
- height_dpi = dpi_from_pixels_and_mm (sc_height, gdk_monitor_get_height_mm (monitor));
-#else
- width_dpi = dpi_from_pixels_and_mm (sc_width, gdk_screen_get_width_mm (screen));
- height_dpi = dpi_from_pixels_and_mm (sc_height, gdk_screen_get_height_mm (screen));
-#endif
+
+ Screen *xscreen = gdk_x11_screen_get_xscreen (screen);
+
+ width_dpi = dpi_from_pixels_and_mm (WidthOfScreen (xscreen), WidthMMOfScreen (xscreen));
+ height_dpi = dpi_from_pixels_and_mm (HeightOfScreen (xscreen), HeightMMOfScreen (xscreen));
if (width_dpi < DPI_LOW_REASONABLE_VALUE || width_dpi > DPI_HIGH_REASONABLE_VALUE
|| height_dpi < DPI_LOW_REASONABLE_VALUE || height_dpi > DPI_HIGH_REASONABLE_VALUE) {
--
2.13.6

2
sources
View File

@ -1 +1 @@
SHA512 (mate-settings-daemon-1.19.2.tar.xz) = 21ce636f2ebcf5dcb6e6047059f7b5736dc71237aee1a27204a3a5d984fd551b98f314cb95200dbbd434e7d605b7c5b4db017ca2898020352668ef5ab3bb0f2f
SHA512 (mate-settings-daemon-1.20.1.tar.xz) = 87dbf87f5dbe13a44bacfe3b517270021bbbfc7930c0db07dd9294e1f8cbe388d891d4e6fd3eb6600c893d04894cd22427bde45421f8492b92a8724ab7e151af