Compare revisions

f804923c · 5ce5dbec · e65927ed · 7896e84c · 6cb3e24d · 1094d79d
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,9 @@ variables:

 stages:
    - image
+    - review
    - test
+    - analyze
    - deploy

 .vars-devel:
@@ -16,17 +18,23 @@ stages:
        APP_ID: "org.gnome.NautilusDevel"
        BUNDLE: "nautilus-dev.flatpak"

+workflow:
+  rules:
+    # run merge request pipelines and for main or release branches
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || 
+          $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ||
+          $CI_COMMIT_BRANCH =~ /^gnome-.*$/ ||
+          $CI_PIPELINE_SOURCE == "web"
+
 flatpak@x86_64:
    extends: ['.flatpak@x86_64', '.vars-devel']

 flatpak@aarch64:
+    when: manual
    rules:
-        # https://docs.gitlab.com/ee/ci/jobs/job_control.html#avoid-duplicate-pipelines
-        - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-          when: never
-        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == "GNOME"
-        - when: manual
-          allow_failure: true
+        - if: $CI_PROJECT_NAMESPACE == "GNOME" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+          when: always
+        - allow_failure: true
    extends: ['.flatpak@aarch64', '.vars-devel']

 nightly@x86_64:
@@ -37,6 +45,12 @@ nightly@aarch64:
    extends: '.publish_nightly'
    needs: ['flatpak@aarch64']

+potfile:
+    image: registry.gitlab.gnome.org/gnome/nautilus:latest
+    stage: review
+    script:
+        - data/check-potfiles.sh
+
 style check:
    image: registry.gitlab.gnome.org/gnome/nautilus:latest
    stage: test
@@ -51,9 +65,6 @@ style check:
        - LANG=C.utf8 data/run-uncrustify.sh
        - git diff --exit-code | tee uncrustify.diff
    rules:
-        # https://docs.gitlab.com/ee/ci/jobs/job_control.html#avoid-duplicate-pipelines
-        - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-          when: never
        - if: $CI_COMMIT_BRANCH !~ /^gnome-.*$/

 update image:
@@ -77,6 +88,28 @@ update image:
        - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
        - if: $CI_PIPELINE_SOURCE == "web"

+asan:
+    variables:
+        CFLAGS: "-fno-omit-frame-pointer -fsanitize=address"
+        LSAN_OPTIONS: suppressions=$CI_PROJECT_DIR/data/leak-suppress.txt
+    image: registry.gitlab.gnome.org/gnome/nautilus:latest
+    stage: analyze
+    rules:
+        - when: manual
+          allow_failure: true
+    script:
+        - meson setup -Dextensions=false -Dintrospection=false -Dtests=all _build
+        - meson compile -C _build
+        - meson test -C _build
+    artifacts:
+        name: 'Address Sanitizer-built test results'
+        when: on_failure
+        paths:
+          - '_build/meson-logs/testlog.txt'
+        reports:
+            junit: '_build/meson-logs/testlog.junit.xml'
+        expire_in: 7 days
+
 pages:
    image: registry.gitlab.gnome.org/gnome/nautilus:latest
    stage: deploy

--- a/.gitlab/Dockerfile
+++ b/.gitlab/Dockerfile
 FROM fedora:latest

+ENV CFLAGS "-fno-omit-frame-pointer"
+
 RUN dnf install --nogpg -y dnf-plugins-core findutils git uncrustify \
 && dnf builddep --nogpg -y nautilus \
 && dnf clean all

-RUN dnf builddep -y gtk4 \
+RUN dnf builddep -y glib \
 && dnf clean all \
- && git clone --depth 1 https://gitlab.gnome.org/GNOME/gtk.git \
- && cd gtk \
- && meson setup _build --prefix /usr \
+ && git clone --depth 1 https://gitlab.gnome.org/GNOME/glib.git \
+ && cd glib \
+ && meson setup _build -Dintrospection=disabled -Dtests=false --prefix /usr \
 && ninja -C _build \
 && ninja install -C _build \
 && cd .. \
- && rm -rf gtk
+ && rm -rf glib

- RUN dnf builddep -y libadwaita \
- && dnf install -y appstream-devel \
+RUN dnf builddep -y gobject-introspection \
 && dnf clean all \
- && git clone --depth 1 https://gitlab.gnome.org/GNOME/libadwaita.git \
- && cd libadwaita \
+ && git clone --depth 1 https://gitlab.gnome.org/GNOME/gobject-introspection.git \
+ && cd gobject-introspection \
 && meson setup _build --prefix /usr \
 && ninja -C _build \
 && ninja install -C _build \
 && cd .. \
- && rm -rf libadwaita
+ && rm -rf gobject-introspection

 RUN dnf builddep -y glib \
 && dnf clean all \
 && git clone --depth 1 https://gitlab.gnome.org/GNOME/glib.git \
 && cd glib \
- && meson setup _build --prefix /usr \
+ && meson setup _build -Dtests=false --prefix /usr \
 && ninja -C _build \
 && ninja install -C _build \
 && cd .. \
 && rm -rf glib
