diff --git a/orca-46.beta-without-git.patch b/orca-46.beta-without-git.patch new file mode 100644 index 0000000..86a778c --- /dev/null +++ b/orca-46.beta-without-git.patch @@ -0,0 +1,37 @@ +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 ed0f96e..3f0f893 100644 --- a/orca.spec +++ b/orca.spec @@ -1,13 +1,15 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: orca -Version: 46~alpha -Release: 2%{?dist} +Version: 46~beta +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 @@ -21,7 +23,7 @@ BuildRequires: gettext BuildRequires: intltool BuildRequires: gtk3-devel BuildRequires: itstool -BuildRequires: make +BuildRequires: meson BuildRequires: python3-brlapi BuildRequires: python3-devel BuildRequires: python3-louis @@ -46,12 +48,12 @@ provider interface (AT-SPI), e.g. the GNOME desktop. %build -%configure -%make_build +%meson +%meson_build %install -%make_install +%meson_install %find_lang %{name} --with-gnome @@ -62,7 +64,7 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/orca-autostart.de %files -f %{name}.lang %license COPYING -%doc AUTHORS NEWS README +%doc AUTHORS NEWS README.md %{_bindir}/orca %{python3_sitelib}/orca/ %{_datadir}/icons/hicolor/*/apps/orca.png @@ -74,6 +76,9 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/orca-autostart.de %changelog +* Sat Mar 02 2024 David King - 46~beta-1 +- Update to 46.beta + * Thu Jan 25 2024 Fedora Release Engineering - 46~alpha-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild