update to 1.20 release
This commit is contained in:
raveit65
parent
6afe888598
commit
c9ac555556
|
|
@ -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.0.tar.xz
|
||||
|
|
|
|||
|
|
@ -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,9 +13,9 @@
|
|||
%{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
|
||||
|
||||
Name: mate-settings-daemon
|
||||
Version: %{branch}.2
|
||||
Version: %{branch}.0
|
||||
%if 0%{?rel_build}
|
||||
Release: 2%{?dist}
|
||||
Release: 1%{?dist}
|
||||
%else
|
||||
Release: 0.6%{?git_rel}%{?dist}
|
||||
%endif
|
||||
|
|
@ -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
|
||||
|
|
@ -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}
|
||||
|
|
@ -90,9 +92,12 @@ NOCONFIGURE=1 ./autogen.sh
|
|||
--with-x \
|
||||
--with-nssdb
|
||||
|
||||
## make %{?_smp_mflags} V=1
|
||||
# fix build for f28
|
||||
%if 0%{?fedora} && 0%{?fedora} >= 28
|
||||
make %{?_smp_mflags} V=1 LDFLAGS="`echo "$RPM_LD_FLAGS" | sed -e 's/-Wl,-z,defs//'`"
|
||||
%else
|
||||
make %{?_smp_mflags} V=1
|
||||
%endif
|
||||
|
||||
%install
|
||||
%{make_install}
|
||||
|
|
@ -114,13 +119,11 @@ 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 || :
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
|
|
@ -150,6 +153,11 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Sun Feb 11 2018 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.20.0-1
|
||||
- update to 1.20.0 release
|
||||
- drop GSettings Schema rpm scriplet
|
||||
- switch to autosetup
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
|
|
@ -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
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (mate-settings-daemon-1.19.2.tar.xz) = 21ce636f2ebcf5dcb6e6047059f7b5736dc71237aee1a27204a3a5d984fd551b98f314cb95200dbbd434e7d605b7c5b4db017ca2898020352668ef5ab3bb0f2f
|
||||
SHA512 (mate-settings-daemon-1.20.0.tar.xz) = 6c778e08337e7501562a6287e843922779d1332596fb25141cbe2285268df26255ac569037612521fd5691c57975f25dcaf646a1680379e2eb28cd48b40db0da
|
||||
|
|
|
|||
Loading…
Reference in New Issue