From 52a9e66327f2bdac24284f96daefcf3f21a2f09c Mon Sep 17 00:00:00 2001 From: Raboneko <119771935+raboneko@users.noreply.github.com> Date: Wed, 15 Jan 2025 07:38:18 -0800 Subject: [PATCH] fix: fontviewer (#2996) (#2998) * fix: fontviewer * update from releases not latest commit (cherry picked from commit 4003f3569aa7d63b7162e6b2366f49589d2490a2) Co-authored-by: sadlerm4 --- anda/apps/fontviewer/fontviewer.spec | 17 +++++++---------- anda/apps/fontviewer/update.rhai | 9 ++++----- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/anda/apps/fontviewer/fontviewer.spec b/anda/apps/fontviewer/fontviewer.spec index 6766579688..e54b93a5c1 100644 --- a/anda/apps/fontviewer/fontviewer.spec +++ b/anda/apps/fontviewer/fontviewer.spec @@ -1,23 +1,19 @@ -%global commit d530f26d60dc105e44fdc8ac7f30a2f667bc1e4f -%global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20241224 - Name: fontviewer -Version: %{commit_date}.git~%{shortcommit} +Epoch: 1 +Version: 1.1.0 Release: 1%?dist Summary: View and install fonts License: GPL-2.0 URL: https://github.com/chocolateimage/%{name} -Source0: %{url}/archive/%{commit}.tar.gz +Source0: %{url}/archive/v%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: meson -BuildRequires: pkgconfig(cairomm-1.0) BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtkmm-3.0) +BuildRequires: pkgconfig(libcurl) +BuildRequires: json-glib-devel Requires: gtk3 fontconfig @@ -27,7 +23,7 @@ Packager: sadlerm A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer %prep -%autosetup -n %{name}-%{commit} -p1 +%autosetup %build %meson @@ -41,3 +37,4 @@ A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer %doc README.md %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/scalable/actions/%{name}-google-symbolic.svg diff --git a/anda/apps/fontviewer/update.rhai b/anda/apps/fontviewer/update.rhai index 26b31f6421..ecea421601 100644 --- a/anda/apps/fontviewer/update.rhai +++ b/anda/apps/fontviewer/update.rhai @@ -1,5 +1,4 @@ -# rpm.global("commit", gh_commit("chocolateimage/fontviewer")); -# if rpm.changed() { -# rpm.release(); -# rpm.global("commit_date", date()); -# } +rpm.version(gh("chocolateimage/fontviewer")); +if rpm.changed() { + rpm.release(); +}