[SCM] sddm packaging branch, master, updated. debian/0.13.0-1-39-ge4af9fd

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=082b33a

The following commit has been merged in the master branch:
commit 082b33a90fa3edd7eac1bcb7b2fd8cfcab378f13
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Mar 12 17:28:26 2017 +0100

    Add HiDPI patches: Add-a-config-option-to-enable-high-DPI-scaling-701.patch and Regression-fix-disable-HiDPI-by-default.patch
    
    Closes: 853843
    Thanks: Laurent Bonnaud for reporting and testing
---
 ...fig-option-to-enable-high-DPI-scaling-701.patch | 48 ++++++++++++++++++++++
 .../Regression-fix-disable-HiDPI-by-default.patch  | 21 ++++++++++
 debian/patches/series                              |  2 +
 3 files changed, 71 insertions(+)

diff --git a/debian/patches/Add-a-config-option-to-enable-high-DPI-scaling-701.patch b/debian/patches/Add-a-config-option-to-enable-high-DPI-scaling-701.patch
new file mode 100644
index 0000000..7669861
--- /dev/null
+++ b/debian/patches/Add-a-config-option-to-enable-high-DPI-scaling-701.patch
@@ -0,0 +1,48 @@
+From: Stany MARCEL <stanypub at gmail.com>
+Date: Thu, 15 Sep 2016 17:47:25 +0200
+Subject: Add a config option to enable high-DPI scaling (#701)
+
+The new EnableHiDPI boolean option permits to enable or not the
+activation of Qt::AA_EnableHighDpiScaling attribute.
+
+The default is enabled.
+
+[ChangeLog][Greeter] Enable Qt's automatic high dpi scaling based on
+configuration
+
+Signed-off-by: Stany MARCEL <stanypub at gmail.com>
+---
+ src/common/Configuration.h | 1 +
+ src/greeter/GreeterApp.cpp | 7 ++++++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index 1b36d3f..e37ebb9 100644
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
+@@ -42,6 +42,7 @@ namespace SDDM {
+         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.
"
+                                                                                                    "If property is set to none, numlock won't be changed
"
+                                                                                                    "NOTE: Currently ignored if autologin is enabled."));
++        Entry(EnableHiDPI,         bool,        true,                                           _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,
+diff --git a/src/greeter/GreeterApp.cpp b/src/greeter/GreeterApp.cpp
+index 9ec66e1..1926b30 100644
+--- a/src/greeter/GreeterApp.cpp
++++ b/src/greeter/GreeterApp.cpp
+@@ -242,7 +242,12 @@ int main(int argc, char **argv) {
+     qInstallMessageHandler(SDDM::GreeterMessageHandler);
+ 
+     // HiDPI
+-    QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
++    if (SDDM::mainConfig.EnableHiDPI.get()) {
++        qDebug() << "High-DPI autoscaling Enabled";
++        QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
++    } else {
++        qDebug() << "High-DPI autoscaling Not Enabled";
++    }
+ 
+     QStringList arguments;
+ 
diff --git a/debian/patches/Regression-fix-disable-HiDPI-by-default.patch b/debian/patches/Regression-fix-disable-HiDPI-by-default.patch
new file mode 100644
index 0000000..361960e
--- /dev/null
+++ b/debian/patches/Regression-fix-disable-HiDPI-by-default.patch
@@ -0,0 +1,21 @@
+From: Maximiliano Curia <maxy at gnuservers.com.ar>
+Date: Sun, 12 Mar 2017 17:26:05 +0100
+Subject: Regression fix, disable HiDPI by default
+
+---
+ src/common/Configuration.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/Configuration.h b/src/common/Configuration.h
+index e37ebb9..8d43e7e 100644
+--- a/src/common/Configuration.h
++++ b/src/common/Configuration.h
+@@ -42,7 +42,7 @@ namespace SDDM {
+         Entry(Numlock,             NumState,    NUM_NONE,                                       _S("Initial NumLock state. Can be on, off or none.
"
+                                                                                                    "If property is set to none, numlock won't be changed
"
+                                                                                                    "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,
diff --git a/debian/patches/series b/debian/patches/series
index 66e8487..617b49d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 05_add_debian_themes.diff
 handle-reading-from-a-closed-file-handle.patch
 Fix-display-of-user-avatars.-684.patch
+Add-a-config-option-to-enable-high-DPI-scaling-701.patch
+Regression-fix-disable-HiDPI-by-default.patch

-- 
sddm packaging