[oe-commits] Koen Kooi : gdm: update to 2.32.2 (latest stable in 2.32.x series)

git version control git at git.openembedded.org
Thu Jun 9 17:13:10 UTC 2011 

Module: meta-openembedded.git
Branch: master
Commit: 1e7131eb6803967d2314a8e7a40f280966c2b2eb
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=1e7131eb6803967d2314a8e7a40f280966c2b2eb

Author: Koen Kooi <koen at dominion.thruhere.net>
Date:   Thu Jun  9 17:44:41 2011 +0200

gdm: update to 2.32.2 (latest stable in 2.32.x series)

Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../gdm/gdm-2.30.0/cross-xdetection.diff           |   66 --------------------
 .../gdm/{gdm-2.30.0 => gdm-2.32.2}/%gconf-tree.xml |    0
 .../gdm/{gdm-2.30.0 => gdm-2.32.2}/Default         |    0
 .../gdm/{gdm => gdm-2.32.2}/cross-xdetection.diff  |   48 +++++++++-----
 .../gdm/{gdm-2.30.0 => gdm-2.32.2}/gdm             |    0
 .../{gdm-2.30.0 => gdm-2.32.2}/gdm-nodocs.patch    |    0
 .../gdm/{gdm-2.30.0 => gdm-2.32.2}/gdm-pam         |    0
 .../gdm/{gdm-2.30.0 => gdm-2.32.2}/gdm.conf        |    0
 .../gdm/{gdm_2.30.0.bb => gdm_2.32.2.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 150f797..0000000
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- gdm-2.26.1/configure.ac-orig	2009-03-16 12:50:10.000000000 -0700
-+++ gdm-2.26.1/configure.ac	2009-06-12 16:40:40.000000000 -0700
-@@ -1085,62 +1085,10 @@ dnl ------------------------------------
- # and /usr/X11 since they often symlink to each other, and configure
- # should use the more stable location (the real directory) if possible.
- #
--if test -x /usr/X11/bin/Xserver; then
--   X_PATH="/usr/X11/bin"
--   X_SERVER_PATH="/usr/X11/bin"
--   X_SERVER="/usr/X11/bin/Xserver"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
--   X_PATH="/usr/X11R6/bin"
--   X_SERVER_PATH="/usr/X11R6/bin"
--   X_SERVER="/usr/X11R6/bin/X"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
--   X_PATH="/usr/X11/bin"
--   X_SERVER_PATH="/usr/X11/bin"
--   X_SERVER="/usr/X11/bin/X"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/X11R6/bin/X; then
--   X_PATH="/usr/X11R6/bin"
--   X_SERVER_PATH="/usr/X11R6/bin"
--   X_SERVER="/usr/X11R6/bin/X"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/bin/Xorg; then
--   X_PATH="/usr/bin"
--   X_SERVER_PATH="/usr/bin"
--   X_SERVER="/usr/bin/Xorg"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/X11/bin/X; then
--   X_PATH="/usr/X11/bin"
--   X_SERVER_PATH="/usr/X11/bin"
--   X_SERVER="/usr/X11/bin/X"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/openwin/bin/Xsun; then
--   # Do not add /usr/openwin/bin here because on Solaris you need
--   # /usr/openwin/bin in your PATH even if you are using the Xorg
--   # Xserver.  We add this to the path below.
--   X_PATH="/usr/openwin/bin"
--   X_SERVER_PATH="/usr/openwin/bin"
--   X_SERVER="/usr/openwin/bin/Xsun"
--   X_CONFIG_OPTIONS="-audit 0 -nobanner"
--elif test -x /opt/X11R6/bin/X; then
--   X_PATH="/opt/X11R6/bin"
--   X_SERVER_PATH="/opt/X11R6/bin"
--   X_SERVER="/opt/X11R6/bin/X"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/bin/X; then
-    X_PATH="/usr/bin"
-    X_SERVER_PATH="/usr/bin"
--   X_SERVER="/usr/bin/X"
-+   X_SERVER="/usr/bin/X"
-    X_CONFIG_OPTIONS="-audit 0"
--else
--   # what to do, what to do, this is wrong, but this just sets the
--   # defaults, perhaps this user is cross compiling or some such
--   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
--   X_SERVER_PATH="/usr/X11R6/bin"
--   X_SERVER="/usr/X11R6/bin/X"
--   X_CONFIG_OPTIONS="-audit 0"
--fi
- 
- dnl ---------------------------------------------------------------------------
- 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
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/%gconf-tree.xml
rename to 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
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/Default
rename to 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
similarity index 69%
rename from meta-gnome/recipes-gnome/gdm/gdm/cross-xdetection.diff
rename to meta-gnome/recipes-gnome/gdm/gdm-2.32.2/cross-xdetection.diff
index 9cb6ac9..bee3511 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 @@
---- /tmp/configure.ac	2008-12-10 08:38:16.000000000 +0100
-+++ gdm-2.24.1/configure.ac	2008-12-10 08:39:17.000000000 +0100
-@@ -1133,80 +1133,10 @@
+From 60084e7e973634971c9643f2459e5d3e248ee3f1 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen at dominion.thruhere.net>
+Date: Thu, 9 Jun 2011 18:12:45 +0200
+Subject: [PATCH] build-sys: hardcode x paths to fix crosscompiling
+
+Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
+---
+ configure.ac |   72 ++++-----------------------------------------------------
+ 1 files changed, 5 insertions(+), 67 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index eeaf3dc..841efe0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1101,73 +1101,11 @@ dnl ---------------------------------------------------------------------------
  dnl - Check for X Server location
  dnl ---------------------------------------------------------------------------
  
@@ -19,36 +31,31 @@
 -   X_PATH="/usr/X11/bin"
 -   X_SERVER_PATH="/usr/X11/bin"
 -   X_SERVER="/usr/X11/bin/Xserver"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
 -   X_CONFIG_OPTIONS="-audit 0"
 -elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
 -   X_PATH="/usr/X11R6/bin"
 -   X_SERVER_PATH="/usr/X11R6/bin"
 -   X_SERVER="/usr/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
 -   X_CONFIG_OPTIONS="-audit 0"
 -elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
 -   X_PATH="/usr/X11/bin"
 -   X_SERVER_PATH="/usr/X11/bin"
 -   X_SERVER="/usr/X11/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
 -   X_CONFIG_OPTIONS="-audit 0"
 -elif test -x /usr/X11R6/bin/X; then
 -   X_PATH="/usr/X11R6/bin"
 -   X_SERVER_PATH="/usr/X11R6/bin"
 -   X_SERVER="/usr/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
 -   X_CONFIG_OPTIONS="-audit 0"
 -elif test -x /usr/bin/Xorg; then
-    X_PATH="/usr/bin"
-    X_SERVER_PATH="/usr/bin"
+-   X_PATH="/usr/bin"
+-   X_SERVER_PATH="/usr/bin"
 -   X_SERVER="/usr/bin/Xorg"
 -   X_CONFIG_OPTIONS="-audit 0"
 -elif test -x /usr/X11/bin/X; then
 -   X_PATH="/usr/X11/bin"
 -   X_SERVER_PATH="/usr/X11/bin"
 -   X_SERVER="/usr/X11/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
 -   X_CONFIG_OPTIONS="-audit 0"
 -elif test -x /usr/openwin/bin/Xsun; then
 -   # Do not add /usr/openwin/bin here because on Solaris you need
@@ -62,7 +69,6 @@
 -   X_PATH="/opt/X11R6/bin"
 -   X_SERVER_PATH="/opt/X11R6/bin"
 -   X_SERVER="/opt/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
 -   X_CONFIG_OPTIONS="-audit 0"
 -elif test -x /usr/bin/X; then
 -   X_PATH="/usr/bin"
@@ -73,12 +79,18 @@
 -   # what to do, what to do, this is wrong, but this just sets the
 -   # defaults, perhaps this user is cross compiling or some such
 -   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
--   X_SERVER_PATH="/usr/X11R6/bin"
--   X_SERVER="/usr/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
-+   X_SERVER="/etc/X11/Xserver"
-    X_CONFIG_OPTIONS="-audit 0"
+-   X_SERVER_PATH="/usr/bin"
+-   X_SERVER="/usr/bin/X"
+-   X_CONFIG_OPTIONS="-audit 0"
 -fi
++# We hardcode the X paths since we know where it will be in the OE univers
++X_PATH="/usr/bin"
++X_SERVER_PATH="/usr/bin"
++X_SERVER="/usr/bin/X"
++X_CONFIG_OPTIONS="-audit 0"
  
- # Don't add bindir to GDM_USER_PATH if it is already in the PATH.
- # If it is /bin or /usr/bin, for example.
+ dnl ---------------------------------------------------------------------------
+ dnl - Check for Xnest / Xephyr support
+-- 
+1.6.6.1
+
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm b/meta-gnome/recipes-gnome/gdm/gdm-2.32.2/gdm
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm
rename to 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
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-nodocs.patch
rename to 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
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm-pam
rename to 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
similarity index 100%
rename from meta-gnome/recipes-gnome/gdm/gdm-2.30.0/gdm.conf
rename to 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
similarity index 93%
rename from meta-gnome/recipes-gnome/gdm/gdm_2.30.0.bb
rename to meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb
index 918c8e4..d24659a 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"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r3"
-
 DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
 
 inherit gnome update-rc.d
@@ -17,8 +15,6 @@ SRC_URI += " \
             file://Default \
            "
 
-SRC_URI[archive.md5sum] = "0da84637abbcbf1666529d6192a81e6b"
-SRC_URI[archive.sha256sum] = "ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15"
 
 EXTRA_OECONF = " --enable-authentication-scheme=shadow \
                  --enable-debug=yes \

More information about the Openembedded-commits mailing list