public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sddm: remove HiDPI patch

Browse Source 
Disabling HiDPI support seemed to resolve a segfault at SDDM startup, but that
was a red herring. The problem actually resulted from a QML cache invalidation
bug. It should be safe to enable HiDPI support again.
This commit is contained in:
Thomas Tuegel 2017-10-19 07:07:24 -05:00
parent 0cc2171910
commit ef4a6bd181
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
3 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/applications/display-managers/sddm/default.nix
View File

@ -1,4 +1,4 @@
{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch { mkDerivation, lib, fetchFromGitHub, fetchpatch
, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
}: }:
@ -17,8 +17,7 @@ in mkDerivation rec {
sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb"; sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb";
}; };
patches = patches = [ ./sddm-ignore-config-mtime.patch ];
copyPathsToStore (lib.readPathsFromFile ./. ./series);
postPatch = postPatch =
# Module Qt5::Test must be included in `find_package` before it is used. # Module Qt5::Test must be included in `find_package` before it is used.

26
pkgs/applications/display-managers/sddm/disable-hidpi-xorg.patch
View File

@ -1,26 +0,0 @@
From 6bff89542a2c1b5719370baf3c3a38fd8b2b3c37 Mon Sep 17 00:00:00 2001
From: adisbladis <adis@blad.is>
Date: Mon, 16 Oct 2017 02:25:50 +0800
Subject: [PATCH] Disable HiDPI by default on X11 as it causes segmentation
faults with certain themes (KDE Breeze)
---
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 19c6fb1..2bb1dc5 100644
--- a/src/common/Configuration.h
+++ b/src/common/Configuration.h
@@ -69,7 +69,7 @@ namespace SDDM {
Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server"));
Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server"));
Entry(MinimumVT, int, MINIMUM_VT, _S("The lowest virtual terminal number that will be used."));
- Entry(EnableHiDPI, bool, false, _S("Enable Qt's automatic high-DPI scaling"));
+ Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
);
Section(Wayland,
--
2.14.2

2
pkgs/applications/display-managers/sddm/series
View File

@ -1,2 +0,0 @@
sddm-ignore-config-mtime.patch
disable-hidpi-xorg.patch