rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

Accepting request 27497 from home:vuntz:branches:GNOME:Factory

Browse Source 
Copy from home:vuntz:branches:GNOME:Factory/gdm via accept of submit request 27497 revision 2.
Request was accepted with message:
accept

OBS-URL: https://build.opensuse.org/request/show/27497
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=109
This commit is contained in:
Vincent Untz 2009-12-24 15:29:32 +00:00 committed by Git OBS Bridge
parent 85b0313b50
commit 35c884f0e5
6 changed files with 69 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gdm-2.29.1.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ca5d04512cb51ea2288661f9e5786645485ede2e3d510b0998bd75ea1ce1ff5
size 2337055

3
gdm-2.29.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb0b2a7d8c832afb275a3a4c95b91097f18e9e2c0acc6bdbaa63ec466507c320
size 2360981

64
gdm-helper-directory.patch
View File

@ -1,8 +1,8 @@
Index: gdm-2.29.1/configure.ac Index: gdm-2.29.4/configure.ac
=================================================================== ===================================================================
--- gdm-2.29.1.orig/configure.ac --- gdm-2.29.4.orig/configure.ac
+++ gdm-2.29.1/configure.ac +++ gdm-2.29.4/configure.ac
@@ -990,6 +990,22 @@ fi @@ -990,6 +990,30 @@ fi
AC_SUBST(GDM_CUSTOM_CONF) AC_SUBST(GDM_CUSTOM_CONF)
AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf') AC_SUBST(GDM_OLD_CONF, '${gdmconfdir}/gdm.conf')
@ -21,23 +21,32 @@ Index: gdm-2.29.1/configure.ac
+ +
+CONSOLEKIT_DIR=$with_consolekit_directory +CONSOLEKIT_DIR=$with_consolekit_directory
+AC_SUBST(CONSOLEKIT_DIR) +AC_SUBST(CONSOLEKIT_DIR)
+
+AC_ARG_WITH(polkit-gnome-directory,
+ [AC_HELP_STRING([--with-polkit-gnome-directory],
+ [Specify the directory of polkit-gnome-authentication-agent-1 @<:@default=libexecdir@:>@])],,
+ [with_polkit_gnome_directory="\${libexecdir}"])
+
+POLKIT_GNOME_DIR=$with_polkit_gnome_directory
+AC_SUBST(POLKIT_GNOME_DIR)
+ +
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl - Check for XEvIE extension support dnl - Check for XEvIE extension support
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -1417,6 +1433,8 @@ echo " @@ -1417,6 +1441,9 @@ echo "
dmconfdir: ${dmconfdir} dmconfdir: ${dmconfdir}
localstatedir: ${localstatedir} localstatedir: ${localstatedir}
datadir: ${datadir} datadir: ${datadir}
+ g-s-d location: ${with_gnome_settings_daemon_directory} + g-s-d location: ${with_gnome_settings_daemon_directory}
+ consolekit location: ${with_consolekit_directory} + consolekit location: ${with_consolekit_directory}
+ polkit-gnome location: ${with_polkit_gnome_directory}
source code location: ${srcdir} source code location: ${srcdir}
compiler: ${CC} compiler: ${CC}
cflags: ${CFLAGS} cflags: ${CFLAGS}
Index: gdm-2.29.1/daemon/Makefile.am Index: gdm-2.29.4/daemon/Makefile.am
=================================================================== ===================================================================
--- gdm-2.29.1.orig/daemon/Makefile.am --- gdm-2.29.4.orig/daemon/Makefile.am
+++ gdm-2.29.1/daemon/Makefile.am +++ gdm-2.29.4/daemon/Makefile.am
@@ -18,6 +18,7 @@ AM_CPPFLAGS = \ @@ -18,6 +18,7 @@ AM_CPPFLAGS = \
-DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
@ -46,10 +55,10 @@ Index: gdm-2.29.1/daemon/Makefile.am
$(DISABLE_DEPRECATED_CFLAGS) \ $(DISABLE_DEPRECATED_CFLAGS) \
$(DAEMON_CFLAGS) \ $(DAEMON_CFLAGS) \
$(XLIB_CFLAGS) \ $(XLIB_CFLAGS) \
Index: gdm-2.29.1/daemon/gdm-server.c Index: gdm-2.29.4/daemon/gdm-server.c
=================================================================== ===================================================================
--- gdm-2.29.1.orig/daemon/gdm-server.c --- gdm-2.29.4.orig/daemon/gdm-server.c
+++ gdm-2.29.1/daemon/gdm-server.c +++ gdm-2.29.4/daemon/gdm-server.c
@@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device @@ -127,7 +127,7 @@ _gdm_server_query_ck_for_display_device
g_return_val_if_fail (GDM_IS_SERVER (server), NULL); g_return_val_if_fail (GDM_IS_SERVER (server), NULL);
@ -59,24 +68,25 @@ Index: gdm-2.29.1/daemon/gdm-server.c
server->priv->display_name); server->priv->display_name);
g_debug ("GdmServer: Running helper %s", command); g_debug ("GdmServer: Running helper %s", command);
Index: gdm-2.29.1/data/greeter-autostart/Makefile.am Index: gdm-2.29.4/data/greeter-autostart/Makefile.am
=================================================================== ===================================================================
--- gdm-2.29.1.orig/data/greeter-autostart/Makefile.am --- gdm-2.29.4.orig/data/greeter-autostart/Makefile.am
+++ gdm-2.29.1/data/greeter-autostart/Makefile.am +++ gdm-2.29.4/data/greeter-autostart/Makefile.am
@@ -5,7 +5,8 @@ edit = sed \ @@ -5,7 +5,9 @@ edit = sed \
-e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' \
-e 's|@LIBDIR[@]|$(libdir)|g' \ -e 's|@LIBDIR[@]|$(libdir)|g' \
-e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \ -e 's|@LIBEXECDIR[@]|$(libexecdir)|g' \
- -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' - -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g'
+ -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \ + -e 's|@LOCALSTATEDIR[@]|$(localstatedir)|g' \
+ -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g' + -e 's|@GNOME_SETTINGS_DAEMON_DIR[@]|$(GNOME_SETTINGS_DAEMON_DIR)|g' \
+ -e 's|@POLKIT_GNOME_DIR[@]|$(POLKIT_GNOME_DIR)|g'
%.desktop.in: %.desktop.in.in Makefile %.desktop.in: %.desktop.in.in Makefile
$(edit) $< >$@ $(edit) $< >$@
Index: gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in Index: gdm-2.29.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
=================================================================== ===================================================================
--- gdm-2.29.1.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in --- gdm-2.29.4.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
+++ gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in +++ gdm-2.29.4/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
@ -88,16 +98,14 @@ Index: gdm-2.29.1/data/greeter-autostart/gnome-settings-daemon.desktop.in.in
OnlyShowIn=GNOME; OnlyShowIn=GNOME;
X-GNOME-Autostart-Phase=Initialization X-GNOME-Autostart-Phase=Initialization
X-GNOME-Autostart-Notify=true X-GNOME-Autostart-Notify=true
Index: gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in Index: gdm-2.29.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
=================================================================== ===================================================================
--- gdm-2.29.1.orig/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in --- gdm-2.29.4.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
+++ gdm-2.29.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in +++ gdm-2.29.4/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
@@ -1,7 +1,7 @@ @@ -1,5 +1,5 @@
[Desktop Entry] [Desktop Entry]
Type=Application Type=Application
_Name=AT SPI Registry Wrapper _Name=PolicyKit Authentication Agent
-Exec=@LIBEXECDIR@/at-spi-registryd -Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
+Exec=@AT_SPI_REGISTRYD_DIR@/at-spi-registryd +Exec=@POLKIT_GNOME_DIR@/polkit-gnome-authentication-agent-1
OnlyShowIn=GNOME; OnlyShowIn=GNOME;
AutostartCondition=GNOME /desktop/gnome/interface/accessibility
X-GNOME-Autostart-Phase=Initialization

