public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/gthumb] rawhide: Update to 4.0.beta
@ 2026-06-23 18:50 Michael Catanzaro
0 siblings, 0 replies; only message in thread
From: Michael Catanzaro @ 2026-06-23 18:50 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/gthumb
Branch : rawhide
Commit : d44b992b12dfe8aa63737c836867f438e3056ff4
Author : Michael Catanzaro <mcatanzaro@gnome.org>
Date : 2026-06-23T13:50:01-05:00
Stats : +2/-246 in 3 file(s)
URL : https://src.fedoraproject.org/rpms/gthumb/c/d44b992b12dfe8aa63737c836867f438e3056ff4?branch=rawhide
Log:
Update to 4.0.beta
---
diff --git a/0001-gthumb-4.0-alpha-build.patch b/0001-gthumb-4.0-alpha-build.patch
deleted file mode 100644
index 9a0ce50..0000000
--- a/0001-gthumb-4.0-alpha-build.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-diff --git a/data/icons/meson.build b/data/icons/meson.build
-index 5d6436c4b91bb739cc89fcf1001ce3317fc43f0e..ee02789596ea0e84d1b1cb9fc352a45cb7e2858c 100644
---- a/data/icons/meson.build
-+++ b/data/icons/meson.build
-@@ -1 +1,12 @@
- subdir('public')
-+if get_option('developer-mode')
-+ install_data(
-+ 'org.gnome.gthumb-devel.svg',
-+ install_dir: join_paths(datadir, 'icons/hicolor/scalable/apps')
-+ )
-+else
-+ install_data(
-+ 'org.gnome.gthumb.svg',
-+ install_dir: join_paths(datadir, 'icons/hicolor/scalable/apps')
-+ )
-+endif
-diff --git a/data/icons/public/hicolor/scalable/apps/org.gnome.gthumb-devel.svg b/data/icons/org.gnome.gthumb-devel.svg
-similarity index 100%
-rename from data/icons/public/hicolor/scalable/apps/org.gnome.gthumb-devel.svg
-rename to data/icons/org.gnome.gthumb-devel.svg
-diff --git a/data/icons/public/hicolor/scalable/apps/org.gnome.gthumb.svg b/data/icons/org.gnome.gthumb.svg
-similarity index 100%
-rename from data/icons/public/hicolor/scalable/apps/org.gnome.gthumb.svg
-rename to data/icons/org.gnome.gthumb.svg
-diff --git a/src/meson.build b/src/meson.build
-index 9c9f71da3fd5daa177c4d89cdc3bf462824f1cae..4b528407c6746ec68db3a4dccc1ee0df758be6c5 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -71,7 +71,7 @@ resources_files = gnome.compile_resources('resources',
- source_dir: [
- '../data/icons/private/',
- '../data/icons/private/actions',
-- '../data/icons/public/hicolor/scalable/apps',
-+ '../data/icons/',
- '../data/css',
- '../data/ui',
- ]
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index f126565d3d83328ccb9964c11bc7aec205dc0e52..37319c7d14f953c5853b78bd685c8c6ce0d5f9ae 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -1,49 +1,22 @@
--# Required version 0.14.6 or newer.
--appstreamcli = find_program('appstreamcli')
--
--# NOTE: Release notes are not translated on purpose.
--# This target should not be run when building from tarball, see metainfo-releases-tarball.sh script.
--metainfo_with_relinfo = custom_target('gen-output',
-- input : ['../../NEWS', 'org.gnome.gthumb.metainfo.xml.in'],
-- output : ['nol10n_withrelinfo_org.gnome.gthumb.metainfo.xml'],
-- command : [
-- appstreamcli,
-- 'news-to-metainfo',
-- '--limit=6',
-- '@INPUT0@',
-- '@INPUT1@',
-- '@OUTPUT@'
-- ]
-+metainfo_i18n = i18n.merge_file(
-+ input: 'org.gnome.gthumb.metainfo.xml.in',
-+ output: 'org.gnome.gthumb.metainfo.xml',
-+ type: 'xml',
-+ po_dir: po_dir,
-+ install: true,
-+ install_dir: join_paths(datadir, 'metainfo'),
- )
-
--if get_option('tarball-appdata') == true
-- metainfo_i18n = i18n.merge_file(
-- input : 'org.gnome.gthumb.metainfo.xml.in',
-- output : 'org.gnome.gthumb.metainfo.xml',
-- type : 'xml',
-- po_dir : po_dir,
-- install : true,
-- install_dir : join_paths(datadir, 'metainfo')
-- )
--else
-- metainfo_i18n = i18n.merge_file(
-- input : metainfo_with_relinfo,
-- output : 'org.gnome.gthumb.metainfo.xml',
-- type : 'xml',
-- po_dir : po_dir,
-- install : true,
-- install_dir : join_paths(datadir, 'metainfo')
-+appstreamcli = find_program('appstreamcli', required: false)
-+
-+if appstreamcli.found()
-+ test('as-validate-metainfo',
-+ appstreamcli,
-+ args: [
-+ 'validate',
-+ '--pedantic',
-+ '--no-net',
-+ metainfo_i18n
-+ ]
- )
- endif
--
--test('as-validate-metainfo',
-- appstreamcli,
-- args: [
-- 'validate',
-- '--pedantic',
-- '--no-net',
-- metainfo_i18n
-- ]
--)
--
--meson.add_dist_script('metainfo-releases-tarball.sh')
-diff --git a/data/appdata/metainfo-releases-tarball.sh b/data/appdata/metainfo-releases-tarball.sh
-deleted file mode 100755
-index 4ba67100b9e7ff289b8c76318adcd7b975018b58..0000000000000000000000000000000000000000
---- a/data/appdata/metainfo-releases-tarball.sh
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#!/bin/sh
--appstreamcli news-to-metainfo --limit=1 $MESON_DIST_ROOT/NEWS $MESON_DIST_ROOT/data/appdata/org.gnome.gthumb.metainfo.xml.in $MESON_DIST_ROOT/data/appdata/org.gnome.gthumb.metainfo.xml.in
-diff --git a/data/appdata/org.gnome.gthumb.metainfo.xml.in b/data/appdata/org.gnome.gthumb.metainfo.xml.in
-index 9a81bac3386c5b45eac74f3382aad3d0c290ddbb..2a50b5e3bcddfb6af9d60ce4968ba08a74ed4d39 100644
---- a/data/appdata/org.gnome.gthumb.metainfo.xml.in
-+++ b/data/appdata/org.gnome.gthumb.metainfo.xml.in
-@@ -68,6 +68,38 @@
- <caption>Editor</caption>
- </screenshot>
- </screenshots>
-+ <releases>
-+ <release version="4.0.alpha" date="2026-04-26" type="unstable">
-+ <description>
-+ <p>This release adds the following features:</p>
-+ <ul>
-+ <li>Ported to GTK4, rewritten in Vala</li>
-+ <li>Play WEBP and PNG animations</li>
-+ <li>Save as JXL</li>
-+ <li>Filters: allow to change the quantity of the applied filter for many filters</li>
-+ <li>Filters: added Censor to pixelize or blur an image area</li>
-+ <li>Removed web albums, contact sheet, adjust time, find duplicates</li>
-+ </ul>
-+ </description>
-+ </release>
-+ <release version="3.12.10" date="2026-02-10" type="stable">
-+ <description>
-+ Fixed potential crash.
-+ </description>
-+ </release>
-+ <release version="3.12.9" date="2026-01-23" type="stable">
-+ <description>
-+ <p>This release fixes the following bugs:</p>
-+ <ul>
-+ <li>Fixed compilation when lcms2 is disabled</li>
-+ <li>Lossless rotation: make sure to modify the orientation tags only</li>
-+ <li>Do not change the file modification time if the content did not change</li>
-+ <li>Sharpen: allow to view the image at natural size</li>
-+ <li>Rotation: fixed bilinear filter</li>
-+ </ul>
-+ </description>
-+ </release>
-+ </releases>
- <update_contact>paobac_at_src.gnome.org</update_contact>
- <kudos>
- <kudo>AppMenu</kudo>
-diff --git a/data/meson.build b/data/meson.build
-index 27c581b62553a8f88f34584c5024e0a838ed3e6a..ed1936700bb7b2668c4177ac9569fc33d06555b6 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -27,6 +27,7 @@ endif
-
- subdir('schemas')
- subdir('icons')
-+subdir('appdata')
-
- gnome.post_install(
- glib_compile_schemas: true,
-diff --git a/data/appdata/meson.build b/data/appdata/meson.build
-index 37319c7d14f953c5853b78bd685c8c6ce0d5f9ae..0bc68ba2260dc67ec2b812b960d3d79e5fc79833 100644
---- a/data/appdata/meson.build
-+++ b/data/appdata/meson.build
-@@ -2,7 +2,7 @@ metainfo_i18n = i18n.merge_file(
- input: 'org.gnome.gthumb.metainfo.xml.in',
- output: 'org.gnome.gthumb.metainfo.xml',
- type: 'xml',
-- po_dir: po_dir,
-+ po_dir: podir,
- install: true,
- install_dir: join_paths(datadir, 'metainfo'),
- )
-diff --git a/data/meson.build b/data/meson.build
-index ed1936700bb7b2668c4177ac9569fc33d06555b6..7dbf806e3fa93e28bf6ef87c02fc136285a05850 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -5,7 +5,7 @@ if get_option('developer-mode')
- input: 'org.gnome.gthumb-devel.desktop.in',
- output: 'org.gnome.gthumb-devel.desktop',
- type: 'desktop',
-- po_dir: join_paths(meson.project_source_root(), 'po'),
-+ po_dir: podir,
- install: true,
- install_dir: join_paths(datadir, 'applications')
- )
-@@ -14,7 +14,7 @@ else
- input: 'org.gnome.gthumb.desktop.in',
- output: 'org.gnome.gthumb.desktop',
- type: 'desktop',
-- po_dir: join_paths(meson.project_source_root(), 'po'),
-+ po_dir: podir,
- install: true,
- install_dir: join_paths(datadir, 'applications')
- )
-diff --git a/meson.build b/meson.build
-index c0e3c8cff78854c4f3d77cf1a92e687219eb6d80..28bbb34c046d79cbdd7db121226fdcb49f145ba5 100644
---- a/meson.build
-+++ b/meson.build
-@@ -27,6 +27,7 @@ vala_comp = meson.get_compiler('vala')
- gnome = import('gnome')
- prefix = get_option('prefix')
- datadir = join_paths(prefix, get_option('datadir'))
-+podir = join_paths(meson.project_source_root(), 'po')
-
- # colord
-
-diff --git a/data/appdata/org.gnome.gthumb.metainfo.xml.in b/data/appdata/org.gnome.gthumb.metainfo.xml.in
-index 2a50b5e3bcddfb6af9d60ce4968ba08a74ed4d39..2c083707ed9624227995a74c7dde49560914ea93 100644
---- a/data/appdata/org.gnome.gthumb.metainfo.xml.in
-+++ b/data/appdata/org.gnome.gthumb.metainfo.xml.in
-@@ -69,7 +69,7 @@
- </screenshot>
- </screenshots>
- <releases>
-- <release version="4.0.alpha" date="2026-04-26" type="unstable">
-+ <release version="4.0.alpha" date="2026-04-26" type="development">
- <description>
- <p>This release adds the following features:</p>
- <ul>
-@@ -84,7 +84,7 @@
- </release>
- <release version="3.12.10" date="2026-02-10" type="stable">
- <description>
-- Fixed potential crash.
-+ <p>Fixed potential crash.</p>
- </description>
- </release>
- <release version="3.12.9" date="2026-01-23" type="stable">
diff --git a/gthumb.spec b/gthumb.spec
index 4f370fb..f0e84a3 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -3,7 +3,7 @@
Name: gthumb
Epoch: 1
-Version: 4.0~alpha
+Version: 4.0~beta
Release: %autorelease
Summary: Image viewer, editor, organizer
@@ -11,8 +11,6 @@ License: GPL-2.0-or-later
URL: https://wiki.gnome.org/Apps/gthumb
Source0: https://download.gnome.org/sources/%{name}/%{major_minor_version}/%{name}-%{tarball_version}.tar.xz
-Patch: 0001-gthumb-4.0-alpha-build.patch
-
# the development files had been removed in the 4.0 series
Obsoletes: %{name}-devel < %{version}
diff --git a/sources b/sources
index c35ed9c..bf18824 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gthumb-4.0.alpha.tar.xz) = 8ee231c608c15d0ca612c09f269d18fb9e76b80ca76d3409d792aa8e9d4b5ec2d27877d3c5b1d8e36f3c0a9743ec90cd9435205911607db05adc7b807da278af
+SHA512 (gthumb-4.0.beta.tar.xz) = 0b4f70b8a8199eab152c5b969dc566353dd84070785c5efb320ad8e2c4f7e2cf1f8b7824b5a3ce49f6be933e443a9543c16ac700644924e70a54515ffc0772af
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-23 18:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-23 18:50 [rpms/gthumb] rawhide: Update to 4.0.beta Michael Catanzaro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox