[Frugalware-git] pam: gdm-2.28.0-2-i686 *added libxklavier support

[bouleetbil]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pam.git;a=commitdiff;h=30b83e5200be59e964eedf7477c1046e95a4475a

commit 30b83e5200be59e964eedf7477c1046e95a4475a
Author: bouleetbil <bouleetbil at frogdev.info>
Date:   Wed Oct 7 12:20:39 2009 +0200

gdm-2.28.0-2-i686
*added libxklavier support

diff --git a/source/gnome/gdm/FrugalBuild b/source/gnome/gdm/FrugalBuild
index cb93386..0d2bd86 100644
--- a/source/gnome/gdm/FrugalBuild
+++ b/source/gnome/gdm/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=gdm
pkgver=2.28.0
-pkgrel=1
+pkgrel=2
pkgdesc="GNOME Display Manager"
url="http://www.gnome.org/"
backup=(etc/gdm/custom.conf etc/pam.d/gdm etc/pam.d/gdm-autologin)
@@ -16,10 +16,10 @@ groups=('gnome' 'gnome-minimal')
archs=('i686' 'x86_64' 'ppc')
Finclude gnome
source=(${source[@]}
-	http://ftp.frugalware.org/pub/other/artwork/gdm-theme/GDM-Frugalware-1.1.tar.bz2 \
+	libxklavier.diff \
polkit-gnome-authentication-agent-1.desktop)
sha1sums=('e1975ccc92048de4b6e1e13a09b54a50d5fdb48a' \
-          '113b0b7f5caebbb72e184a3e36e54cdad7f1660a' \
+          '010cef9dccd94a68e8b41c2c7fa910af20e8b496' \
'93d1f9a7d068dd8e70c930abea9acf5b770a3485')

conflicts=('fast-user-switch-applet')
@@ -28,7 +28,7 @@ replaces=('fast-user-switch-applet')

build() {
Fpatchall
-
+	Fautoreconf
Fmake --enable-authentication-scheme=pam \
--enable-profiling \
--enable-console-helper \
@@ -41,15 +41,8 @@ build() {
chmod a+r $Fdestdir/var/gdm || Fdie
chown root:root $Fdestdir/var/gdm || Fdie

-	# Install our GDM theme.
-	Fmkdir usr/share/gdm/themes/
-	mv $Fsrcdir/Frugalware $Fdestdir/usr/share/gdm/themes/Frugalware || Fdie
-
Fcp polkit-gnome-authentication-agent-1.desktop usr/share/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop

-	#delete broken gdm !!
-	#Frm sbin/gdm
-	#Fln sbin/gdm /sbin/gdm-binary

#delete PAM default rules
Frm etc/pam.d/*
diff --git a/source/gnome/gdm/libxklavier.diff b/source/gnome/gdm/libxklavier.diff
new file mode 100644
index 0000000..8278ede
--- /dev/null
+++ b/source/gnome/gdm/libxklavier.diff
@@ -0,0 +1,52 @@
+ configure.ac |   30 ++++++++++++++++++++----------
+ 1 files changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index be6580d..04d58cc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -106,17 +106,26 @@ PKG_CHECK_MODULES(SIMPLE_GREETER,
+ AC_SUBST(SIMPLE_GREETER_CFLAGS)
+ AC_SUBST(SIMPLE_GREETER_LIBS)
+
+-PKG_CHECK_MODULES(LIBXKLAVIER,
+-        libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
+-        have_libxklavier=yes,
+-        have_libxklavier=no)
+-if test "x$have_libxklavier" = "xyes" ; then
+-  AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
++AC_ARG_ENABLE([libxklavier],
++	AS_HELP_STRING([--enable-libxklavier],
++		       [Enable libxklavier support @<:@default=yes@:>@]),
++	enable_libxklavier=$enableval,
++	enable_libxklavier=yes)
++have_libxklavier=no
++if test "x$enable_libxklavier" = "xyes"; then
++   PKG_CHECK_MODULES(LIBXKLAVIER,
++	  libxklavier >= $LIBXKLAVIER_REQUIRED_VERSION,
++          have_libxklavier=yes,
++          have_libxklavier=no)
++   if test "x$have_libxklavier" = "xyes" ; then
++      AC_DEFINE(HAVE_LIBXKLAVIER, [], [Define if we have libxklavier])
++   fi
++   AC_SUBST(HAVE_LIBXKLAVIER)
++   AC_SUBST(LIBXKLAVIER_CFLAGS)
++   AC_SUBST(LIBXKLAVIER_LIBS)
+ fi
++
+ AM_CONDITIONAL(HAVE_LIBXKLAVIER, test x$have_libxklavier = xyes)
+-AC_SUBST(HAVE_LIBXKLAVIER)
+-AC_SUBST(LIBXKLAVIER_CFLAGS)
+-AC_SUBST(LIBXKLAVIER_LIBS)
+
+ PKG_CHECK_MODULES(POLKIT_GNOME,
+         polkit-gnome >= $POLICYKIT_REQUIRED_VERSION,
+@@ -1420,6 +1429,7 @@ echo \
+ "        Xinerama support:         ${XINERAMA_SUPPORT}
+         XDMCP support:            ${XDMCP_SUPPORT}
+         SELinux support:          ${with_selinux}
+-        ConsoleKit support:       ${use_console_kit}
++        ConsoleKit  support:      ${use_console_kit}
++	Libxklavier support:	  ${have_libxklavier}
+         Build with RBAC:          ${msg_rbac_shutdown}
+ "