[arch-commits] Commit in exo/trunk (2 files)
Evangelos Foutras
foutrelis at archlinux.org
Sat Dec 22 22:25:32 UTC 2012
Date: Saturday, December 22, 2012 @ 17:25:32
Author: foutrelis
Revision: 173785
upgpkg: exo 0.10.1-2
Fix launching of .desktop files (FS#33125).
Added:
exo/trunk/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch
Modified:
exo/trunk/PKGBUILD
----------------------------------------------------------+
PKGBUILD | 14 ++
drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch | 61 +++++++++++++
2 files changed, 71 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-12-22 21:02:43 UTC (rev 173784)
+++ PKGBUILD 2012-12-22 22:25:32 UTC (rev 173785)
@@ -5,23 +5,29 @@
pkgname=exo
pkgver=0.10.1
-pkgrel=1
+pkgrel=2
pkgdesc="Extensions to Xfce by os-cillation"
arch=('i686' 'x86_64')
url="http://www.xfce.org/"
license=('GPL2' 'LGPL')
groups=('xfce4')
depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
-makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
+makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth' 'xfce4-dev-tools')
optdepends=('perl-uri: for mail-compose helper script')
options=('!libtool')
install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896')
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2
+ drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch)
+sha256sums=('34a6d14c58a12d3372eb810d05ae425b8c8c32ec976b99b6ad274c3f7b3f6896'
+ '9983b3206391f0e86816d70ded4fc5ddd48ac27dd29b266d4ba4a930ca663626')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # Fix launching of .desktop files (https://bugs.archlinux.org/task/33125)
+ patch -Np1 -i "$srcdir/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch"
+ NOCONFIGURE=1 xdt-autogen
+
# Python 2 fix
export PYTHON=python2
Added: drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch
===================================================================
--- drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch (rev 0)
+++ drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch 2012-12-22 22:25:32 UTC (rev 173785)
@@ -0,0 +1,61 @@
+From a54bc42cb5f06f06141d8ed2434719bf7c200aaf Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Sun, 23 Dec 2012 00:09:34 +0200
+Subject: [PATCH] Drop HAVE_GIO_UNIX ifdef and load gio-unix-2.0 pkg
+
+This restores exo-open's .desktop file launching functionality.
+---
+ configure.ac.in | 1 +
+ exo-open/main.c | 9 ---------
+ 2 files changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 0c8b3a1..ec9be67 100644
+--- a/configure.ac.in
++++ b/configure.ac
+@@ -159,6 +159,7 @@ dnl *** Check for required packages ***
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
+ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
++XDT_CHECK_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+diff --git a/exo-open/main.c b/exo-open/main.c
+index 059fad4..da78f6a 100644
+--- a/exo-open/main.c
++++ b/exo-open/main.c
+@@ -32,9 +32,7 @@
+
+ #include <glib/gstdio.h>
+ #include <gio/gio.h>
+-#ifdef HAVE_GIO_UNIX
+ #include <gio/gdesktopappinfo.h>
+-#endif
+ #include <exo/exo.h>
+
+
+@@ -143,7 +141,6 @@ usage (void)
+ static gboolean
+ exo_open_launch_desktop_file (const gchar *arg)
+ {
+-#ifdef HAVE_GIO_UNIX
+ GFile *gfile;
+ gchar *contents;
+ gsize length;
+@@ -191,12 +188,6 @@ exo_open_launch_desktop_file (const gchar *arg)
+ #endif
+
+ return result;
+-#else /* !HAVE_GIO_UNIX */
+- g_critical (_("Launching desktop files is not supported when %s is compiled "
+- "without GIO-Unix features."), g_get_prgname ());
+-
+- return FALSE;
+-#endif
+ }
+
+
+--
+1.8.0.2
+
More information about the arch-commits
mailing list