+
+RUN dnf builddep -y gtk4 \
+ && dnf install -y glslc \
+ && dnf clean all \
+ && git clone --depth 1 https://gitlab.gnome.org/GNOME/gtk.git \
+ && cd gtk \
+ && meson setup _build -Dbuild-tests=false -Dbuild-testsuite=false -Dbuild-demos=false -Dbuild-examples=false --prefix /usr \
+ && ninja -C _build \
+ && ninja install -C _build \
+ && cd .. \
+ && rm -rf gtk
+
+ RUN dnf builddep -y libadwaita \
+ && dnf install -y appstream-devel \
+ && dnf clean all \
+ && git clone --depth 1 https://gitlab.gnome.org/GNOME/libadwaita.git \
+ && cd libadwaita \
+ && meson setup _build -Dtests=false -Dexamples=false --prefix /usr \
+ && ninja -C _build \
+ && ninja install -C _build \
+ && cd .. \
+ && rm -rf libadwaita
+
+RUN dnf install -y libasan \
+&& dnf clean all \
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
 <!--
-    Please test if the issue has already been fixed in the Nightly version.
+It's very helpful to know if the bug also happens in the latest development version.
+It can be installed alongside the regular version with these instructions:

-    You can install the Nightly version in parallel with the regular version with these instructions:
+1. Make sure that Flatpak is installed (see https://flatpak.org/setup )

-    1. Make sure that Flatpak is installed (see https://flatpak.org/setup )
-    2. Copy and run the following command in a Terminal:
+2. Copy and run the following command in the Terminal or Console app:
+   flatpak install --from https://nightly.gnome.org/repo/appstream/org.gnome.NautilusDevel.flatpakref

-    flatpak install --from https://nightly.gnome.org/repo/appstream/org.gnome.NautilusDevel.flatpakref
-
-    3) The Nightly version can now be launched from Activities, or with this command: flatpak run org.gnome.NautilusDevel
+3. Launch the development version (normal Files logo with yellow and black stripes), e.g. with:
+   flatpak run org.gnome.NautilusDevel
 -->

-# Affected version
- Nightly flatpak: Yes / No / Can't test it because <!-- Delete the unwanted answers -->
- Other: <!-- Write the distribution you’re using and the version of the app. -->
+# Affected Version
+- Version: <!-- Note: Versions older than a year are not supported. -->
+- Distribution: <!-- Example: Ubuntu 23.10 -->
+- Also happens with development version: Yes / No

-# Steps to reproduce
-<!--
-    Explain in detail the steps on how the issue can be reproduced.
-->
+# Steps to reproduce <!-- Explain in detail how the issue can be reproduced. -->
 1.
 2.
 3.

-# Current behavior
-<!-- Describe the current behavior. -->
+# Expected Behavior


-# Expected behavior
-<!-- Describe the expected behavior. -->
+# Actual Behavior


-# Additional information
+# Additional Information
 <!--
-    Provide more information that could be relevant.
-    
-    If the issue is a crash, provide a stack trace following the steps in:
-    https://wiki.gnome.org/Community/GettingInTouch/Bugzilla/GettingTraces
+If the issue is a crash, please provide a stack trace by following the steps in:
+https://handbook.gnome.org/issues/stack-traces.html
 -->
-
-
-<!-- Ignore the text under this line. -->
-/label ~"1. Bug"
--- a/.gitlab/issue_templates/Default.md
+++ b/.gitlab/issue_templates/Default.md
 # Welcome to the Files issue tracker!

-If you came here to report a bug with Files, please select the 'Bug' template under __Description__ above.
+To report a bug with Files, please select the 'Bug' template under 'Description' above.

-If you want to request a feature, please start a discussion with your idea over at https://discourse.gnome.org/tag/nautilus.
+To request a feature, please start a discussion with your idea over at https://discourse.gnome.org/tag/nautilus.

-If you want to report a shortcoming, something that Files currently does not as good as you wish it would, select the 'Shortcoming' template under __Description__ above.
+To report a shortcoming, something that Files currently does not as good as you wish it would, select the 'Shortcoming' template under 'Description' above.

 If you need help regarding the usage or configuration of Files, or have a concern not covered by anything described here, please feel free to post about it at https://discourse.gnome.org/tag/nautilus.
--- a/.gitlab/issue_templates/Shortcoming.md
+++ b/.gitlab/issue_templates/Shortcoming.md
 <!--
-    Please test if the shortcoming is overcome in the Nightly version already
+It's useful to know if the latest development version has the same shortcoming.
+It can be installed alongside the regular version with these instructions:

-    You can install the Nightly version in parallel with the regular version with these instructions:
+1. Make sure that Flatpak is installed (see https://flatpak.org/setup )

-    1. Make sure that Flatpak is installed (see https://flatpak.org/setup )
-    2. Copy and run the following command in a Terminal:
+2. Copy and run the following command in the Terminal or Console app:
+   flatpak install --from https://nightly.gnome.org/repo/appstream/org.gnome.NautilusDevel.flatpakref

-    flatpak install --from https://nightly.gnome.org/repo/appstream/org.gnome.NautilusDevel.flatpakref
+3. Launch the development version (normal Files logo with yellow and black stripes), e.g. with:
+   flatpak run org.gnome.NautilusDevel
+-->
+
+# Affected Version
+- Version: <!-- Note: Versions older than a year are not supported. -->
+- Distribution: <!-- Example: Ubuntu 23.10 -->
+- Also affects development version: Yes / No

-    3) The Nightly version can now be launched from Activities, or with this command: flatpak run org.gnome.NautilusDevel
+### Use Cases
+<!--
+Describe concrete situations, from daily usage, in which this app isn't helpful enough.
+Focus on what you want to do, not how it should be done, but do mention possible constraints.
 -->

-# Affected version
- Nightly flatpak: Yes / No / Can't test it because <!-- Delete the unwanted answers -->
- Other: <!-- Write the distribution you’re using and the version of the app. -->
+### Available Workarounds <!-- Can the goal be achieved with the current app version? -->

-### Use cases
-<!-- Describe concrete situations in which this application isn't helpful enough.
-     Focus is on the end goal, not the means to get there. 
-     Don't forget to mention any applicable requirements or constraints.
-     Examples from your daily usage are the most useful. -->

-### Available features and workarounds
-<!-- How do you manage to achieve your goals with the current version of the application? -->
+### Difficulties <!-- Why is the current experience unsatisfying? -->

-### Difficulties and insufficiencies
-<!-- Why is the current experience unsatisfying? -->

-### Suggested enhancements
-<!-- Optionally . -->
+### Suggested Enhancements <!-- Optional - the other sections are more important. -->
--- a/NEWS
+++ b/NEWS
-Major changes in 45.2.1
+Major changes in 46.beta
+========================
+* Postponed
+  - The network view from 46.alpha.1 was deemed to require more work
+* Enhancements
+  - Added a global search mode (António Fernandes)
+  - Use 'text entry' cursor on pathbar hover (Corey Berla)
+  - Add drop shadow to file property dialog icons (kramo)
+  - Improve progress info icons and tooltips (Bharat Tyagi, Sam Hewitt)
+* Bugfixes:
+  - Avoid crashes with column chooser (Peter Eisenmann)
+  - Avoid crash when navigating back to same folder (António Fernandes)
+  - Avoid infinite loop on file creation naming conflict (Corey Berla)
+  - Fix displaying parent folder of multi-files (Anton Snigirev)
+  - Clear location entry on editing of internal locations (Peter Eisenmann)
+  - Ensure search's clear button is hidden when empty (António Fernandes)
+  - Hide search popover after opening a dialog (Khalid Abu Shawarib)
+  - Correctly open empty folders from search (António Fernandes)
+  - Don't reload view only to change selection (António Fernandes)
+  - Use smaller icons in progress indicator (António Fernandes, Sam Hewitt)
+  - Fix various leaks (Khalid Abu Shawarib, António Fernandes)
+  - Added extra tentacles to confuse AI-generated blogs (Via Matrix)
+* Cleanups
+  - Made various string HIG compatible (Bart Gravendeel, Automeris naranja)
+  - Modernize column chooser widgetry (Automeris naranja)
+  - Detect potfile errors via CI (Corey Berla)
+  - Replace deprecated GTK point computing functions (N.Pranav Krishna)
+
+Major changes in 46.alpha.1
 =======================
-
-* Fix a crash in sidebar code (António Fernandes)
-* Fix build without optional cloudproviders dependency (António Fernandes)
-
-Major changes in 45.2
-=====================
-
+* Enhancements
+  - Views can be switched without a folder reload (António Fernandes)
+  - Operations are listed in the bottom of the sidebar (Corey Berla, António Fernandes, Allan Day)
+  - Network view replaces Other Locations (António Fernandes, Allan Day)
+  - Mounted drives are shown in the sidebar (António Fernandes)
+  - Selected files are recorded in back and forward history (António Fernandes)
+  - Subfolder loading indication (António Fernandes)
+  - Various view performance improvements (António Fernandes)
+  - Improved performance of multi-file properties dialog (Khalid Abu Shawarib)
 * Bugfixes:
-  - Don't crash when reconnecting to remove server (António Fernandes)
-  - Actually detect unmount on some non-native mounts (António Fernandes)
-  - Don't crash on image properties (Khalid Abu Shawarib)
-  - Allow types and sizes in Properties to expand (Peter Eisenmann)
-  - Don't corrupt toast messages (velsinki)
+  - Correctly prioritize thumbnails for non-alphabetical sort order (Corey Berla)
+  - Notify view item name changes for accessibility (Corey Berla, António Fernandes)
+  - Open real folder for documents in Recent from Properties (Anton Snigirev)
+  - Pattern match (Ctrl+S) all expanded list view directories (António Fernandes)
+  - Display sampling frequency in kHz with thousand separators (Hariharan D)
+  - Treat markdown files as text documents in search (Hariharan D)
+  - Improve UI text capitalization and mnemonics (Automeris naranja)
+  - Fix tab tooltip texts for markup and search (Corey Berla)
+  - Fix extension linkage with C++ (Khalid Abu Shawarib)
+  - Add a tooltip to the star button (Lukáš Tyrychtr)
+  - Show correct shortcut for Redo on the menu (Divyansh Jain)
+  - Prevent use-after-free with mount and stop (António Fernandes)
+  - Improve virtual files handling  (António Fernandes)
+  - Fix various view-related bugs, leaks and warnings (António Fernandes)
+* Cleanups:
+  - Significant restructuring of view architecture (António Fernandes)
+  - Remove dead code in views and css styles (António Fernandes)
+  - Update man page, remove documentation for removed self-check functionality (Corey Berla)
 * Translation updates (GNOME Translation Project contributors)

-Major changes in 45.1
-=====================
-
+Major changes in 46.alpha.0
+=======================
+* Enhancements
+  - Confirm password when creating protected ZIP archives (Eric Daigle)
+  - Make custom folder icon feature discoverable (Khalid Abu Shawarib)
+  - Make URI entry discoverable (Alynx Zhou, Barnabás Pőcze)
+  - Allow changing owner/group and any permissions under admin:/// (António Fernandes)
+  - Add detailed date and time format option (Ondrej Holy, Peter Eisenmann)
+  - Detect copy/move over 4GiB file limit on FAT (Corey Berla)
+  - Give feedback on completion of quick operations (António Fernandes)
+  - New-style banners, unstar animation, and other visual refinements (Peter Eisenmann, Automeris naranja)
+  - Allow Alt+Down to revert more than one Alt+Up (vmkul)
+  - Close overlaid sidebar on location change (Khalid Abu Shawarib)
 * Bugfixes:
-  - Don't crash when opening Properties from admin://* (Sebastian Keller)
-  - Don't crash on unmount (Corey Berla)
-  - Stop jumping to top when using the Menu key (António Fernandes)
+  - Don't skip files in deep count/size (António Fernandes)
+  - Don't move files around as thumbnails load (Corey Berla)
+  - Reveal highlighted file without delay  (Corey Berla)
+  - Stop crashing in various situations (Sebastian Keller, António Fernandes, Corey Berla, Khalid Abu Shawarib)
+  - Resolve UI text inconsistencies (Automeris naranja, getsnoopy, kramo, Khalid Abu Shawarib, Ondrej Holy, Matthijs Velsink)
+  - Fix memory leaks, template disposal, and warnings (Khalid Abu Shawarib)
+  - Fix interface problems in Properties (Peter Eisenmann, António Fernandes, Khalid Abu Shawarib)
+  - Don't keep viewing unmounted locations (Ondrej Holy, António Fernandes, Khalid Abu Shawarib)
+  - Refined appdata (Sabri Ünal, António Fernandes)
+  - Resolve wrong scroll positioning bugs (Gary Li, António Fernandes)
+  - Fix automatic file duplicate naming (Peter Eisenmann)
  - Properly reorder bookmarks by drag and drop (Khalid Abu Shawarib)
-  - Re-add search results when switching view mode (António Fernandes)
-  - Fix compilation on 32-bit musl ("Newbyte")
-  - Fix various leaks and warnings (Khalid Abu Shawarib)
-* Translation updates (GNOME Translation Project contributors)
-
-Major changes in 45.0
-=====================
-
+  - Set current modification time on file created from templates (Khalid Abu Shawarib)
+  - Fix missing/wrong mime type icons (António Fernandes)
+  - Don't reload on autofs timeout (António Fernandes)
+* Cleanups
+  - Remove obsolete profiling, custom debug logging, and self-checking (Peter Eisenmann, Khalid Abu Shawarib)
+  - Streamline and expand tests (Khalid Abu Shawarib, Peter Eisenmann)
+  - Reduce usage of GtkDialog and other deprecated API (Khalid Abu Shawarib, Peter Eisenmann)
+  - Replace custom switch row with AdwSwitchRow (Óscar Fernández Díaz)
+  - Drop obsolete code (Peter Eisenmann, António Fernandes, Corey Berla)
+  - Reduce unnecessary string copies (Peter Eisenmann)
+  - Unify numbered filename apendix handling (Peter Eisenmann, Khalid Abu Shawarib)
 * Translation updates (GNOME Translation Project contributors)

 Major changes in 45.rc

--- a/README.md
+++ b/README.md
 # nautilus
 [![Pipeline status](https://gitlab.gnome.org/GNOME/nautilus/badges/main/pipeline.svg)](https://gitlab.gnome.org/GNOME/nautilus/commits/main)

-This is the project of the [Files](https://wiki.gnome.org/Apps/Files) app, a file browser for
+This is the project of the [Files](https://apps.gnome.org/Nautilus/) app, a file browser for
 GNOME, internally known by its historical name `nautilus`.

 ## Supported version
-Only latest version of Files as provided upstream is supported. Try out the [Flatpak nightly](https://wiki.gnome.org/Apps/Nightly) installation before filling issues to ensure the installation is reproducible and doesn't have downstream changes on it. In case you cannot reproduce in the nightly installation, don't hesitate to file an issue in your distribution. This is to ensure the issue is well triaged and reaches the proper people.
+Only the latest version of Files as provided upstream is supported. Try out the [Flatpak nightly](https://welcome.gnome.org/en/app/Nautilus/#installing-a-nightly-build) installation before filling issues to ensure the installation is reproducible and doesn't have downstream changes on it. In case you cannot reproduce in the nightly installation, don't hesitate to file an issue in your distribution. This is to ensure the issue is well triaged and reaches the proper people.

-## Hacking on nautilus
+## Contributing to nautilus

 To build the development version of the Files app and hack on the code
-see the [general guide](https://wiki.gnome.org/Newcomers/BuildProject)
-for building GNOME apps with Flatpak and GNOME Builder.
+see the [welcome guide](https://welcome.gnome.org/en/app/Nautilus/#getting-the-app-to-build).

-Commit messages should follow the expected format [detailed here](https://wiki.gnome.org/Git/CommitMessages).
+Commit messages should follow the expected format [detailed here](https://handbook.gnome.org/development/commit-messages.html).

 ### Update default branch


--- a/data/check-potfiles.sh
+++ b/data/check-potfiles.sh
+#!/usr/bin/env bash
+
+srcdirs="eel extensions src libnautilus-extension"
+uidirs="src/resources/ui src/gtk"
+desktopdirs="data"
+
+# find source files that contain gettext keywords
+files=$(grep -lR --include='*.c' '\(gettext\|[^I_)]_\)(' $srcdirs)
+
+# find ui files that contain translatable string
+files="$files "$(grep -lRi --include='*.ui' 'translatable="[ty1]' $uidirs)
+
+# find .desktop files
+files="$files "$(find $desktopdirs -name '*.desktop*')
+
+# filter out excluded files
+if [ -f po/POTFILES.skip ]; then
+  files=$(for f in $files; do ! grep -q ^$f po/POTFILES.skip && echo $f; done)
+fi
+
+# find those that aren't listed in POTFILES.in
+missing=$(for f in $files; do ! grep -q ^$f po/POTFILES.in && echo $f; done)
+
+if [ ${#missing} -eq 0 ]; then
+  exit 0
+fi
+
+cat >&2 <<EOT
+
+The following files are missing from po/POTFILES.po:
+
+EOT
+for f in $missing; do
+  echo "  $f" >&2
+done
+echo >&2
+
+exit 1
--- a/data/leak-suppress.txt
+++ b/data/leak-suppress.txt
+# Use via environment variable LSAN_OPTIONS=suppressions=data/leak-suppress.txt
+# Ignore fontconfig reported leaks, its caches cause false positives.
+leak:libfontconfig.so.1
+leak:libEGL_mesa.so.0
+leak:libtracker-sparql-3.0.so.0
+leak:gtk_init
+leak:xdg_mime_init
+leak:gtk_at_context_create
+leak:libim-ibus.so
\ No newline at end of file
--- a/data/meson.build
+++ b/data/meson.build
@@ -41,17 +41,29 @@ desktop_autorun_software = i18n.merge_file(
  type: 'desktop'
 )

+# get current date, used as build date for snapshots between releases
+today = 'unknown'
+date = find_program('date', required: false)
+if date.found()
+  r = run_command(date, '-I')
+  if r.returncode() == 0
+    today = r.stdout().strip()
+  endif
+endif
+
 appdata_conf = configuration_data()

 appdata_conf.set('appid', application_id)
+appdata_conf.set('build-date', today)
+appdata_conf.set('release-version', meson.project_version())

 appdata = i18n.merge_file(
  input: configure_file(
-    input: files('org.gnome.Nautilus.appdata.xml.in.in'),
-    output: 'org.gnome.Nautilus.appdata.xml.in',
+    input: files('org.gnome.Nautilus.metainfo.xml.in.in'),
+    output: 'org.gnome.Nautilus.metainfo.xml.in',
    configuration: appdata_conf
  ),
-  output: '@0@.appdata.xml'.format(application_id),
+  output: '@0@.metainfo.xml'.format(application_id),
  install: true,
  install_dir: join_paths(datadir, 'metainfo'),
  po_dir: po_dir
@@ -121,12 +133,12 @@ if desktop_file_validate.found()
  )
 endif

-appstream_util = find_program('appstream-util', required: false)
-if appstream_util.found()
+appstreamcli = find_program('appstreamcli', required: false)
+if appstreamcli.found()
  test(
-    'validate-appdata', appstream_util,
+    'validate-appdata', appstreamcli,
    args: [
-      'validate-relax', '--nonet', appdata.full_path()
+      'validate', '--no-net', appdata.full_path()
    ],
    depends: [
      appdata,

--- a/data/org.gnome.Nautilus.appdata.xml.in.in
+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
@@ -28,12 +28,24 @@
  <url type="contact">https://discourse.gnome.org/tag/nautilus</url>
  <url type="vcs-browser">https://gitlab.gnome.org/GNOME/nautilus</url>
  <launchable type="desktop-id">@appid@.desktop</launchable>
+  <!-- Copy-pastable release tag templates.
+  # For stable releases:
+    <release version="@release-version@" type="stable" date="YYYY-MM-DD"/>
+
+  # For Unstable (alpha, beta, rc) releases:
+    <release version="@release-version@" type="development" date="YYYY-MM-DD"/>
+
+  # Between releases (at post-release version bump):
+    <release version="@release-version@" date="@build-date@"/>
+  -->
  <releases>
-    <release version="45.2.1" date="2023-12-06" />
+    <release version="@release-version@" date="2024-02-11"/>
  </releases>
  <project_group>GNOME</project_group>
  <project_license>GPL-3.0-or-later</project_license>
-  <developer_name>The GNOME Project</developer_name>
+  <developer id="gnome.org">
+    <name>The GNOME Project</name>
+  </developer>
  <screenshots>
    <screenshot type="default">
      <image>https://static.gnome.org/appdata/gnome-43/files/files-grid.png</image>
@@ -67,5 +79,5 @@
  <requires>
    <display_length>360</display_length>
  </requires>
+  <content_rating type="oars-1.1" />
 </component>
-
--- a/data/org.gnome.nautilus.gschema.xml
+++ b/data/org.gnome.nautilus.gschema.xml
@@ -11,6 +11,11 @@
    <value value="1" nick="double"/>
  </enum>

+  <enum id="org.gnome.nautilus.DateTimeFormat">
+    <value value="0" nick="simple"/>
+    <value value="1" nick="detailed"/>
+  </enum>
+
  <enum id="org.gnome.nautilus.ActivationChoice">
    <value value="0" nick="launch"/>
    <value value="1" nick="display"/>
@@ -75,12 +80,12 @@
    <key type="b" name="always-use-location-entry">
      <default>false</default>
      <summary>Always use the location entry, instead of the pathbar</summary>
-      <description>If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar.</description>
+      <description>If set to true, Files will always use a textual input entry for the location toolbar, instead of the pathbar.</description>
    </key>
    <key name="recursive-search" enum="org.gnome.nautilus.SpeedTradeoff">
      <default>'local-only'</default>
      <summary>Where to perform recursive search</summary>
-      <description>In which locations Nautilus should search on subfolders. Available values are “local-only”, “always”, “never”.</description>
+      <description>Locations in which Files should search subfolders. Available values are “local-only”, “always”, “never”.</description>
    </key>
    <key name="search-filter-time-type" enum="org.gnome.nautilus.SearchFilterTimeType">
      <default>'last_modified'</default>
@@ -90,12 +95,12 @@
    <key type="b" name="show-delete-permanently">
      <default>false</default>
      <summary>Whether to show a context menu item to delete permanently</summary>
-      <description>If set to true, then Nautilus will show a delete permanently context menu item to bypass the Trash.</description>
+      <description>If set to true, Files will show a delete permanently context menu item to bypass the Trash.</description>
    </key>
    <key type="b" name="show-create-link">
      <default>false</default>
      <summary>Whether to show context menu items to create links from copied or selected files</summary>
-      <description>If set to true, then Nautilus will show context menu items to create links from the copied or selected files.</description>
+      <description>If set to true, Files will show context menu items to create links from the copied or selected files.</description>
    </key>
    <key name="show-directory-item-counts" enum="org.gnome.nautilus.SpeedTradeoff">
      <aliases><alias value='local_only' target='local-only'/></aliases>
@@ -115,15 +120,15 @@
    </key>
    <key type="b" name="mouse-use-extra-buttons">
      <default>true</default>
-      <summary>Use extra mouse button events in Nautilus’ browser window</summary>
-      <description>For users with mice that have “Forward” and “Back” buttons, this key will determine if any action is taken inside of Nautilus when either is pressed.</description>
+      <summary>Use extra mouse button events in Files</summary>
+      <description>For users with mice that have “Forward” and “Back” buttons, this key will determine if any action is taken inside of Files when either is pressed.</description>
    </key>
-    <key type="i" name="mouse-forward-button">
+    <key type="u" name="mouse-forward-button">
      <default>9</default>
      <summary>Mouse button to activate the “Forward” command in browser window</summary>
      <description>For users with mice that have buttons for “Forward” and “Back”, this key will set which button activates the “Forward” command in a browser window. Possible values range between 6 and 14.</description>
    </key>
-    <key type="i" name="mouse-back-button">
+    <key type="u" name="mouse-back-button">
      <default>8</default>
      <summary>Mouse button to activate the “Back” command in browser window</summary>
      <description>For users with mice that have buttons for “Forward” and “Back”, this key will set which button activates the “Back” command in a browser window. Possible values range between 6 and 14.</description>
@@ -181,7 +186,12 @@
    <key type="b" name="fts-enabled">
      <default>true</default>
      <summary>Whether to have full text search enabled by default when opening a new window/tab</summary>
-      <description>If set to true, then Nautilus will also match the file contents besides the name. This toggles the default active state, which can still be overridden in the search popover</description>
+      <description>If set to true, Files will also match the file contents besides the name. This toggles the default active state, which can still be overridden in the search popover</description>
+    </key>
+    <key name="date-time-format" enum="org.gnome.nautilus.DateTimeFormat">
+      <default>'simple'</default>
+      <summary>How to display file timestamps in the views</summary>
+      <description>If set to 'simple', Files will show Today and Yesterday with time, otherwise the exact date without time. If set to 'detailed', it will always show the exact date and time.</description>
    </key>
  </schema>


--- a/debian/changelog
+++ b/debian/changelog
+nautilus (1:46~beta-0ubuntu1) noble; urgency=medium
+
+  * New upstream release
+  * Drop meson fatal warnings patch: obsolete
+  * Bump minimum glib, gtk4, libadwaita, libgexiv2
+  * Revert 2 commits that require gtk4 4.13
+  * Drop obsolete Build-Depends: libxml2-dev
+  * Refresh patches
+
+ -- Jeremy Bícha <jbicha@ubuntu.com>  Fri, 16 Feb 2024 09:18:17 -0500
+
 nautilus (1:45.2.1-4ubuntu1) noble; urgency=medium

  * Resynchronize with Debian. Remaining Ubuntu changes:

--- a/debian/control
+++ b/debian/control
@@ -11,24 +11,23 @@ Build-Depends: appstream-util <!nocheck>,
               dh-sequence-gnome,
               desktop-file-utils,
               gi-docgen,
-               libadwaita-1-dev (>= 1.4~beta),
+               libadwaita-1-dev (>= 1.4.0),
               libcloudproviders-dev (>= 0.3.1),
               libfontconfig-dev,
-               libgexiv2-dev (>= 0.14.0),
+               libgexiv2-dev (>= 0.14.2),
               libgirepository1.0-dev (>= 0.10.7-1~),
-               libglib2.0-dev (>= 2.77.0),
+               libglib2.0-dev (>= 2.79.0),
               libglib2.0-doc,
               libgnome-autoar-0-dev (>= 0.4.4),
               libgnome-desktop-4-dev (>= 43~),
               libgstreamer-plugins-base1.0-dev,
               libgtk-3-common,
-               libgtk-4-dev (>= 4.11.1),
+               libgtk-4-dev (>= 4.12.0),
               libgtk-4-doc,
               libpango1.0-dev (>= 1.42),
               libportal-gtk4-dev (>= 0.5),
               libselinux1-dev (>= 2.0) [linux-any],
               libtracker-sparql-3.0-dev,
-               libxml2-dev (>= 2.7.8),
               meson (>= 0.59.0),
               shared-mime-info (>= 0.50),
               libunity-dev (>= 5.0.0),
@@ -118,7 +117,7 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: gir1.2-nautilus-4.0 (= ${binary:Version}),
-         libglib2.0-dev (>= 2.77.0),
+         libglib2.0-dev (>= 2.79.0),
         libnautilus-extension4 (= ${binary:Version}),
         ${misc:Depends},
         ${shlibs:Depends}

--- a/debian/patches/04_suppress_umount_in_ltsp.patch
+++ b/debian/patches/04_suppress_umount_in_ltsp.patch
@@ -10,10 +10,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/220564
 1 file changed, 10 insertions(+)

 diff --git a/src/nautilus-file.c b/src/nautilus-file.c
-index 58139c9..82404d0 100644
+index 2eba3a8..1059850 100644
 --- a/src/nautilus-file.c
 +++ b/src/nautilus-file.c
-@@ -1136,6 +1136,11 @@ nautilus_file_can_unmount (NautilusFile *file)
+@@ -1071,6 +1071,11 @@ nautilus_file_can_unmount (NautilusFile *file)
 {
     g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 
@@ -25,7 +25,7 @@ index 58139c9..82404d0 100644
     return file->details->can_unmount ||
            (file->details->mount != NULL &&
             g_mount_can_unmount (file->details->mount));
-@@ -1146,6 +1151,11 @@ nautilus_file_can_eject (NautilusFile *file)
+@@ -1081,6 +1086,11 @@ nautilus_file_can_eject (NautilusFile *file)
 {
     g_return_val_if_fail (NAUTILUS_IS_FILE (file), FALSE);
 

--- a/debian/patches/Reapply-grid-view-Workaround-weakref-bug.patch
+++ b/debian/patches/Reapply-grid-view-Workaround-weakref-bug.patch
+From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bicha@canonical.com>
+Date: Fri, 16 Feb 2024 07:45:46 -0500
+Subject: Reapply "grid-view: Workaround weakref bug"
+
+This reverts commit d1ee61ee98429a6f8691ea6d313110028275321c.
+
+This can be dropped once Debian Unstable gets gtk4 4.13
+
+Forwarded: not-needed
+---
+ src/nautilus-grid-view.c | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/src/nautilus-grid-view.c b/src/nautilus-grid-view.c
+index a39b2e9..0af84d6 100644
+--- a/src/nautilus-grid-view.c
+++ b/src/nautilus-grid-view.c
+@@ -440,6 +440,15 @@ unbind_cell (GtkSignalListItemFactory *factory,
+     }
+ }
+ 
+static void
+on_cell_destroyed (gpointer  data,
+                   GObject  *where_the_object_was)
+{
+    GtkExpressionWatch *watch = data;
+    gtk_expression_watch_unwatch (watch);
+    gtk_expression_watch_unref (watch);
+}
+
+ static void
+ setup_cell (GtkSignalListItemFactory *factory,
+             GtkListItem              *listitem,
+@@ -448,6 +457,7 @@ setup_cell (GtkSignalListItemFactory *factory,
+     NautilusGridView *self = NAUTILUS_GRID_VIEW (user_data);
+     NautilusGridCell *cell;
+     GtkExpression *expression;
+    GtkExpressionWatch *watch;
+ 
+     cell = nautilus_grid_cell_new (NAUTILUS_LIST_BASE (self));
+     gtk_list_item_set_child (listitem, GTK_WIDGET (cell));
+@@ -466,7 +476,12 @@ setup_cell (GtkSignalListItemFactory *factory,
+     expression = gtk_property_expression_new (GTK_TYPE_TREE_LIST_ROW, expression, "item");
+     expression = gtk_property_expression_new (NAUTILUS_TYPE_VIEW_ITEM, expression, "file");
+     expression = gtk_property_expression_new (NAUTILUS_TYPE_FILE, expression, "display-name");
+-    gtk_expression_bind (expression, listitem, "accessible-label", listitem);
+    watch = gtk_expression_bind (expression, listitem, "accessible-label", listitem);
+
+    /* Workaround to avoid removing the same weak ref twice, as per
+     * https://gitlab.gnome.org/GNOME/glib/-/issues/1002#note_1969545
+     * This unwatches the listitem before the watched listitem is destroyed. */
+    g_object_weak_ref (G_OBJECT (cell), on_cell_destroyed, gtk_expression_watch_ref (watch));
+ }
+ 
+ static GtkGridView *
--- a/debian/patches/Revert-build-Bump-gtk-dependency.patch
+++ b/debian/patches/Revert-build-Bump-gtk-dependency.patch
+From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jeremy.bicha@canonical.com>
+Date: Fri, 16 Feb 2024 07:50:23 -0500
+Subject: Revert "build: Bump gtk dependency"
+
+This reverts commit 20d8db336c4bf60a17c32d10f1e99e14f42cd463.
+
+This can be dropped once Debian Unstable gets gtk4 4.13
+
+Forwarded: not-needed
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 397d80e..fd41ce8 100644
+--- a/meson.build
+++ b/meson.build
+@@ -113,7 +113,7 @@ glib = dependency('glib-2.0', version: glib_ver)
+ gmodule = dependency('gmodule-no-export-2.0', version: glib_ver)
+ gnome_autoar = dependency('gnome-autoar-0', version: '>= 0.4.4')
+ gnome_desktop = dependency('gnome-desktop-4', version: '>= 43')
+-gtk = dependency('gtk4', version: '>= 4.13.6')
+gtk = dependency('gtk4', version: '>= 4.12.0')
+ libadwaita = dependency('libadwaita-1', version: '>= 1.4.0')
+ libportal = dependency('libportal', version: '>= 0.5')
+ libportal_gtk4 = dependency('libportal-gtk4', version: '>= 0.5')
--- a/debian/patches/Revert-meson.build-Use-environment-to-make-warnings-fatal.patch
+++ b/debian/patches/Revert-meson.build-Use-environment-to-make-warnings-fatal.patch
-From: Jeremy Bicha <jbicha@debian.org>
-Date: Wed, 23 Feb 2022 07:36:28 -0500
-Subject: Revert "meson.build: Use environment to make warnings fatal"
-
-This reverts commit 6ff47626282dfbeb74129912a9f658a293ba7825.
-
-This made one of the tracker build tests fail for us. Needs more investigation.
-
-Perhaps the test needs to be adapted to work when nautilus isn't installed?
---
- src/meson.build | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/meson.build b/src/meson.build
-index e98d31c..69b14f3 100644
--- a/src/meson.build
-+++ b/src/meson.build
-@@ -317,7 +317,6 @@ if get_option('tests') == 'all'
-       '--check',
-     ],
-     env: [
-      'G_DEBUG=fatal-warnings',
-       'GSETTINGS_SCHEMA_DIR=@0@'.format(join_paths(meson.project_build_root(), 'data')),
-       'RUNNING_TESTS=@0@'.format('TRUE')
-     ]
--- a/debian/patches/appstream-compulsory.patch
+++ b/debian/patches/appstream-compulsory.patch
@@ -5,18 +5,18 @@ Subject: Set nautilus as unremovable in GNOME Software
 for GNOME and Unity users since it is a depends of ubuntu-desktop
 and gnome-software does not warn about uninstalling dependent packages
 ---
- data/org.gnome.Nautilus.appdata.xml.in.in | 2 ++
+ data/org.gnome.Nautilus.metainfo.xml.in.in | 2 ++
 1 file changed, 2 insertions(+)

-diff --git a/data/org.gnome.Nautilus.appdata.xml.in.in b/data/org.gnome.Nautilus.appdata.xml.in.in
-index 6e5b69f..7db7754 100644
--- a/data/org.gnome.Nautilus.appdata.xml.in.in
-+++ b/data/org.gnome.Nautilus.appdata.xml.in.in
-@@ -66,5 +66,7 @@
+diff --git a/data/org.gnome.Nautilus.metainfo.xml.in.in b/data/org.gnome.Nautilus.metainfo.xml.in.in
+index a30c951..3ede224 100644
+--- a/data/org.gnome.Nautilus.metainfo.xml.in.in
+++ b/data/org.gnome.Nautilus.metainfo.xml.in.in
+@@ -79,5 +79,7 @@
   <requires>
     <display_length>360</display_length>
   </requires>
 +  <compulsory_for_desktop>GNOME</compulsory_for_desktop>
 +  <compulsory_for_desktop>Unity</compulsory_for_desktop>
+   <content_rating type="oars-1.1" />
 </component>
- 
--- a/debian/patches/series
+++ b/debian/patches/series
-Revert-meson.build-Use-environment-to-make-warnings-fatal.patch
+skip-tracker-test.patch
+Reapply-grid-view-Workaround-weakref-bug.patch
+Revert-build-Bump-gtk-dependency.patch
 04_suppress_umount_in_ltsp.patch
 appstream-compulsory.patch
 ubuntu/unity_launcher_support.patch
 ubuntu/unity_icon_color.patch
 ubuntu/ubuntu_backspace_behaviour.patch
 ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
-skip-tracker-test.patch
No results found