20
gdm-selinux.patch
View File

@ -1,17 +1,21 @@
--- configure.org 2008-12-29 09:24:05.000000000 +1100 Index: configure
+++ configure 2008-12-29 09:24:19.000000000 +1100 ===================================================================
@@ -35527,7 +35527,7 @@ cat >>confdefs.h <<\_ACEOF --- configure.orig
#define HAVE_SELINUX 1 +++ configure
_ACEOF @@ -22413,7 +22413,7 @@ fi
$as_echo "#define HAVE_SELINUX 1" >>confdefs.h
- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr" - EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux -lattr"
+ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux" + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lselinux"
fi fi
--- configure.ac.org 2008-12-29 09:25:17.000000000 +1100 Index: configure.ac
+++ configure.ac 2008-12-29 09:25:22.000000000 +1100 ===================================================================
@@ -873,7 +873,7 @@ if test "x$with_selinux" = "xyes" ; then --- configure.ac.orig
+++ configure.ac
@@ -859,7 +859,7 @@ if test "x$with_selinux" = "xyes" ; then
AC_CHECK_LIB(selinux,setexeccon,/bin/true) AC_CHECK_LIB(selinux,setexeccon,/bin/true)
AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true) AC_CHECK_LIB(selinux,is_selinux_enabled,/bin/true)
AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux]) AC_DEFINE(HAVE_SELINUX, 1, [Define if have selinux])

15
gdm.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Wed Dec 23 00:25:29 CET 2009 - vuntz@opensuse.org
- Update to version 2.29.4:
+ Remove deprecated function g_mapped_file_free
+ Fix option widgets to work better with orca
+ Make --with-custom-conf work
+ Don't hard code path to policykit agent
+ Don't backup xkb configuration before login
- Update gdm-helper-directory.patch: some part is now fixed
upstream, and we also need to set the right path for the
polkit-gnome agent.
- Pass --with-polkit-gnome-directory to configure.
- Update gdm-selinux.patch to apply without fuzz.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 3 11:13:08 CET 2009 - vuntz@opensuse.org Thu Dec 3 11:13:08 CET 2009 - vuntz@opensuse.org

5
gdm.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gdm (Version 2.29.1) # spec file for package gdm (Version 2.29.4)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -42,7 +42,7 @@ BuildRequires: xorg-x11-server-extra
BuildRequires: zenity BuildRequires: zenity
License: GPLv2+ License: GPLv2+
Group: System/GUI/GNOME Group: System/GUI/GNOME
Version: 2.29.1 Version: 2.29.4
Release: 1 Release: 1
Summary: The GNOME 2.x Display Manager Summary: The GNOME 2.x Display Manager
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
@ -168,6 +168,7 @@ autoreconf -f -i
--with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \ --with-at-spi-registryd-directory=%{_libexecdir}/at-spi2 \
--with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \ --with-gnome-settings-daemon-directory=%{_libexecdir}/gnome-settings-daemon \
--with-consolekit-directory=%{_libexecdir}/ConsoleKit \ --with-consolekit-directory=%{_libexecdir}/ConsoleKit \
--with-polkit-gnome-directory=%{_libexecdir}/polkit-gnome \
--with-selinux \ --with-selinux \
--enable-ipv6\ --enable-ipv6\
--disable-scrollkeeper --disable-scrollkeeper