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

[Evangelos Foutras]

    Date: Monday, June 26, 2017 @ 14:02:24
  Author: foutrelis
Revision: 299271

upgpkg: xfdesktop 4.12.4-1

New upstream release.

Modified:
  xfdesktop/trunk/PKGBUILD
Deleted:
  xfdesktop/trunk/0001-Settings-Allow-directories-to-be-selected.patch

------------------------------------------------------+
 0001-Settings-Allow-directories-to-be-selected.patch |   29 -----------------
 PKGBUILD                                             |   15 ++------
 2 files changed, 4 insertions(+), 40 deletions(-)

Deleted: 0001-Settings-Allow-directories-to-be-selected.patch
===================================================================
--- 0001-Settings-Allow-directories-to-be-selected.patch	2017-06-26 13:45:10 UTC (rev 299270)
+++ 0001-Settings-Allow-directories-to-be-selected.patch	2017-06-26 14:02:24 UTC (rev 299271)
@@ -1,29 +0,0 @@
-From cc311b61b82b7510a3a6cb0952d3a331e3551e05 Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel at gmail.com>
-Date: Mon, 13 Jun 2016 15:08:11 +0300
-Subject: [PATCH] Settings: Allow directories to be selected
-
-Gtk3 isn't as bright as Gtk2 so we need to add directories to the
-filter for the GtkFileChooser, otherwise you can't select
-directories while in directory mode...
----
- settings/main.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/settings/main.c b/settings/main.c
-index ce08110..39eeafa 100644
---- a/settings/main.c
-+++ b/settings/main.c
-@@ -1852,6 +1852,9 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml,
-     filter = gtk_file_filter_new();
-     gtk_file_filter_set_name(filter, _("Image files"));
-     gtk_file_filter_add_pixbuf_formats(filter);
-+    gtk_file_filter_add_mime_type(filter, "inode/directory");
-+    gtk_file_filter_add_mime_type(filter, "application/x-directory");
-+    gtk_file_filter_add_mime_type(filter, "text/directory");
-     gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(panel->btn_folder), filter);
- 
-     /* Get default wallpaper folder */
--- 
-2.9.3
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-26 13:45:10 UTC (rev 299270)
+++ PKGBUILD	2017-06-26 14:02:24 UTC (rev 299271)
@@ -3,8 +3,8 @@
 # Contributor: tobias <tobias funnychar archlinux.org>
 
 pkgname=xfdesktop
-pkgver=4.12.3
-pkgrel=3
+pkgver=4.12.4
+pkgrel=1
 pkgdesc="A desktop manager for Xfce"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -14,16 +14,9 @@
 makedepends=('intltool')
 conflicts=('xfce4-menueditor')
 replaces=('xfce4-menueditor')
-source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2
-        0001-Settings-Allow-directories-to-be-selected.patch)
-sha256sums=('a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac'
-            '6dbd98fc621b5da741d4528c884e0eb9e1c045407879b3d046a1a7faae00bac6')
+source=(http://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
+sha256sums=('098a35510562907e1431d5adbfa8307484a235c1dec6a43e2d58d2ac4241f1cb')
 
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ../0001-Settings-Allow-directories-to-be-selected.patch
-}
-
 build() {
   cd "$srcdir/$pkgname-$pkgver"