diff options
Diffstat (limited to 'extra/xfce4-session')
| -rw-r--r-- | extra/xfce4-session/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/xfce4-session/gdm.patch | 21 |
2 files changed, 29 insertions, 4 deletions
diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index 905d8ef2f..3ab60ac0a 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 119480 2011-04-11 18:13:13Z andyrtr $ +# $Id: PKGBUILD 136121 2011-08-23 06:05:20Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-session pkgver=4.8.1 -pkgrel=2 +pkgrel=3 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -22,13 +22,17 @@ options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2 org.freedesktop.consolekit.pkla - org.freedesktop.upower.pkla) + org.freedesktop.upower.pkla + gdm.patch) md5sums=('478080ff666fdd36786a243829663efd' '2e2519950d8c591dc9440ed8957a49ed' - '5fa270637b5e685f033863d8664795a2') + '5fa270637b5e685f033863d8664795a2' + '61423d0e235cad7ffcbbdacc96c9151b') build() { cd ${srcdir}/${pkgname}-${pkgver} + # fix usage with gdm and custom langs https://bugs.archlinux.org/task/24327 + patch -Np1 -i ${srcdir}/gdm.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/xfce4 \ diff --git a/extra/xfce4-session/gdm.patch b/extra/xfce4-session/gdm.patch new file mode 100644 index 000000000..e89e6a0b6 --- /dev/null +++ b/extra/xfce4-session/gdm.patch @@ -0,0 +1,21 @@ +From 3bba8eb773a96339fb841c76b04f2d4fd3317814 Mon Sep 17 00:00:00 2001 +From: Panu Matilainen <pmatilai@laiskiainen.org> +Date: Wed, 23 Mar 2011 21:13:40 +0000 +Subject: Fix GDM_LANG usage to be compatible with GDM3 (bug #7400). + +--- +diff --git a/xfce4-session/main.c b/xfce4-session/main.c +index ff6e324..fcf69f8 100644 +--- a/xfce4-session/main.c ++++ b/xfce4-session/main.c +@@ -103,7 +103,7 @@ setup_environment (void) + + /* this is for compatibility with the GNOME Display Manager */ + lang = g_getenv ("GDM_LANG"); +- if (lang != NULL) ++ if (lang != NULL && strlen (lang) > 0) + { + xfce_setenv ("LANG", lang, TRUE); + xfce_unsetenv ("GDM_LANG"); +-- +cgit |