[SCM] sddm packaging branch, master, updated. debian/0.13.0-1-34-gfaea133

Maximiliano Curia maxy at moszumanska.debian.org
Mon Feb 27 14:23:52 UTC 2017 

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

The following commit has been merged in the master branch:
commit ba036defabb79d3d2adc5ececcff92aa35b57e72
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 27 15:02:15 2017 +0100

    Add new upstream patch: Fix-display-of-user-avatars.-684.patch
    
    Closes: 856195
    Thanks: Salvo Tomaselli for reporting
---
 debian/patches/02_use_debian_theme.diff            |  2 +-
 debian/patches/04_set_default_path.diff            |  2 +-
 debian/patches/05_add_debian_themes.diff           | 83 ++++++++++++++--------
 .../patches/Fix-display-of-user-avatars.-684.patch | 32 +++++++++
 debian/patches/series                              |  1 +
 5 files changed, 90 insertions(+), 30 deletions(-)

diff --git a/debian/patches/02_use_debian_theme.diff b/debian/patches/02_use_debian_theme.diff
index cca161a..1c6c67b 100644
--- a/debian/patches/02_use_debian_theme.diff
+++ b/debian/patches/02_use_debian_theme.diff
@@ -7,7 +7,7 @@ Subject: _kubuntu_use_breeze
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/common/Configuration.h b/src/common/Configuration.h
-index f790343..933931d 100644
+index f790343..6c79e01 100644
 --- a/src/common/Configuration.h
 +++ b/src/common/Configuration.h
 @@ -46,7 +46,7 @@ namespace SDDM {
diff --git a/debian/patches/04_set_default_path.diff b/debian/patches/04_set_default_path.diff
index 48ee987..13e0057 100644
--- a/debian/patches/04_set_default_path.diff
+++ b/debian/patches/04_set_default_path.diff
@@ -30,7 +30,7 @@ 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 933931d..4d0a281 100644
+index 6c79e01..1b36d3f 100644
 --- a/src/common/Configuration.h
 +++ b/src/common/Configuration.h
 @@ -78,7 +78,7 @@ namespace SDDM {
diff --git a/debian/patches/05_add_debian_themes.diff b/debian/patches/05_add_debian_themes.diff
index 33a650f..a58ffbb 100644
--- a/debian/patches/05_add_debian_themes.diff
+++ b/debian/patches/05_add_debian_themes.diff
@@ -1,7 +1,28 @@
-Index: sddm/data/themes/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Mon, 27 Feb 2017 14:58:13 +0100
+Subject: _add_debian_themes
+
 ===================================================================
---- sddm.orig/data/themes/CMakeLists.txt	2016-11-30 21:46:27.615830425 +0100
-+++ sddm/data/themes/CMakeLists.txt	2016-11-30 21:52:29.039905637 +0100
+---
+ data/themes/CMakeLists.txt                 | 27 ++++++++++++++--
+ data/themes/debian-elarun/README           |  9 ++++++
+ data/themes/debian-elarun/metadata.desktop | 49 ++++++++++++++++++++++++++++++
+ data/themes/debian-elarun/theme.conf       |  2 ++
+ data/themes/debian-maui/README             |  5 +++
+ data/themes/debian-maui/metadata.desktop   | 16 ++++++++++
+ data/themes/debian-maui/theme.conf         |  2 ++
+ 7 files changed, 108 insertions(+), 2 deletions(-)
+ create mode 100644 data/themes/debian-elarun/README
+ create mode 100644 data/themes/debian-elarun/metadata.desktop
+ create mode 100644 data/themes/debian-elarun/theme.conf
+ create mode 100644 data/themes/debian-maui/README
+ 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)
 +# Copy Maui to have it available as an external (non-embedded) theme
@@ -31,7 +52,7 @@ Index: sddm/data/themes/CMakeLists.txt
  
  foreach(THEME ${THEMES})
      # We assume that theme-specific translations are stored
-@@ -13,7 +36,7 @@
+@@ -13,7 +36,7 @@ foreach(THEME ${THEMES})
  
      qt5_add_translation(QM_FILES "${TRANSLATION_SOURCES}")
  
@@ -40,10 +61,11 @@ Index: sddm/data/themes/CMakeLists.txt
      install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${THEME}" DESTINATION "${DATA_INSTALL_DIR}/themes")
  
      list(APPEND THEMES_QM_FILES ${QM_FILES})
-Index: sddm/data/themes/debian-elarun/README
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sddm/data/themes/debian-elarun/README	2016-11-30 21:46:27.611830391 +0100
+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 @@
 +This theme is based on the KDM Elarun theme, ported to SDDM theme.
 +It was adapted to use the active Debian theme pack.
@@ -54,10 +76,11 @@ Index: sddm/data/themes/debian-elarun/README
 +Author=Roman Shtylman & Nuno Pinheiro
 +Copyright=GPL 2010 Roman Shtylman | nuno at oxygen-icons.org, 2012 Nuno Pineheiro
 +License=GPL
-Index: sddm/data/themes/debian-elarun/metadata.desktop
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sddm/data/themes/debian-elarun/metadata.desktop	2016-11-30 21:46:27.611830391 +0100
+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 @@
 +[SddmGreeterTheme]
 +Name=Debian Elarun
@@ -108,27 +131,30 @@ Index: sddm/data/themes/debian-elarun/metadata.desktop
 +Theme-API=${COMPONENTS_VERSION}
 +Website=https://github.com/sddm/sddm
 +
-Index: sddm/data/themes/debian-elarun/theme.conf
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sddm/data/themes/debian-elarun/theme.conf	2016-11-30 21:46:27.611830391 +0100
+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
-Index: sddm/data/themes/debian-maui/README
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sddm/data/themes/debian-maui/README	2016-11-30 21:46:27.611830391 +0100
+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 @@
 +This theme is an adaptation of the original Maui theme from upstream SDDM for
 +Debian to use the active desktop-base theme.
 +
 +Check the src/greeter/theme folder from the SDDM source for more information.
 +
-Index: sddm/data/themes/debian-maui/metadata.desktop
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sddm/data/themes/debian-maui/metadata.desktop	2016-11-30 21:46:27.611830391 +0100
+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 @@
 +[SddmGreeterTheme]
 +Name=Debian Maui
@@ -146,10 +172,11 @@ Index: sddm/data/themes/debian-maui/metadata.desktop
 +Email=abdurrahmanavci at gmail.com
 +Theme-Id=maui
 +Theme-API=${COMPONENTS_VERSION}
-Index: sddm/data/themes/debian-maui/theme.conf
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sddm/data/themes/debian-maui/theme.conf	2016-11-30 21:46:27.611830391 +0100
+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 @@
 +[General]
 +background=/usr/share/desktop-base/active-theme/login/background-nologo.svg
diff --git a/debian/patches/Fix-display-of-user-avatars.-684.patch b/debian/patches/Fix-display-of-user-avatars.-684.patch
new file mode 100644
index 0000000..f3f95e8
--- /dev/null
+++ b/debian/patches/Fix-display-of-user-avatars.-684.patch
@@ -0,0 +1,32 @@
+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/series b/debian/patches/series
index fbaee48..66e8487 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 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

-- 
sddm packaging

More information about the pkg-kde-commits mailing list