diff --git a/.gitignore b/.gitignore index c15e946..03adcba 100644 --- a/.gitignore +++ b/.gitignore @@ -24,4 +24,3 @@ fontforge_full-20100501.tar.bz2 /fontforge-20200314.tar.gz /fontforge-20201107.tar.gz /fontforge-20230101.tar.gz -/fontforge-20251009.tar.gz diff --git a/fontforge.spec b/fontforge.spec index 846dfdd..335a34e 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -1,13 +1,19 @@ %global gettext_package FontForge Name: fontforge -Version: 20251009 -Release: 1%{?dist} +Version: 20230101 +Release: 18%{?dist} Summary: Outline and bitmap font editor License: GPL-3.0-or-later URL: http://fontforge.github.io/ Source0: https://github.com/fontforge/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Fix translations with gettext-0.22, https://github.com/fontforge/fontforge/pull/5257 +Patch0: 0001-Fix-errors-in-French-and-Italian-translations.patch +# https://github.com/fontforge/fontforge/pull/5367 +# Fixes CVE-2024-25081 and CVE-2024-25082 +Patch1: https://patch-diff.githubusercontent.com/raw/fontforge/fontforge/pull/5367.patch#/Fix_Splinefont_shell_invocation.patch +Patch2: pyconfig.patch Requires: xdg-utils Requires: (autotrace or potrace) @@ -38,8 +44,6 @@ BuildRequires: shared-mime-info BuildRequires: gtk3-devel BuildRequires: python3-sphinx BuildRequires: make -# 20151009 version requires below -BuildRequires: gtkmm3.0-devel %py_provides python3-fontforge %py_provides python3-psMat @@ -68,7 +72,14 @@ This package contains documentation files for %{name}. %prep -%autosetup +%setup -q +%patch -P 0 -p1 +%patch -P 1 -p1 +%patch -P 2 -p0 + +# Remove tests that requires Internet access +sed -i '45d;82d;101d;127d' tests/CMakeLists.txt + %build export CFLAGS="%{optflags} -fno-strict-aliasing" @@ -119,11 +130,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %doc %{_pkgdocdir} %changelog -* Fri Oct 10 2025 Parag Nemade - 20251009-1 -- Update to 20251009 version (#2402960) -- Remove upstream released patches -- Add new BR: gtkmm3.0-devel - * Wed Jul 23 2025 Fedora Release Engineering - 20230101-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 3c609cb..b0ab3ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fontforge-20251009.tar.gz) = 2923c54e10585551c93102d8b7a389c9de3c629c1676fc8c576c9b9c3f1f6fe28f7a1e39fd5a57ab7eeadf0b17d722bf439ca94f0a788ceab6993e1a93ea7d5f +SHA512 (fontforge-20230101.tar.gz) = 67c21f7e55a78097ef7d7d9abac3add2017400015a6a9dfd56674d933bdba963cb6c4e631ae066026fe1862298d60dd968dec61a9bbee7253dd2f7d105655178