[SCM] sddm packaging branch, master, updated. debian/0.13.0-1-55-gfcdf532
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Nov 26 08:59:23 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=6974c7c
The following commit has been merged in the master branch:
commit 6974c7c5e4825f76c2335376b6d81814d13d3cce
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sat Sep 2 22:11:56 2017 +0200
Drop upstream patches
---
debian/patches/01_sddm_systemctl.diff | 6 +--
debian/patches/04_set_default_path.diff | 8 +---
debian/patches/05_add_debian_themes.diff | 33 +--------------
...fig-option-to-enable-high-DPI-scaling-701.patch | 48 ----------------------
.../patches/Fix-display-of-user-avatars.-684.patch | 32 ---------------
.../Regression-fix-disable-HiDPI-by-default.patch | 21 ----------
debian/patches/series | 3 --
7 files changed, 6 insertions(+), 145 deletions(-)
diff --git a/debian/patches/01_sddm_systemctl.diff b/debian/patches/01_sddm_systemctl.diff
index cc629a1..50fd023 100644
--- a/debian/patches/01_sddm_systemctl.diff
+++ b/debian/patches/01_sddm_systemctl.diff
@@ -6,11 +6,9 @@ Subject: _sddm_systemctl
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fe8074b..98551b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -139,8 +139,8 @@ if(SYSTEMD_FOUND)
+@@ -139,8 +139,8 @@
endif()
set(MINIMUM_VT 1)
@@ -20,4 +18,4 @@ index fe8074b..98551b3 100644
+ set(REBOOT_COMMAND "/bin/systemctl reboot")
else()
set(SYSTEMD_FOUND 0)
- set(MINIMUM_VT 7)
+ endif()
diff --git a/debian/patches/04_set_default_path.diff b/debian/patches/04_set_default_path.diff
index 13e0057..3755fe6 100644
--- a/debian/patches/04_set_default_path.diff
+++ b/debian/patches/04_set_default_path.diff
@@ -16,11 +16,9 @@ Last-Update: 2015-09-14
src/common/Configuration.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/data/man/sddm.conf.rst.in b/data/man/sddm.conf.rst.in
-index 3238af5..f8bca5f 100644
--- a/data/man/sddm.conf.rst.in
+++ b/data/man/sddm.conf.rst.in
-@@ -145,7 +145,7 @@ OPTIONS
+@@ -156,7 +156,7 @@
`DefaultPath=`
Default path to set after successfully logging in.
@@ -29,11 +27,9 @@ index 3238af5..f8bca5f 100644
`MinimumUid=`
Minimum user id of the users to be listed in the
-diff --git a/src/common/Configuration.h b/src/common/Configuration.h
-index 6c79e01..1b36d3f 100644
--- a/src/common/Configuration.h
+++ b/src/common/Configuration.h
-@@ -78,7 +78,7 @@ namespace SDDM {
+@@ -80,7 +80,7 @@
);
Section(Users,
diff --git a/debian/patches/05_add_debian_themes.diff b/debian/patches/05_add_debian_themes.diff
index a58ffbb..eab5940 100644
--- a/debian/patches/05_add_debian_themes.diff
+++ b/debian/patches/05_add_debian_themes.diff
@@ -19,12 +19,10 @@ Subject: _add_debian_themes
create mode 100644 data/themes/debian-maui/metadata.desktop
create mode 100644 data/themes/debian-maui/theme.conf
-diff --git a/data/themes/CMakeLists.txt b/data/themes/CMakeLists.txt
-index 99e54ff..1c2f2c0 100644
--- a/data/themes/CMakeLists.txt
+++ b/data/themes/CMakeLists.txt
@@ -1,4 +1,27 @@
--set(THEMES elarun maldives)
+-set(THEMES elarun maldives maya)
+# Copy Maui to have it available as an external (non-embedded) theme
+file(COPY "../../src/greeter/theme/" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/maui")
+
@@ -48,22 +46,10 @@ index 99e54ff..1c2f2c0 100644
+ file(COPY "${ELARUN_IMG}" DESTINATION "${CMAKE_CURRENT_SOURCE_DIR}/debian-elarun/images/")
+endforeach(ELARUN_IMG)
+
-+set(THEMES elarun maldives maui debian-maui debian-elarun)
++set(THEMES elarun maldives maui maya debian-maui debian-elarun)
foreach(THEME ${THEMES})
# We assume that theme-specific translations are stored
-@@ -13,7 +36,7 @@ foreach(THEME ${THEMES})
-
- qt5_add_translation(QM_FILES "${TRANSLATION_SOURCES}")
-
-- install(DIRECTORY "${THEME}" DESTINATION "${DATA_INSTALL_DIR}/themes" PATTERN "*.ts" EXCLUDE)
-+ install(DIRECTORY "${THEME}" DESTINATION "${DATA_INSTALL_DIR}/themes" PATTERN "${THEME}/*.ts" EXCLUDE PATTERN "${THEME}/Main.qml" EXCLUDE)
- install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${THEME}" DESTINATION "${DATA_INSTALL_DIR}/themes")
-
- list(APPEND THEMES_QM_FILES ${QM_FILES})
-diff --git a/data/themes/debian-elarun/README b/data/themes/debian-elarun/README
-new file mode 100644
-index 0000000..45dcb7b
--- /dev/null
+++ b/data/themes/debian-elarun/README
@@ -0,0 +1,9 @@
@@ -76,9 +62,6 @@ index 0000000..45dcb7b
+Author=Roman Shtylman & Nuno Pinheiro
+Copyright=GPL 2010 Roman Shtylman | nuno at oxygen-icons.org, 2012 Nuno Pineheiro
+License=GPL
-diff --git a/data/themes/debian-elarun/metadata.desktop b/data/themes/debian-elarun/metadata.desktop
-new file mode 100644
-index 0000000..83d3353
--- /dev/null
+++ b/data/themes/debian-elarun/metadata.desktop
@@ -0,0 +1,49 @@
@@ -131,17 +114,11 @@ index 0000000..83d3353
+Theme-API=${COMPONENTS_VERSION}
+Website=https://github.com/sddm/sddm
+
-diff --git a/data/themes/debian-elarun/theme.conf b/data/themes/debian-elarun/theme.conf
-new file mode 100644
-index 0000000..c4bf093
--- /dev/null
+++ b/data/themes/debian-elarun/theme.conf
@@ -0,0 +1,2 @@
+[General]
+background=/usr/share/desktop-base/active-theme/login/background.svg
-diff --git a/data/themes/debian-maui/README b/data/themes/debian-maui/README
-new file mode 100644
-index 0000000..0d181c8
--- /dev/null
+++ b/data/themes/debian-maui/README
@@ -0,0 +1,5 @@
@@ -150,9 +127,6 @@ index 0000000..0d181c8
+
+Check the src/greeter/theme folder from the SDDM source for more information.
+
-diff --git a/data/themes/debian-maui/metadata.desktop b/data/themes/debian-maui/metadata.desktop
-new file mode 100644
-index 0000000..e94ee0f
--- /dev/null
+++ b/data/themes/debian-maui/metadata.desktop
@@ -0,0 +1,16 @@
@@ -172,9 +146,6 @@ index 0000000..e94ee0f
+Email=abdurrahmanavci at gmail.com
+Theme-Id=maui
+Theme-API=${COMPONENTS_VERSION}
-diff --git a/data/themes/debian-maui/theme.conf b/data/themes/debian-maui/theme.conf
-new file mode 100644
-index 0000000..d832f41
--- /dev/null
+++ b/data/themes/debian-maui/theme.conf
@@ -0,0 +1,2 @@
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
deleted file mode 100644
index 7669861..0000000
--- a/debian/patches/Add-a-config-option-to-enable-high-DPI-scaling-701.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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/Fix-display-of-user-avatars.-684.patch b/debian/patches/Fix-display-of-user-avatars.-684.patch
deleted file mode 100644
index f3f95e8..0000000
--- a/debian/patches/Fix-display-of-user-avatars.-684.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Bastian Beischer <bastian.beischer at gmail.com>
-Date: Fri, 2 Sep 2016 13:05:18 +0200
-Subject: Fix display of user avatars. (#684)
-
-QFile::exists("...") does not understand file:// URLs, at least in Qt
-5.7.0 and Qt 4.8.7.
----
- src/greeter/UserModel.cpp | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/greeter/UserModel.cpp b/src/greeter/UserModel.cpp
-index 41a9f10..94c492d 100644
---- a/src/greeter/UserModel.cpp
-+++ b/src/greeter/UserModel.cpp
-@@ -107,13 +107,13 @@ namespace SDDM {
- d->lastIndex = i;
-
- if (avatarsEnabled) {
-- const QString userFace = QStringLiteral("file://%1/.face.icon").arg(user->homeDir);
-- const QString systemFace = QStringLiteral("file://%1/%2.face.icon").arg(facesDir).arg(user->name);
-+ const QString userFace = QStringLiteral("%1/.face.icon").arg(user->homeDir);
-+ const QString systemFace = QStringLiteral("%1/%2.face.icon").arg(facesDir).arg(user->name);
-
- if (QFile::exists(userFace))
-- user->icon = userFace;
-+ user->icon = QStringLiteral("file://%1").arg(userFace);
- else if (QFile::exists(systemFace))
-- user->icon = systemFace;
-+ user->icon = QStringLiteral("file://%1").arg(systemFace);
- }
- }
- }
diff --git a/debian/patches/Regression-fix-disable-HiDPI-by-default.patch b/debian/patches/Regression-fix-disable-HiDPI-by-default.patch
deleted file mode 100644
index 361960e..0000000
--- a/debian/patches/Regression-fix-disable-HiDPI-by-default.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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 617b49d..fbaee48 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,3 @@
04_set_default_path.diff
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
More information about the pkg-kde-commits
mailing list