[arch-commits] Commit in xfce4-session/trunk (PKGBUILD gdm.patch)

[Allan McRae]

Date: Friday, September 16, 2011 @ 22:25:10
  Author: allan
Revision: 138126

upgpkg: xfce4-session 4.8.2-1

upstream update, remove patch included upstream

Modified:
  xfce4-session/trunk/PKGBUILD
Deleted:
  xfce4-session/trunk/gdm.patch

---+
 PKGBUILD  |   15 ++-
 gdm.patch |   21 -
 2 files changed, 6 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-17 02:23:22 UTC (rev 138125)
+++ PKGBUILD2011-09-17 02:25:10 UTC (rev 138126)
@@ -3,8 +3,8 @@
 # Contributor: tobias tobias funnychar archlinux.org
 
 pkgname=xfce4-session
-pkgver=4.8.1
-pkgrel=3
+pkgver=4.8.2
+pkgrel=1
 pkgdesc=A session manager for Xfce
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -22,17 +22,14 @@
 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
-   gdm.patch)
-md5sums=('478080ff666fdd36786a243829663efd'
+   org.freedesktop.upower.pkla)
+md5sums=('48780cbcf784ab64debc9312f17765f2'
  '2e2519950d8c591dc9440ed8957a49ed'
- '5fa270637b5e685f033863d8664795a2'
- '61423d0e235cad7ffcbbdacc96c9151b')
+ '5fa270637b5e685f033863d8664795a2')
 
 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 \

Deleted: gdm.patch
===
--- gdm.patch   2011-09-17 02:23:22 UTC (rev 138125)
+++ gdm.patch   2011-09-17 02:25:10 UTC (rev 138126)
@@ -1,21 +0,0 @@
-From 3bba8eb773a96339fb841c76b04f2d4fd3317814 Mon Sep 17 00:00:00 2001
-From: Panu Matilainen pmati...@laiskiainen.org
-Date: Wed, 23 Mar 2011 21:13:40 +
-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 

[arch-commits] Commit in xfce4-session/trunk (PKGBUILD gdm.patch)

[andyrtr]

Date: Monday, August 22, 2011 @ 09:07:22
  Author: andyrtr
Revision: 136074

upgpkg: xfce4-session 4.8.1-3

fix to work with gdm and custom languages; FS#24327

Added:
  xfce4-session/trunk/gdm.patch
Modified:
  xfce4-session/trunk/PKGBUILD

---+
 PKGBUILD  |   10 +++---
 gdm.patch |   21 +
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-08-22 13:06:08 UTC (rev 136073)
+++ PKGBUILD2011-08-22 13:07:22 UTC (rev 136074)
@@ -4,7 +4,7 @@
 
 pkgname=xfce4-session
 pkgver=4.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc=A session manager for Xfce
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -22,13 +22,17 @@
 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 \

Added: gdm.patch
===
--- gdm.patch   (rev 0)
+++ gdm.patch   2011-08-22 13:07:22 UTC (rev 136074)
@@ -0,0 +1,21 @@
+From 3bba8eb773a96339fb841c76b04f2d4fd3317814 Mon Sep 17 00:00:00 2001
+From: Panu Matilainen pmati...@laiskiainen.org
+Date: Wed, 23 Mar 2011 21:13:40 +
+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