[arch-commits] Commit in libxfcegui4/trunk (2 files)

[Evangelos Foutras]

    Date: Sunday, March 1, 2015 @ 12:17:55
  Author: foutrelis
Revision: 232227

upgpkg: libxfcegui4 4.10.0-4

Fix missing xfce_setenv() with libxfce4util 4.12.0.

Added:
  libxfcegui4/trunk/libxfcegui4-4.10.0-no-xfce_setenv.patch
Modified:
  libxfcegui4/trunk/PKGBUILD

-----------------------------------------+
 PKGBUILD                                |   15 ++++++++++++---
 libxfcegui4-4.10.0-no-xfce_setenv.patch |   14 ++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-01 11:17:29 UTC (rev 232226)
+++ PKGBUILD	2015-03-01 11:17:55 UTC (rev 232227)
@@ -4,7 +4,7 @@
 
 pkgname=libxfcegui4
 pkgver=4.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Various Gtk widgets for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -13,9 +13,18 @@
          'hicolor-icon-theme')
 makedepends=('intltool')
 install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-sha256sums=('2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
+        libxfcegui4-4.10.0-no-xfce_setenv.patch)
+sha256sums=('2b82f9979175d8856880c8f349e6eede491ca92fe6940c69c8958115418d4533'
+            'd1f4603b5eeef92d5d256d8f766e516395947d72e16db68ce47e472130b94616')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # https://bugzilla.xfce.org/show_bug.cgi?id=10974
+  patch -Np0 -i "$srcdir/libxfcegui4-4.10.0-no-xfce_setenv.patch"
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 

Added: libxfcegui4-4.10.0-no-xfce_setenv.patch
===================================================================
--- libxfcegui4-4.10.0-no-xfce_setenv.patch	                        (rev 0)
+++ libxfcegui4-4.10.0-no-xfce_setenv.patch	2015-03-01 11:17:55 UTC (rev 232227)
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/513568
+http://bugzilla.xfce.org/show_bug.cgi?id=10974
+
+--- libxfcegui4/xfce-exec.c
++++ libxfcegui4/xfce-exec.c
+@@ -79,7 +79,7 @@
+ #ifndef G_OS_WIN32
+     gchar *dpyname = user_data;
+     
+-    xfce_setenv ("DISPLAY", dpyname, TRUE);
++    g_setenv ("DISPLAY", dpyname, TRUE);
+ #endif
+ }
+