diff --git a/.gitignore b/.gitignore index 9f1c7f8..7c4d755 100644 --- a/.gitignore +++ b/.gitignore @@ -172,3 +172,4 @@ orca-2.31.6.tar.bz2 /orca-45.2.tar.xz /orca-46.alpha.tar.xz /orca-46.beta.tar.xz +/orca-46.0.tar.xz diff --git a/orca-46.beta-without-git.patch b/orca-46.beta-without-git.patch deleted file mode 100644 index 86a778c..0000000 --- a/orca-46.beta-without-git.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 906fb792e043345cfcc9f0d0d2172b03b6c194fb Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Wed, 21 Feb 2024 13:21:17 +0100 -Subject: [PATCH] build: Allow building without git executable - -Most relevant when building from release tarball. -The meson script already allows to not be inside a git tree by falling -back to setting revision='' when git returns no revision. -Let's go one step further and set revision='' also when git is not found; -if this were a git clone, the system would likely have git installed. ---- - src/orca/meson.build | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/orca/meson.build b/src/orca/meson.build -index a994b4505..b92f4b3a8 100644 ---- a/src/orca/meson.build -+++ b/src/orca/meson.build -@@ -23,8 +23,13 @@ orca_i18n_py = configure_file( - } - ) - --r = run_command('git', 'rev-parse', '--short', 'HEAD', check: false) --revision = r.stdout().strip() -+git = find_program('git', required: false) -+if git.found() -+ r = run_command('git', 'rev-parse', '--short', 'HEAD', check: false) -+ revision = r.stdout().strip() -+else -+ revision = '' -+endif - - r = run_command('pkg-config', '--variable=tablesdir', 'liblouis', check: false) - louis_tables_dir = r.stdout().strip() --- -GitLab - diff --git a/orca.spec b/orca.spec index 3f0f893..c6ee5b1 100644 --- a/orca.spec +++ b/orca.spec @@ -1,15 +1,13 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: orca -Version: 46~beta +Version: 46.0 Release: 1%{?dist} Summary: Assistive technology for people with visual impairments License: LGPL-2.1-or-later URL: https://wiki.gnome.org/Projects/Orca Source0: https://download.gnome.org/sources/%{name}/46/%{name}-%{tarball_version}.tar.xz -# https://gitlab.gnome.org/GNOME/orca/-/merge_requests/187 -Patch: orca-46.beta-without-git.patch BuildArch: noarch @@ -76,6 +74,9 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/orca-autostart.de %changelog +* Fri Mar 15 2024 David King - 46.0-1 +- Update to 46.0 + * Sat Mar 02 2024 David King - 46~beta-1 - Update to 46.beta diff --git a/sources b/sources index 3d69661..aeffaad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orca-46.beta.tar.xz) = 7b31fc234ba421dcb1bce574c39c3e9e155366a943475683361991a08372c8832802cb4728722aa1d93b3c43734802cdf355c35d95a7ae206f1271cd2f813f47 +SHA512 (orca-46.0.tar.xz) = 21ea896cfa49c6eed76c0280adfc06201b9e4e000ba3799fd38e13966d99de700733a739f0ed6b589c6b44c65f8ea371dfe04efe2fcc9da1b2b0913e08197b9c