From 258a27df11ae124daa51f601f4601b216614526c Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Tue, 7 Jan 2025 16:52:54 +0100
Subject: [PATCH] Prepare 48.alpha

---
 Cargo.lock                              |  2 +-
 Cargo.toml                              |  2 +-
 NEWS                                    | 23 +++++++++++++++++++++++
 data/meson.build                        |  4 ++--
 data/org.gnome.Loupe.metainfo.xml.in.in |  5 +++++
 meson.build                             |  2 +-
 news.d/47.2/released                    |  1 +
 7 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 news.d/47.2/released

diff --git a/Cargo.lock b/Cargo.lock
index ff96554..df0324f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1465,7 +1465,7 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "loupe"
-version = "47.1.0"
+version = "48.0.0-alpha"
 dependencies = [
  "anyhow",
  "arc-swap",
diff --git a/Cargo.toml b/Cargo.toml
index 308ebbf..e8082cd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "loupe"
-version = "47.1.0"
+version = "48.0.0-alpha"
 edition = "2021"
 rust-version = "1.80"
 license = "GPL-3.0-or-later"
diff --git a/NEWS b/NEWS
index 8d84786..a989cb6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+## 48.alpha (Unreleased)
+
+### Added
+
+- Display XMP metadata for JPEG images.
+- Initial support for image editing of JPEGs and PNGs with crop, rotate, and flip.
+- Show the correct folder name in the properties view inside flatpaks if the file is only accessible via portal.
+- User comment field in metadata.
+
+### Fixed
+
+- The sort order is now also following the one found in Files (Nautilus) if the file name contains non-ascii characters.
+
+### Changed
+
+- The design of the overlay buttons, especially for zoom controls has been reworked. A new menu supports selecting from pre-defined zoom levels as well as entering a specific zoom level.
+
+## 47.2 (2024-11-22)
+
+### Fixed
+
+- Don't call style manager in application constructor since this is too early. Do it in startup instead. Without this fix, GTK 4.17.0 will terminate the app on startup.
+
 ## 47.1 (2024-10-16)
 
 ### Added
diff --git a/data/meson.build b/data/meson.build
index 1aa6f22..6602425 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -24,9 +24,9 @@ mime_types += [
   'image/x-portable-graymap',
   'image/x-portable-pixmap',
   'image/x-portable-anymap',
-  # Qoi's MIME type is being worked on.
-  # See: https://github.com/phoboslab/qoi/issues/167
+  # Both mime types exist in the wild
   'image/x-qoi',
+  'image/qoi',
 ]
 
 # SVG
diff --git a/data/org.gnome.Loupe.metainfo.xml.in.in b/data/org.gnome.Loupe.metainfo.xml.in.in
index db5caa1..d163764 100644
--- a/data/org.gnome.Loupe.metainfo.xml.in.in
+++ b/data/org.gnome.Loupe.metainfo.xml.in.in
@@ -76,6 +76,11 @@
   </categories>
 
   <releases>
+    <release version="48.alpha" date="2025-01-07">
+      <description>
+        <p>This new release adds image editing support for PNGs and JPEGs. Images can be cropped, rotated, and flipped. New zoom controls allow to set a specific zoom level and feature a more compact style. Support for additional metadata formats like XMP and new image information fields have been added as well.</p>
+      </description>
+    </release>
     <release version="47.1" date="2024-10-16">
       <description>
         <p>This release fixes issues withloading .svgz (compressed SVG) files.</p>
diff --git a/meson.build b/meson.build
index 36991b7..52433d9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project(
   'loupe',
   'rust',
-  version: '47.1',
+  version: '48.alpha',
   meson_version: '>= 0.59.0',
   default_options: [
     'warning_level=2',
diff --git a/news.d/47.2/released b/news.d/47.2/released
new file mode 100644
index 0000000..3e78e22
--- /dev/null
+++ b/news.d/47.2/released
@@ -0,0 +1 @@
+2024-11-22