Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging 
/ Packages / nautilus


Commits:
5ad04e72 by Jan Alexander Steffens (heftig) at 2025-02-04T16:45:40+01:00
47.2-1

- - - - -


3 changed files:

- .SRCINFO
- − 0002-check-for-NULL-pointer-in-finish_info_provider-and-i.patch
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
 pkgbase = nautilus
        pkgdesc = Default file manager for GNOME
-       pkgver = 47.1
-       pkgrel = 2
+       pkgver = 47.2
+       pkgrel = 1
        url = https://apps.gnome.org/Nautilus/
        arch = x86_64
        license = GPL-3.0-or-later
@@ -37,14 +37,12 @@ pkgbase = nautilus
        depends = tinysparql
        depends = wayland
        depends = xdg-user-dirs-gtk
-       source = git+https://gitlab.gnome.org/GNOME/nautilus.git#tag=47.1
+       source = git+https://gitlab.gnome.org/GNOME/nautilus.git#tag=47.2
        source = 0001-Disable-tracker-test.patch
-       source = 0002-check-for-NULL-pointer-in-finish_info_provider-and-i.patch
        validpgpkeys = 6B211753AC950672287226800538577822AE4B17
        validpgpkeys = 550660707A6F40376B9B9F8D504A78811E6160CC
-       b2sums = 
abec4401ee2f599b9cb1bfbff6b111d2da965356da0c567f6c5bce97e1f6411862454400810a33424fd77afb50f8a3a70552b0e3bc57cfd4bee32462b83492a9
+       b2sums = 
e7dfef5988ef05f9c5e692b82d66267ae66bd7d094ab9e87a0cb7173d252db495bcd574c8361a25a1884a1c134b19e5a9b4a3423055fe23b5242000f9e164080
        b2sums = 
8befc868af7e4dc776c50c10d0c6852d237f41b1f4adf8c15e0c378a9ff035e38b2cd22926d313850babcd6c96b6dd2be95fa9e1299383e686ad5a0ff36b957f
-       b2sums = 
891563c79b758ae19bd9610b8dbc309badb10ca50fffe072692124b0c021ac8e9ddb72d66b560c7f00f8ce5d2715d2e50d05b1ca85f3c925ed77c660fc72da55
 
 pkgname = nautilus
        groups = gnome


=====================================
0002-check-for-NULL-pointer-in-finish_info_provider-and-i.patch deleted
=====================================
@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Philipp Unger <[email protected]>
-Date: Sun, 22 Dec 2024 14:54:03 +0100
-Subject: [PATCH] check for NULL pointer in finish_info_provider and
- info_provider_idle_callback
-
----
- src/nautilus-directory-async.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/nautilus-directory-async.c b/src/nautilus-directory-async.c
-index 48e295c31b36..00fb1a3b1638 100644
---- a/src/nautilus-directory-async.c
-+++ b/src/nautilus-directory-async.c
-@@ -3704,29 +3704,34 @@ finish_info_provider (NautilusDirectory    *directory,
-                       NautilusFile         *file,
-                       NautilusInfoProvider *provider)
- {
-+    g_return_if_fail (directory);
-+    g_return_if_fail (file);
-+
-     file->details->pending_info_providers =
-         g_list_remove (file->details->pending_info_providers,
-                        provider);
-     g_object_unref (provider);
- 
-     nautilus_directory_async_state_changed (directory);
- 
-     if (file->details->pending_info_providers == NULL)
-     {
-         nautilus_file_info_providers_done (file);
-     }
- }
- 
- 
- static gboolean
- info_provider_idle_callback (gpointer user_data)
- {
-     InfoProviderResponse *response;
-     NautilusDirectory *directory;
- 
-     response = user_data;
-     directory = response->directory;
- 
-+    g_return_val_if_fail (directory, FALSE);
-+
-     if (response->handle != directory->details->extension_info_in_progress
-         || response->provider != directory->details->extension_info_provider)
-     {


=====================================
PKGBUILD
=====================================
@@ -8,8 +8,8 @@ pkgname=(
   libnautilus-extension
   libnautilus-extension-docs
 )
-pkgver=47.1
-pkgrel=2
+pkgver=47.2
+pkgrel=1
 pkgdesc="Default file manager for GNOME"
 url="https://apps.gnome.org/Nautilus/";
 arch=(x86_64)
@@ -53,11 +53,9 @@ checkdepends=(python-gobject)
 source=(
   "git+https://gitlab.gnome.org/GNOME/nautilus.git#tag=${pkgver/[a-z]/.&}";
   0001-Disable-tracker-test.patch
-  0002-check-for-NULL-pointer-in-finish_info_provider-and-i.patch
 )
-b2sums=('abec4401ee2f599b9cb1bfbff6b111d2da965356da0c567f6c5bce97e1f6411862454400810a33424fd77afb50f8a3a70552b0e3bc57cfd4bee32462b83492a9'
-        
'8befc868af7e4dc776c50c10d0c6852d237f41b1f4adf8c15e0c378a9ff035e38b2cd22926d313850babcd6c96b6dd2be95fa9e1299383e686ad5a0ff36b957f'
-        
'891563c79b758ae19bd9610b8dbc309badb10ca50fffe072692124b0c021ac8e9ddb72d66b560c7f00f8ce5d2715d2e50d05b1ca85f3c925ed77c660fc72da55')
+b2sums=('e7dfef5988ef05f9c5e692b82d66267ae66bd7d094ab9e87a0cb7173d252db495bcd574c8361a25a1884a1c134b19e5a9b4a3423055fe23b5242000f9e164080'
+        
'8befc868af7e4dc776c50c10d0c6852d237f41b1f4adf8c15e0c378a9ff035e38b2cd22926d313850babcd6c96b6dd2be95fa9e1299383e686ad5a0ff36b957f')
 validpgpkeys=(
   6B211753AC950672287226800538577822AE4B17 # António Fernandes 
<[email protected]>
   550660707A6F40376B9B9F8D504A78811E6160CC # Corey Berla <[email protected]>
@@ -68,11 +66,6 @@ prepare() {
 
   # Tracker test is broken in our build containers
   git apply -3 ../0001-Disable-tracker-test.patch
-
-  # Plugin crash fix
-  # 
https://gitlab.archlinux.org/archlinux/packaging/packages/nautilus/-/merge_requests/1
-  # https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/1662
-  git apply -3 
../0002-check-for-NULL-pointer-in-finish_info_provider-and-i.patch
 }
 
 build() {



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nautilus/-/commit/5ad04e722e2f2a94b503d0023439d30747434ab5

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/nautilus/-/commit/5ad04e722e2f2a94b503d0023439d30747434ab5
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to