From 3e092c9a56a07f54fa2ca044e2a08a71d4865062 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 28 Jan 2017 11:45:48 -0600 Subject: [PATCH] EnableHiDPI=false default --- sddm-0.14.0-fedora_config.patch | 14 ++++++++++---- sddm.conf | 3 +++ sddm.spec | 12 +++++++++--- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/sddm-0.14.0-fedora_config.patch b/sddm-0.14.0-fedora_config.patch index fbe5222..7c35db8 100644 --- a/sddm-0.14.0-fedora_config.patch +++ b/sddm-0.14.0-fedora_config.patch @@ -1,7 +1,13 @@ diff -up sddm-0.14.0/src/common/Configuration.h.fedora_config sddm-0.14.0/src/common/Configuration.h ---- sddm-0.14.0/src/common/Configuration.h.fedora_config 2016-08-28 06:54:03.000000000 -0500 -+++ sddm-0.14.0/src/common/Configuration.h 2016-10-07 12:54:34.344317447 -0500 -@@ -46,7 +46,7 @@ namespace SDDM { +--- sddm-0.14.0/src/common/Configuration.h.fedora_config 2017-01-28 11:31:17.718934832 -0600 ++++ sddm-0.14.0/src/common/Configuration.h 2017-01-28 11:42:49.515949182 -0600 +@@ -42,12 +42,12 @@ namespace SDDM { + Entry(Numlock, NumState, NUM_NONE, _S("Initial NumLock state. Can be on, off or none.\n" + "If property is set to none, numlock won't be changed\n" + "NOTE: Currently ignored if autologin is enabled.")); +- Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling")); ++ Entry(EnableHiDPI, bool, false, _S("Enable Qt's automatic high-DPI scaling")); + Entry(InputMethod, QString, QString(), _S("Input method module")); // Name Entries (but it's a regular class again) Section(Theme, Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path")); @@ -10,7 +16,7 @@ diff -up sddm-0.14.0/src/common/Configuration.h.fedora_config sddm-0.14.0/src/co Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Global directory for user avatars\n" "The files should be named .face.icon")); Entry(CursorTheme, QString, QString(), _S("Cursor theme used in the greeter")); -@@ -64,21 +64,21 @@ namespace SDDM { +@@ -65,21 +65,21 @@ namespace SDDM { Entry(XauthPath, QString, _S("/usr/bin/xauth"), _S("Path to xauth binary")); Entry(SessionDir, QString, _S("/usr/share/xsessions"), _S("Directory containing available X sessions")); Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session")); diff --git a/sddm.conf b/sddm.conf index 90a7ee9..ad78549 100644 --- a/sddm.conf +++ b/sddm.conf @@ -10,6 +10,9 @@ [General] +# Enable Qt's automatic high-DPI scaling +#EnableHiDPI=false + # Halt command #HaltCommand=/usr/bin/systemctl poweroff diff --git a/sddm.spec b/sddm.spec index 396c342..6516bc8 100644 --- a/sddm.spec +++ b/sddm.spec @@ -2,7 +2,7 @@ Name: sddm Version: 0.14.0 -Release: 6%{?dist} +Release: 7%{?dist} # code GPLv2+, fedora theme CC-BY-SA License: GPLv2+ and CC-BY-SA Summary: QML based X11 desktop manager @@ -15,8 +15,10 @@ Source0: https://github.com/sddm/sddm/archive/v%{version}.tar.gz Patch1: 0001-Fix-display-of-user-avatars.-684.patch Patch2: 0002-Remove-quotes-from-ServerArguments-696.patch Patch3: 0003-Add-a-config-option-to-enable-high-DPI-scaling-701.patch + +## upstreamable patches # Fixes RHBZ #1392654 -Patch4: https://github.com/sddm/sddm/pull/735.patch +Patch54: https://github.com/sddm/sddm/pull/735.patch ## downstream patches Patch101: sddm-0.14.0-fedora_config.patch @@ -92,7 +94,8 @@ A collection of sddm themes, including: circles, elarun, maldives, maui. %patch1 -p1 -b .0001 %patch2 -p1 -b .0002 %patch3 -p1 -b .0003 -%patch4 -p1 -b .0004 + +%patch54 -p1 -b .0054 %patch101 -p1 -b .fedora_config @@ -217,6 +220,9 @@ exit 0 %changelog +* Sat Jan 28 2017 Rex Dieter - 0.14.0-7 +- EnableHiDPI=false default + * Tue Nov 08 2016 Adam Williamson - 0.14.0-6 - backport PR #735 to fix RHBZ #1392654