[arch-commits] Commit in thunar/repos/extra-x86_64 (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun May 19 00:18:06 UTC 2019
Date: Sunday, May 19, 2019 @ 00:18:05
Author: foutrelis
Revision: 353614
archrelease: copy trunk to extra-x86_64
Added:
thunar/repos/extra-x86_64/PKGBUILD
(from rev 353613, thunar/trunk/PKGBUILD)
Deleted:
thunar/repos/extra-x86_64/PKGBUILD
thunar/repos/extra-x86_64/thunar-bz14946.patch
thunar/repos/extra-x86_64/thunar-bz15200.patch
----------------------+
PKGBUILD | 106 ++++++++++++++++++++++---------------------------
thunar-bz14946.patch | 22 ----------
thunar-bz15200.patch | 80 ------------------------------------
3 files changed, 48 insertions(+), 160 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-05-19 00:17:59 UTC (rev 353613)
+++ PKGBUILD 2019-05-19 00:18:05 UTC (rev 353614)
@@ -1,58 +0,0 @@
-# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
-# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
-
-pkgname=thunar
-pkgver=1.8.5
-pkgrel=1
-pkgdesc="Modern file manager for Xfce"
-arch=('x86_64')
-url="https://docs.xfce.org/xfce/thunar/start"
-license=('GPL2' 'LGPL2.1')
-groups=('xfce4')
-depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify'
- 'libgudev' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
-makedepends=('intltool' 'xfce4-panel')
-optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
- 'xfce4-panel: for trash applet'
- 'tumbler: for thumbnail previews'
- 'thunar-volman: manages removable devices'
- 'thunar-archive-plugin: create and deflate archives'
- 'thunar-media-tags-plugin: view/edit id3/ogg tags')
-source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2
- thunar-bz14946.patch
- thunar-bz15200.patch)
-sha256sums=('caeecb82b33057bbec24164bbd47ef84bec927149daeac3bcad72499a4f92e4a'
- '749881ff877d05c442db05b4724ef8847198c136d73615c9492acd4ec3f4a967'
- '262a64edf64e0070c1a189368c2b1c2929ed0b8566a1bc74f6042b6c54d21941')
-
-prepare() {
- cd "$srcdir/Thunar-$pkgver"
-
- # https://bugzilla.xfce.org/show_bug.cgi?id=14946
- patch -Np1 -i ../thunar-bz14946.patch
-
- # https://bugzilla.xfce.org/show_bug.cgi?id=15200
- patch -Np1 -i ../thunar-bz15200.patch
-}
-
-build() {
- cd "$srcdir/Thunar-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-gio-unix \
- --enable-gudev \
- --enable-notifications \
- --enable-exif \
- --enable-pcre \
- --disable-debug
- make
-}
-
-package() {
- cd "$srcdir/Thunar-$pkgver"
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
Copied: thunar/repos/extra-x86_64/PKGBUILD (from rev 353613, thunar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-05-19 00:18:05 UTC (rev 353614)
@@ -0,0 +1,48 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Andrew Simmons <andrew.simmons at gmail.com>
+
+pkgname=thunar
+pkgver=1.8.6
+pkgrel=1
+pkgdesc="Modern file manager for Xfce"
+arch=('x86_64')
+url="https://docs.xfce.org/xfce/thunar/start"
+license=('GPL2' 'LGPL2.1')
+groups=('xfce4')
+depends=('desktop-file-utils' 'libexif' 'hicolor-icon-theme' 'libnotify'
+ 'libgudev' 'exo' 'libxfce4util' 'libxfce4ui' 'libpng')
+makedepends=('intltool' 'xfce4-panel')
+optdepends=('gvfs: for trash support, mounting with udisk and remote filesystems'
+ 'xfce4-panel: for trash applet'
+ 'tumbler: for thumbnail previews'
+ 'thunar-volman: manages removable devices'
+ 'thunar-archive-plugin: create and deflate archives'
+ 'thunar-media-tags-plugin: view/edit id3/ogg tags')
+source=(https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/Thunar-$pkgver.tar.bz2)
+sha256sums=('c0e5fb828e3d036941dfeb7ed7f9f2b17b729fc044c2bf7c4218c1c91b38ef2a')
+
+prepare() {
+ cd "$srcdir/Thunar-$pkgver"
+}
+
+build() {
+ cd "$srcdir/Thunar-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-gio-unix \
+ --enable-gudev \
+ --enable-notifications \
+ --enable-exif \
+ --enable-pcre \
+ --disable-debug
+ make
+}
+
+package() {
+ cd "$srcdir/Thunar-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: thunar-bz14946.patch
===================================================================
--- thunar-bz14946.patch 2019-05-19 00:17:59 UTC (rev 353613)
+++ thunar-bz14946.patch 2019-05-19 00:18:05 UTC (rev 353614)
@@ -1,22 +0,0 @@
-From 4c0e17d7fc78525007833a10524e88d523123a40 Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andre.miranda at liferay.com>
-Date: Wed, 5 Dec 2018 13:27:51 -0300
-Subject: [PATCH] Expand scroll window of file operation progress dialog (Bug
- #14946)
-
----
- thunar/thunar-progress-dialog.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/thunar/thunar-progress-dialog.c b/thunar/thunar-progress-dialog.c
-index 7d227c214..f4de6097f 100644
---- a/thunar/thunar-progress-dialog.c
-+++ b/thunar/thunar-progress-dialog.c
-@@ -368,6 +368,7 @@ thunar_progress_dialog_add_job (ThunarProgressDialog *dialog,
- dialog->scrollwin = gtk_scrolled_window_new (NULL, NULL);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (dialog->scrollwin),
- GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-+ gtk_widget_set_vexpand (dialog->scrollwin, TRUE);
- gtk_container_add (GTK_CONTAINER (dialog->vbox), dialog->scrollwin);
- gtk_widget_show (dialog->scrollwin);
-
Deleted: thunar-bz15200.patch
===================================================================
--- thunar-bz15200.patch 2019-05-19 00:17:59 UTC (rev 353613)
+++ thunar-bz15200.patch 2019-05-19 00:18:05 UTC (rev 353614)
@@ -1,80 +0,0 @@
-From 03b8362dd9946fa4593497672ef4f341330170ed Mon Sep 17 00:00:00 2001
-From: Andre Miranda <andreldm at xfce.org>
-Date: Sun, 14 Apr 2019 15:06:35 -0300
-Subject: [PATCH] Job is now optional for thunar_io_scan_directory
-
----
- thunar/thunar-io-scan-directory.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/thunar/thunar-io-scan-directory.c b/thunar/thunar-io-scan-directory.c
-index 8f81724c6..33aa7af45 100644
---- a/thunar/thunar-io-scan-directory.c
-+++ b/thunar/thunar-io-scan-directory.c
-@@ -52,13 +52,13 @@ thunar_io_scan_directory (ThunarJob *job,
- const gchar *namespace;
- ThunarFile *thunar_file;
- gboolean is_mounted;
-+ GCancellable *cancellable = NULL;
-
-- _thunar_return_val_if_fail (THUNAR_IS_JOB (job), NULL);
- _thunar_return_val_if_fail (G_IS_FILE (file), NULL);
- _thunar_return_val_if_fail (error == NULL || *error == NULL, NULL);
-
- /* abort if the job was cancelled */
-- if (exo_job_set_error_if_cancelled (EXO_JOB (job), error))
-+ if (job != NULL && exo_job_set_error_if_cancelled (EXO_JOB (job), error))
- return NULL;
-
- /* don't recurse when we are scanning prior to unlinking and the current
-@@ -73,11 +73,14 @@ thunar_io_scan_directory (ThunarJob *job,
- return NULL;
- }
-
-+ if (job != NULL)
-+ cancellable = exo_job_get_cancellable (EXO_JOB (job));
-+
- /* query the file type */
-- type = g_file_query_file_type (file, flags, exo_job_get_cancellable (EXO_JOB (job)));
-+ type = g_file_query_file_type (file, flags, cancellable);
-
- /* abort if the job was cancelled */
-- if (exo_job_set_error_if_cancelled (EXO_JOB (job), error))
-+ if (job != NULL && exo_job_set_error_if_cancelled (EXO_JOB (job), error))
- return NULL;
-
- /* ignore non-directory nodes */
-@@ -93,8 +96,7 @@ thunar_io_scan_directory (ThunarJob *job,
-
- /* try to read from the direectory */
- enumerator = g_file_enumerate_children (file, namespace,
-- flags, exo_job_get_cancellable (EXO_JOB (job)),
-- &err);
-+ flags, cancellable, &err);
-
- /* abort if there was an error or the job was cancelled */
- if (err != NULL)
-@@ -104,12 +106,10 @@ thunar_io_scan_directory (ThunarJob *job,
- }
-
- /* iterate over children one by one */
-- while (!exo_job_is_cancelled (EXO_JOB (job)))
-+ while (job == NULL || !exo_job_is_cancelled (EXO_JOB (job)))
- {
- /* query info of the child */
-- info = g_file_enumerator_next_file (enumerator,
-- exo_job_get_cancellable (EXO_JOB (job)),
-- &err);
-+ info = g_file_enumerator_next_file (enumerator, cancellable, &err);
-
- if (G_UNLIKELY (info == NULL))
- break;
-@@ -171,7 +171,7 @@ thunar_io_scan_directory (ThunarJob *job,
- thunar_g_file_list_free (files);
- return NULL;
- }
-- else if (exo_job_set_error_if_cancelled (EXO_JOB (job), &err))
-+ else if (job != NULL && exo_job_set_error_if_cancelled (EXO_JOB (job), &err))
- {
- g_propagate_error (error, err);
- thunar_g_file_list_free (files);
More information about the arch-commits
mailing list