Patchwork [meta-gnome/meta-xfce,3/4] gdm: cosmetics

login
register
mail settings
Submitter Andreas Müller
Date April 27, 2013, 6:33 p.m.
Message ID <1367087640-4264-4-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/48995/
State Accepted, archived
Headers show

Comments

Andreas Müller - April 27, 2013, 6:33 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch  |   12 --------
 .../gdm/{gdm-2.32.2 => gdm}/%gconf-tree.xml        |    0
 .../0001-Remove-user-switch-applet.patch           |    0
 .../recipes-gnome/gdm/{gdm-2.32.2 => gdm}/Default  |    0
 .../gdm/{gdm-2.32.2 => gdm}/cross-xdetection.diff  |    0
 .../recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm      |    0
 .../recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm-pam  |    0
 .../recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm.conf |    0
 .../{gdm-2.32.2 => gdm}/sysrooted-pkg-config.patch |    0
 meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb         |   30 ++++++++++---------
 10 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch
 rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/%gconf-tree.xml (100%)
 rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/0001-Remove-user-switch-applet.patch (100%)
 rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/Default (100%)
 rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/cross-xdetection.diff (100%)
 rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm (100%)
 rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm-pam (100%)
 rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/gdm.conf (100%)
 rename meta-gnome/recipes-gnome/gdm/{gdm-2.32.2 => gdm}/sysrooted-pkg-config.patch (100%)

Patch

diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch
deleted file mode 100644
index 395fa62..0000000
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch
+++ /dev/null
@@ -1,12 +0,0 @@ 
---- /tmp/Makefile.am	2006-07-26 11:37:52.000000000 +0200
-+++ gdm-2.14.9/Makefile.am	2006-07-26 11:38:01.734411000 +0200
-@@ -5,8 +5,7 @@
- 	vicious-extensions \
- 	daemon \
- 	gui \
--	utils \
--	docs
-+	utils 
- 
- # add these when help gets added back
- # docs omf-install
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/%gconf-tree.xml b/meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/%gconf-tree.xml
rename to meta-gnome/recipes-gnome/gdm/gdm/%gconf-tree.xml
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/0001-Remove-user-switch-applet.patch b/meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/0001-Remove-user-switch-applet.patch
rename to meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/Default b/meta-gnome/recipes-gnome/gdm/gdm/Default
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/Default
rename to meta-gnome/recipes-gnome/gdm/gdm/Default
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/cross-xdetection.diff b/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/cross-xdetection.diff
rename to meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm b/meta-gnome/recipes-gnome/gdm/gdm/gdm
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm
rename to meta-gnome/recipes-gnome/gdm/gdm/gdm
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-pam b/meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-pam
rename to meta-gnome/recipes-gnome/gdm/gdm/gdm-pam
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm.conf b/meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm.conf
rename to meta-gnome/recipes-gnome/gdm/gdm/gdm.conf
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.32.2/sysrooted-pkg-config.patch
rename to meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 09a6f93..da12ab8 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -9,25 +9,27 @@  PR = "r17"
 inherit gnome update-rc.d systemd useradd
 
 SRC_URI += " \
-            file://cross-xdetection.diff \
-            file://0001-Remove-user-switch-applet.patch \
-            file://0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch \
-            file://sysrooted-pkg-config.patch \
-            file://%gconf-tree.xml \
-            file://gdm \
-            file://gdm.conf \
-            file://gdm-pam \
-            file://Default \
-            file://gdm.service.in \
+    file://cross-xdetection.diff \
+    file://0001-Remove-user-switch-applet.patch \
+    file://0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch \
+    file://sysrooted-pkg-config.patch \
+    file://%gconf-tree.xml \
+    file://gdm \
+    file://gdm.conf \
+    file://gdm-pam \
+    file://Default \
+    file://gdm.service.in \
 "
 
 SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
 SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703"
 
-EXTRA_OECONF = " --enable-authentication-scheme=shadow \
-                 --enable-debug=yes \
-                 --with-console-kit \
-                 --disable-scrollkeeper"
+EXTRA_OECONF = " \
+    --enable-authentication-scheme=shadow \
+    --enable-debug=yes \
+    --with-console-kit \
+    --disable-scrollkeeper \
+"
 
 do_configure_prepend() {
     sed -i -e "s:\bdocs::g" ${S}/Makefile.am