summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-06-09 17:44:41 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2011-06-09 18:14:07 +0200
commit1e7131eb6803967d2314a8e7a40f280966c2b2eb (patch)
treee9d5aa5bbee1678bd18a9bd8c7dfbf2d524cc82b
parent1aacaa1021be57b511872ba548283068ecc9b1d6 (diff)
downloadmeta-openembedded-1e7131eb6803967d2314a8e7a40f280966c2b2eb.tar.gz
gdm: update to 2.32.2 (latest stable in 2.32.x series)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff66
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm-2.32.2/%gconf-tree.xml (renamed from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/%gconf-tree.xml)0
-rwxr-xr-xmeta-gnome/recipes-gnome/gdm/gdm-2.32.2/Default (renamed from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/Default)0
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm-2.32.2/cross-xdetection.diff (renamed from meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff)48
-rwxr-xr-xmeta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm (renamed from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm)0
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch (renamed from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-nodocs.patch)0
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-pam (renamed from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-pam)0
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm.conf (renamed from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm.conf)0
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb (renamed from meta-gnome/recipes-gnome/gdm/gdm_2.30.0.bb)4
9 files changed, 30 insertions, 88 deletions
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff
deleted file mode 100644
index 150f79763a..0000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff
+++ /dev/null
@@ -1,66 +0,0 @@
1--- gdm-2.26.1/configure.ac-orig 2009-03-16 12:50:10.000000000 -0700
2+++ gdm-2.26.1/configure.ac 2009-06-12 16:40:40.000000000 -0700
3@@ -1085,62 +1085,10 @@ dnl ------------------------------------
4 # and /usr/X11 since they often symlink to each other, and configure
5 # should use the more stable location (the real directory) if possible.
6 #
7-if test -x /usr/X11/bin/Xserver; then
8- X_PATH="/usr/X11/bin"
9- X_SERVER_PATH="/usr/X11/bin"
10- X_SERVER="/usr/X11/bin/Xserver"
11- X_CONFIG_OPTIONS="-audit 0"
12-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
13- X_PATH="/usr/X11R6/bin"
14- X_SERVER_PATH="/usr/X11R6/bin"
15- X_SERVER="/usr/X11R6/bin/X"
16- X_CONFIG_OPTIONS="-audit 0"
17-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
18- X_PATH="/usr/X11/bin"
19- X_SERVER_PATH="/usr/X11/bin"
20- X_SERVER="/usr/X11/bin/X"
21- X_CONFIG_OPTIONS="-audit 0"
22-elif test -x /usr/X11R6/bin/X; then
23- X_PATH="/usr/X11R6/bin"
24- X_SERVER_PATH="/usr/X11R6/bin"
25- X_SERVER="/usr/X11R6/bin/X"
26- X_CONFIG_OPTIONS="-audit 0"
27-elif test -x /usr/bin/Xorg; then
28- X_PATH="/usr/bin"
29- X_SERVER_PATH="/usr/bin"
30- X_SERVER="/usr/bin/Xorg"
31- X_CONFIG_OPTIONS="-audit 0"
32-elif test -x /usr/X11/bin/X; then
33- X_PATH="/usr/X11/bin"
34- X_SERVER_PATH="/usr/X11/bin"
35- X_SERVER="/usr/X11/bin/X"
36- X_CONFIG_OPTIONS="-audit 0"
37-elif test -x /usr/openwin/bin/Xsun; then
38- # Do not add /usr/openwin/bin here because on Solaris you need
39- # /usr/openwin/bin in your PATH even if you are using the Xorg
40- # Xserver. We add this to the path below.
41- X_PATH="/usr/openwin/bin"
42- X_SERVER_PATH="/usr/openwin/bin"
43- X_SERVER="/usr/openwin/bin/Xsun"
44- X_CONFIG_OPTIONS="-audit 0 -nobanner"
45-elif test -x /opt/X11R6/bin/X; then
46- X_PATH="/opt/X11R6/bin"
47- X_SERVER_PATH="/opt/X11R6/bin"
48- X_SERVER="/opt/X11R6/bin/X"
49- X_CONFIG_OPTIONS="-audit 0"
50-elif test -x /usr/bin/X; then
51 X_PATH="/usr/bin"
52 X_SERVER_PATH="/usr/bin"
53- X_SERVER="/usr/bin/X"
54+ X_SERVER="/usr/bin/X"
55 X_CONFIG_OPTIONS="-audit 0"
56-else
57- # what to do, what to do, this is wrong, but this just sets the
58- # defaults, perhaps this user is cross compiling or some such
59- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
60- X_SERVER_PATH="/usr/X11R6/bin"
61- X_SERVER="/usr/X11R6/bin/X"
62- X_CONFIG_OPTIONS="-audit 0"
63-fi
64
65 dnl ---------------------------------------------------------------------------
66 dnl - Check for Xnest / Xephyr support
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/%gconf-tree.xml b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/%gconf-tree.xml
index f8c2e9cc20..f8c2e9cc20 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/%gconf-tree.xml
+++ b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/%gconf-tree.xml
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/Default b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/Default
index a7a7fcf7fd..a7a7fcf7fd 100755
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/Default
+++ b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/Default
diff --git a/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/cross-xdetection.diff
index 9cb6ac98dd..bee35116ee 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
+++ b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/cross-xdetection.diff
@@ -1,6 +1,18 @@
1--- /tmp/configure.ac 2008-12-10 08:38:16.000000000 +0100 1From 60084e7e973634971c9643f2459e5d3e248ee3f1 Mon Sep 17 00:00:00 2001
2+++ gdm-2.24.1/configure.ac 2008-12-10 08:39:17.000000000 +0100 2From: Koen Kooi <koen@dominion.thruhere.net>
3@@ -1133,80 +1133,10 @@ 3Date: Thu, 9 Jun 2011 18:12:45 +0200
4Subject: [PATCH] build-sys: hardcode x paths to fix crosscompiling
5
6Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
7---
8 configure.ac | 72 ++++-----------------------------------------------------
9 1 files changed, 5 insertions(+), 67 deletions(-)
10
11diff --git a/configure.ac b/configure.ac
12index eeaf3dc..841efe0 100644
13--- a/configure.ac
14+++ b/configure.ac
15@@ -1101,73 +1101,11 @@ dnl ---------------------------------------------------------------------------
4 dnl - Check for X Server location 16 dnl - Check for X Server location
5 dnl --------------------------------------------------------------------------- 17 dnl ---------------------------------------------------------------------------
6 18
@@ -19,36 +31,31 @@
19- X_PATH="/usr/X11/bin" 31- X_PATH="/usr/X11/bin"
20- X_SERVER_PATH="/usr/X11/bin" 32- X_SERVER_PATH="/usr/X11/bin"
21- X_SERVER="/usr/X11/bin/Xserver" 33- X_SERVER="/usr/X11/bin/Xserver"
22- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
23- X_CONFIG_OPTIONS="-audit 0" 34- X_CONFIG_OPTIONS="-audit 0"
24-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then 35-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
25- X_PATH="/usr/X11R6/bin" 36- X_PATH="/usr/X11R6/bin"
26- X_SERVER_PATH="/usr/X11R6/bin" 37- X_SERVER_PATH="/usr/X11R6/bin"
27- X_SERVER="/usr/X11R6/bin/X" 38- X_SERVER="/usr/X11R6/bin/X"
28- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
29- X_CONFIG_OPTIONS="-audit 0" 39- X_CONFIG_OPTIONS="-audit 0"
30-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then 40-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
31- X_PATH="/usr/X11/bin" 41- X_PATH="/usr/X11/bin"
32- X_SERVER_PATH="/usr/X11/bin" 42- X_SERVER_PATH="/usr/X11/bin"
33- X_SERVER="/usr/X11/bin/X" 43- X_SERVER="/usr/X11/bin/X"
34- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
35- X_CONFIG_OPTIONS="-audit 0" 44- X_CONFIG_OPTIONS="-audit 0"
36-elif test -x /usr/X11R6/bin/X; then 45-elif test -x /usr/X11R6/bin/X; then
37- X_PATH="/usr/X11R6/bin" 46- X_PATH="/usr/X11R6/bin"
38- X_SERVER_PATH="/usr/X11R6/bin" 47- X_SERVER_PATH="/usr/X11R6/bin"
39- X_SERVER="/usr/X11R6/bin/X" 48- X_SERVER="/usr/X11R6/bin/X"
40- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
41- X_CONFIG_OPTIONS="-audit 0" 49- X_CONFIG_OPTIONS="-audit 0"
42-elif test -x /usr/bin/Xorg; then 50-elif test -x /usr/bin/Xorg; then
43 X_PATH="/usr/bin" 51- X_PATH="/usr/bin"
44 X_SERVER_PATH="/usr/bin" 52- X_SERVER_PATH="/usr/bin"
45- X_SERVER="/usr/bin/Xorg" 53- X_SERVER="/usr/bin/Xorg"
46- X_CONFIG_OPTIONS="-audit 0" 54- X_CONFIG_OPTIONS="-audit 0"
47-elif test -x /usr/X11/bin/X; then 55-elif test -x /usr/X11/bin/X; then
48- X_PATH="/usr/X11/bin" 56- X_PATH="/usr/X11/bin"
49- X_SERVER_PATH="/usr/X11/bin" 57- X_SERVER_PATH="/usr/X11/bin"
50- X_SERVER="/usr/X11/bin/X" 58- X_SERVER="/usr/X11/bin/X"
51- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
52- X_CONFIG_OPTIONS="-audit 0" 59- X_CONFIG_OPTIONS="-audit 0"
53-elif test -x /usr/openwin/bin/Xsun; then 60-elif test -x /usr/openwin/bin/Xsun; then
54- # Do not add /usr/openwin/bin here because on Solaris you need 61- # Do not add /usr/openwin/bin here because on Solaris you need
@@ -62,7 +69,6 @@
62- X_PATH="/opt/X11R6/bin" 69- X_PATH="/opt/X11R6/bin"
63- X_SERVER_PATH="/opt/X11R6/bin" 70- X_SERVER_PATH="/opt/X11R6/bin"
64- X_SERVER="/opt/X11R6/bin/X" 71- X_SERVER="/opt/X11R6/bin/X"
65- GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
66- X_CONFIG_OPTIONS="-audit 0" 72- X_CONFIG_OPTIONS="-audit 0"
67-elif test -x /usr/bin/X; then 73-elif test -x /usr/bin/X; then
68- X_PATH="/usr/bin" 74- X_PATH="/usr/bin"
@@ -73,12 +79,18 @@
73- # what to do, what to do, this is wrong, but this just sets the 79- # what to do, what to do, this is wrong, but this just sets the
74- # defaults, perhaps this user is cross compiling or some such 80- # defaults, perhaps this user is cross compiling or some such
75- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin" 81- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
76- X_SERVER_PATH="/usr/X11R6/bin" 82- X_SERVER_PATH="/usr/bin"
77- X_SERVER="/usr/X11R6/bin/X" 83- X_SERVER="/usr/bin/X"
78- GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin" 84- X_CONFIG_OPTIONS="-audit 0"
79+ X_SERVER="/etc/X11/Xserver"
80 X_CONFIG_OPTIONS="-audit 0"
81-fi 85-fi
86+# We hardcode the X paths since we know where it will be in the OE univers
87+X_PATH="/usr/bin"
88+X_SERVER_PATH="/usr/bin"
89+X_SERVER="/usr/bin/X"
90+X_CONFIG_OPTIONS="-audit 0"
82 91
83 # Don't add bindir to GDM_USER_PATH if it is already in the PATH. 92 dnl ---------------------------------------------------------------------------
84 # If it is /bin or /usr/bin, for example. 93 dnl - Check for Xnest / Xephyr support
94--
951.6.6.1
96
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm
index 43eae95177..43eae95177 100755
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm
+++ b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-nodocs.patch b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch
index 395fa627eb..395fa627eb 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-nodocs.patch
+++ b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-nodocs.patch
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-pam b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-pam
index f9fafed9d6..f9fafed9d6 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-pam
+++ b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm-pam
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm.conf b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm.conf
index 559823b863..559823b863 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm.conf
+++ b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm.conf
diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.30.0.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 918c8e41d7..d24659aeed 100644
--- a/meta-gnome/recipes-gnome/gdm/gdm_2.30.0.bb
+++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
@@ -2,8 +2,6 @@ DESCRIPTION = "Graphical login manager"
2LICENSE = "GPLv2" 2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" 3LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
4 4
5PR = "r3"
6
7DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb" 5DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
8 6
9inherit gnome update-rc.d 7inherit gnome update-rc.d
@@ -17,8 +15,6 @@ SRC_URI += " \
17 file://Default \ 15 file://Default \
18 " 16 "
19 17
20SRC_URI[archive.md5sum] = "0da84637abbcbf1666529d6192a81e6b"
21SRC_URI[archive.sha256sum] = "ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15"
22 18
23EXTRA_OECONF = " --enable-authentication-scheme=shadow \ 19EXTRA_OECONF = " --enable-authentication-scheme=shadow \
24 --enable-debug=yes \ 20 --enable-debug=yes \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-07-17 00:28:37 +0000