Date: Wed, 29 Jun 2022 19:30:54 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: af274e63c9f6 - main - x11-fm/nautilus: Update to 42.1 Message-ID: <202206291930.25TJUsWD029633@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=af274e63c9f6bcbeaa17a7989448b8cc1178e607 commit af274e63c9f6bcbeaa17a7989448b8cc1178e607 Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2022-06-29 19:30:33 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-06-29 19:30:52 +0000 x11-fm/nautilus: Update to 42.1 --- x11-fm/nautilus/Makefile | 2 +- x11-fm/nautilus/distinfo | 6 ++-- ...ch-git-55cfd66ccca391fc144f5863ff6bfc1f3b137e2d | 41 ---------------------- .../nautilus/files/patch-src_nautilus-thumbnails.c | 34 ++++++++++++++++++ 4 files changed, 38 insertions(+), 45 deletions(-) diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index c25ff89d562a..c684d249a094 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -1,7 +1,7 @@ # Created by: ade, archie PORTNAME= nautilus -PORTVERSION= 41.2 +PORTVERSION= 42.1 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome diff --git a/x11-fm/nautilus/distinfo b/x11-fm/nautilus/distinfo index acfc2e5a1289..8cbf8a07e937 100644 --- a/x11-fm/nautilus/distinfo +++ b/x11-fm/nautilus/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643666846 -SHA256 (gnome/nautilus-41.2.tar.xz) = 872285b1c40a6ee418ce295ed115f5427da70907d822d95bcf51675d5498822b -SIZE (gnome/nautilus-41.2.tar.xz) = 3248212 +TIMESTAMP = 1656522127 +SHA256 (gnome/nautilus-42.1.tar.xz) = 4135e723d3e62fc333d4973b80b3dbe81d0edef2f0d7b5a8e3d06ba44482403a +SIZE (gnome/nautilus-42.1.tar.xz) = 3259664 diff --git a/x11-fm/nautilus/files/patch-git-55cfd66ccca391fc144f5863ff6bfc1f3b137e2d b/x11-fm/nautilus/files/patch-git-55cfd66ccca391fc144f5863ff6bfc1f3b137e2d deleted file mode 100644 index f3ea5fbf66c6..000000000000 --- a/x11-fm/nautilus/files/patch-git-55cfd66ccca391fc144f5863ff6bfc1f3b137e2d +++ /dev/null @@ -1,41 +0,0 @@ -diff --git meson.build meson.build -index 927216636a21bfc0a4de3336e084c4d0084b6624..4626fa0bb7f69f84a3ba79f13bd869b641bad428 100644 ---- meson.build -+++ meson.build -@@ -122,8 +122,10 @@ gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0') - gtk = dependency('gtk+-3.0', version: '>= 3.22.27') - libhandy = dependency('libhandy-1', version: '>= 1.1.90') - libportal = [] -+libportal_gtk3 = [] - if get_option('libportal') -- libportal = dependency('libportal', version: '>= 0.3') -+ libportal = dependency('libportal', version: '>= 0.5') -+ libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5') - endif - selinux = [] - if get_option('selinux') -diff --git src/meson.build src/meson.build -index 682d6f3a3cd0899985ddd7a8b2a9479e5f1a5d79..d7fb76d53d5f3e6e28931734a7c55bf5443c06f7 100644 ---- src/meson.build -+++ src/meson.build -@@ -285,6 +285,7 @@ nautilus_deps = [ - libgd_dep, - libhandy, - libportal, -+ libportal_gtk3, - nautilus_extension, - selinux, - tracker_sparql, -diff --git src/nautilus-files-view.c src/nautilus-files-view.c -index dfb7fb26c0c8d2c55d76c1d4fc3a2b39fbec817b..a24005a110c40c9a1dd4954aa2d6beccd9b17182 100644 ---- src/nautilus-files-view.c -+++ src/nautilus-files-view.c -@@ -93,7 +93,7 @@ - - #ifdef HAVE_LIBPORTAL - #include <libportal/portal.h> --#include <libportal/portal-gtk3.h> -+#include <libportal-gtk3/portal-gtk3.h> - #endif - - /* Minimum starting update inverval */ diff --git a/x11-fm/nautilus/files/patch-src_nautilus-thumbnails.c b/x11-fm/nautilus/files/patch-src_nautilus-thumbnails.c new file mode 100644 index 000000000000..0cab51151c4d --- /dev/null +++ b/x11-fm/nautilus/files/patch-src_nautilus-thumbnails.c @@ -0,0 +1,34 @@ +--- src/nautilus-thumbnails.c.orig 2022-06-29 19:28:36 UTC ++++ src/nautilus-thumbnails.c +@@ -530,9 +530,7 @@ thumbnail_thread_func (GTask *task, + + pixbuf = gnome_desktop_thumbnail_factory_generate_thumbnail (thumbnail_factory, + info->image_uri, +- info->mime_type, +- NULL, +- &error); ++ info->mime_type); + + if (pixbuf) + { +@@ -542,9 +540,7 @@ thumbnail_thread_func (GTask *task, + gnome_desktop_thumbnail_factory_save_thumbnail (thumbnail_factory, + pixbuf, + info->image_uri, +- current_orig_mtime, +- NULL, +- &error); ++ current_orig_mtime); + if (error) + { + DEBUG ("(Thumbnail Thread) Saving thumbnail failed: %s (%s)\n", +@@ -561,8 +557,7 @@ thumbnail_thread_func (GTask *task, + + gnome_desktop_thumbnail_factory_create_failed_thumbnail (thumbnail_factory, + info->image_uri, +- current_orig_mtime, +- NULL, NULL); ++ current_orig_mtime); + } + /* We need to call nautilus_file_changed(), but I don't think that is + * thread safe. So add an idle handler and do it from the main loop. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206291930.25TJUsWD029633>