diff --git a/0001-build-Build-with-gcr4-by-default.patch b/0001-build-Build-with-gcr4-by-default.patch new file mode 100644 index 0000000..d565ecb --- /dev/null +++ b/0001-build-Build-with-gcr4-by-default.patch @@ -0,0 +1,72 @@ +From cd44b476f4ffbf37c5d5f5b996ecd711db925576 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 19 Jul 2022 21:25:45 +0200 +Subject: [PATCH] build: Build with gcr4 by default + +Use -Dgcr3=true to build against gcr3 instead. + +The gcr4 is going to replace gcr3, this change prepares it to do. +it also defaults to build with gcr4 for the same reason. +--- + meson.build | 10 +++++++++- + meson_options.txt | 1 + + src/vfs.c | 4 ++++ + 3 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 813e67b..b418dce 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,9 +35,14 @@ gtksourceview = dependency('gtksourceview-3.0') + sqlite = dependency('sqlite3') + cairo = dependency('cairo') + atk = dependency('atk') +-gcr = dependency('gcr-base-3') + cryptui = dependency('cryptui-0.0') + ++if get_option('gcr3') ++ gcr = dependency('gcr-base-3') ++else ++ gcr = dependency('gcr-4', version: '>= 3.90.0') ++endif ++ + # Options + evolution_support = get_option('evolution') + spell_checking_support = get_option('spell_checking') +@@ -94,6 +99,9 @@ if have_evolution + # https://gitlab.gnome.org/GNOME/almanah/issues/1 + #conf.set('EDS_DISABLE_DEPRECATED', 1) + endif ++if get_option('gcr3') ++ conf.set('HAVE_GCR3', 1) ++endif + + config = vcs_tag( + input: configure_file( +diff --git a/meson_options.txt b/meson_options.txt +index 85a6860..0c7af1d 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,2 +1,3 @@ + option('evolution', type: 'feature', value: 'enabled', description: 'Enable Evolution calendar integration') + option('spell_checking', type: 'feature', value: 'enabled', description: 'Enable spell checking support') ++option('gcr3', type: 'boolean', value: false, description: 'Build with gcr3; if false, builds with gcr4') +diff --git a/src/vfs.c b/src/vfs.c +index fdc9beb..da238e6 100644 +--- a/src/vfs.c ++++ b/src/vfs.c +@@ -44,7 +44,11 @@ + #include + + #define GCR_API_SUBJECT_TO_CHANGE ++#ifdef HAVE_GCR3 + #include ++#else ++#include ++#endif + #include + #include + #include +-- +2.35.1 + diff --git a/0001-build-remove-positional-i18n.merge_file-arguments.patch b/0001-build-remove-positional-i18n.merge_file-arguments.patch new file mode 100644 index 0000000..b836222 --- /dev/null +++ b/0001-build-remove-positional-i18n.merge_file-arguments.patch @@ -0,0 +1,32 @@ +From 8c42a67695621d1e30cec933a04e633e6030bbaf Mon Sep 17 00:00:00 2001 +From: Bobby Rong <931189261@qq.com> +Date: Fri, 25 Mar 2022 03:14:43 +0000 +Subject: [PATCH] build: remove positional i18n.merge_file arguments + +Fixes build with meson 0.61 +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 1a5d86f..0321c32 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -1,6 +1,5 @@ + desktop = 'almanah.desktop' + i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, +@@ -19,7 +18,6 @@ endif + + appdata = 'almanah.appdata.xml' + i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +-- +2.35.1 + diff --git a/almanah.spec b/almanah.spec index 38d82c6..53dec79 100644 --- a/almanah.spec +++ b/almanah.spec @@ -1,23 +1,26 @@ Name: almanah -Version: 0.12.4 -Release: 4%{?dist} +Version: 0.12.3 +Release: 11%{?dist} Summary: Application for keeping an encrypted diary License: GPL-3.0-or-later URL: https://wiki.gnome.org/Apps/Almanah_Diary Source0: https://download.gnome.org/sources/almanah/0.12/almanah-%{version}.tar.xz -BuildRequires: appstream +Patch01: 0001-build-Build-with-gcr4-by-default.patch +Patch02: 0001-build-remove-positional-i18n.merge_file-arguments.patch + BuildRequires: gcc BuildRequires: gettext BuildRequires: gpgme-devel BuildRequires: desktop-file-utils +BuildRequires: libappstream-glib-devel BuildRequires: meson BuildRequires: pkgconfig(cryptui-0.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gcr-4) BuildRequires: pkgconfig(gtkspell3-3.0) -BuildRequires: pkgconfig(gtksourceview-4) +BuildRequires: pkgconfig(gtksourceview-3.0) BuildRequires: pkgconfig(libecal-2.0) >= 3.45.1 BuildRequires: pkgconfig(libedataserver-1.2) >= 3.45.1 BuildRequires: pkgconfig(sqlite3) @@ -43,31 +46,17 @@ diary entries using multiple events. %files -f %{name}.lang %license COPYING -%doc AUTHORS NEWS.md README.md +%doc AUTHORS NEWS README.md %{_bindir}/%{name} -%{_datadir}/icons/hicolor/*/apps/org.gnome.Almanah.png -%{_datadir}/icons/hicolor/scalable/actions/org.gnome.Almanah-tags-symbolic.svg -%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Almanah-symbolic.svg -%{_datadir}/applications/org.gnome.Almanah.desktop -%{_datadir}/metainfo/org.gnome.Almanah.metainfo.xml +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/*/actions/%{name}*.svg +%{_datadir}/icons/hicolor/scalable/apps/%{name}-symbolic.svg +%{_datadir}/applications/%{name}.desktop +%{_datadir}/metainfo/%{name}.appdata.xml +%{_datadir}/GConf/gsettings/%{name}.convert %{_datadir}/glib-2.0/schemas/org.gnome.%{name}.gschema.xml %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 0.12.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Jul 23 2025 Fedora Release Engineering - 0.12.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jan 16 2025 Fedora Release Engineering - 0.12.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Mon Jan 13 2025 Milan Crha - 0.12.4-1 -- Update to 0.12.4 - -* Wed Jul 17 2024 Fedora Release Engineering - 0.12.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - * Mon Jan 22 2024 Fedora Release Engineering - 0.12.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 54a48ac..e08c797 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (almanah-0.12.4.tar.xz) = 717f3b4aa514be33c236bf0f32866902b0174c28d62ea4b48d1caec2a3a5a85f1105ef491386e336335c619f932a0faf654d047516bcfc81c1ef0ca7b15ef310 +SHA512 (almanah-0.12.3.tar.xz) = d12d87a591d47a651c87106c225a69aa9f5c742d299f6ca37e29ecbf9785ce2506f58cc578002df2dcb6c86eb9767c534f2f5d717e9a6f063b125aca89e556b1