Date: Saturday, December 22, 2012 @ 17:26:11 Author: foutrelis Revision: 173786
archrelease: copy trunk to extra-i686, extra-x86_64 Added: exo/repos/extra-i686/PKGBUILD (from rev 173785, exo/trunk/PKGBUILD) exo/repos/extra-i686/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch (from rev 173785, exo/trunk/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch) exo/repos/extra-i686/exo.install (from rev 173785, exo/trunk/exo.install) exo/repos/extra-x86_64/PKGBUILD (from rev 173785, exo/trunk/PKGBUILD) exo/repos/extra-x86_64/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch (from rev 173785, exo/trunk/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch) exo/repos/extra-x86_64/exo.install (from rev 173785, exo/trunk/exo.install) Deleted: exo/repos/extra-i686/PKGBUILD exo/repos/extra-i686/exo.install exo/repos/extra-x86_64/PKGBUILD exo/repos/extra-x86_64/exo.install -----------------------------------------------------------------------+ extra-i686/PKGBUILD | 94 +++++----- extra-i686/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch | 61 ++++++ extra-i686/exo.install | 26 +- extra-x86_64/PKGBUILD | 94 +++++----- extra-x86_64/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch | 61 ++++++ extra-x86_64/exo.install | 26 +- 6 files changed, 248 insertions(+), 114 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-12-22 22:25:32 UTC (rev 173785) +++ extra-i686/PKGBUILD 2012-12-22 22:26:11 UTC (rev 173786) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: tobias <tobias funnychar archlinux.org> -# Contributor: Aurelien Foret <orel...@chez.com> - -pkgname=exo -pkgver=0.10.1 -pkgrel=1 -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') -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') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Python 2 fix - export PYTHON=python2 - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: Copied: exo/repos/extra-i686/PKGBUILD (from rev 173785, exo/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-12-22 22:26:11 UTC (rev 173786) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: tobias <tobias funnychar archlinux.org> +# Contributor: Aurelien Foret <orel...@chez.com> + +pkgname=exo +pkgver=0.10.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' '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 + 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 + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --enable-gtk-doc \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Copied: exo/repos/extra-i686/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch (from rev 173785, exo/trunk/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch) =================================================================== --- extra-i686/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch (rev 0) +++ extra-i686/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch 2012-12-22 22:26:11 UTC (rev 173786) @@ -0,0 +1,61 @@ +From a54bc42cb5f06f06141d8ed2434719bf7c200aaf Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evange...@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 + Deleted: extra-i686/exo.install =================================================================== --- extra-i686/exo.install 2012-12-22 22:25:32 UTC (rev 173785) +++ extra-i686/exo.install 2012-12-22 22:26:11 UTC (rev 173786) @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: exo/repos/extra-i686/exo.install (from rev 173785, exo/trunk/exo.install) =================================================================== --- extra-i686/exo.install (rev 0) +++ extra-i686/exo.install 2012-12-22 22:26:11 UTC (rev 173786) @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-12-22 22:25:32 UTC (rev 173785) +++ extra-x86_64/PKGBUILD 2012-12-22 22:26:11 UTC (rev 173786) @@ -1,44 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: tobias <tobias funnychar archlinux.org> -# Contributor: Aurelien Foret <orel...@chez.com> - -pkgname=exo -pkgver=0.10.1 -pkgrel=1 -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') -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') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Python 2 fix - export PYTHON=python2 - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --enable-gtk-doc \ - --disable-debug - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: Copied: exo/repos/extra-x86_64/PKGBUILD (from rev 173785, exo/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-12-22 22:26:11 UTC (rev 173786) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: tobias <tobias funnychar archlinux.org> +# Contributor: Aurelien Foret <orel...@chez.com> + +pkgname=exo +pkgver=0.10.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' '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 + 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 + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --enable-gtk-doc \ + --disable-debug + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: Copied: exo/repos/extra-x86_64/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch (from rev 173785, exo/trunk/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch) =================================================================== --- extra-x86_64/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch (rev 0) +++ extra-x86_64/drop-HAVE_GIO_UNIX-ifdef-and-load-gio-unix-2.0-pkg.patch 2012-12-22 22:26:11 UTC (rev 173786) @@ -0,0 +1,61 @@ +From a54bc42cb5f06f06141d8ed2434719bf7c200aaf Mon Sep 17 00:00:00 2001 +From: Evangelos Foutras <evange...@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 + Deleted: extra-x86_64/exo.install =================================================================== --- extra-x86_64/exo.install 2012-12-22 22:25:32 UTC (rev 173785) +++ extra-x86_64/exo.install 2012-12-22 22:26:11 UTC (rev 173786) @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: Copied: exo/repos/extra-x86_64/exo.install (from rev 173785, exo/trunk/exo.install) =================================================================== --- extra-x86_64/exo.install (rev 0) +++ extra-x86_64/exo.install 2012-12-22 22:26:11 UTC (rev 173786) @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: