diff --git a/fontforge-20220308.tar.gz b/fontforge-20220308.tar.gz deleted file mode 100644 index 68073be15ce58a2bc0bad12424e3ddcf4b2951ff..0000000000000000000000000000000000000000 Binary files a/fontforge-20220308.tar.gz and /dev/null differ diff --git a/fontforge-20230101.tar.gz b/fontforge-20230101.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..095c444498b30934bb399480a7c1aa638bb9901c Binary files /dev/null and b/fontforge-20230101.tar.gz differ diff --git a/fontforge-remove-20220308-test-need-NotoSans-Regular.patch b/fontforge-remove-20220308-test-need-NotoSans-Regular.patch deleted file mode 100644 index a7a8ed84b56796c9e1cb70f3898ae66b932034b1..0000000000000000000000000000000000000000 --- a/fontforge-remove-20220308-test-need-NotoSans-Regular.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN fontforge/tests/CMakeLists.txt fontforge-20220308/tests/CMakeLists.txt ---- fontforge/tests/CMakeLists.txt 2022-11-16 01:37:22.401554819 +0800 -+++ fontforge-20220308/tests/CMakeLists.txt 2022-11-16 01:51:16.719210008 +0800 -@@ -79,7 +79,7 @@ - add_ff_test(test127.pe "Ambrosia.sfd" "Test generation of TrueType instructions") - #add_ff_test(svg2ttf.pe "") - add_ff_test(test128.pe "Test StrSplit overrun") -- add_ff_test(test130.pe "NotoSans-Regular.ttc" "TTC loading") -+ #add_ff_test(test130.pe "NotoSans-Regular.ttc" "TTC loading") - add_ff_test(test131.pe "libnameslist checks") - if(ENABLE_WOFF2_RESULT) - add_ff_test(test132.pe "CantarellMin.woff2" "WOFF2 round tripping") -@@ -123,7 +123,7 @@ - add_py_test(test927.py "CantarellMin.woff2" "WOFF2 round tripping") - endif() - add_py_test(test928.py "DejaVuSerif.sfd" "String Conversion") -- add_py_test(test929.py "NotoSans-Regular.ttc" "Open Subfonts") -+ #add_py_test(test929.py "NotoSans-Regular.ttc" "Open Subfonts") - add_py_test(test930.py "Point, contour, and Layer fidelity") - add_py_test(test931.py "Point type conversion tests") - add_py_test(test932.py "Round-trip point selection tests") diff --git a/fontforge.spec b/fontforge.spec index 034d7faee61633bc2a6875063beb2f45bcdb9b1e..0a32649f3b0514af6167d6f8ecd8f76852c2eb35 100644 --- a/fontforge.spec +++ b/fontforge.spec @@ -1,16 +1,14 @@ %global gettext_package FontForge -%global gittag0 20200314 +%global gittag0 20230101 Name: fontforge -Version: 20220308 +Version: 20230101 Release: 1 Summary: Outline and bitmap font editor License: GPLv3+ URL: http://fontforge.github.io/ Source0: https://github.com/fontforge/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{version}.tar.gz -Patch0001: fontforge-remove-20220308-test-need-NotoSans-Regular.patch - Requires: xdg-utils potrace hicolor-icon-theme BuildRequires: gcc-c++ cmake libjpeg-devel libtiff-devel libpng-devel giflib-devel libxml2-devel BuildRequires: freetype-devel desktop-file-utils libuninameslist-devel libXt-devel xorg-x11-proto-devel @@ -46,9 +44,8 @@ This package contains documentation files for %{name}. %autosetup -n %{name}-%{version} -p1 # Remove tests that requires Internet access -sed -i '45d;83d;101d;102d;114d;115d;125d' tests/CMakeLists.txt -rm tests/test003.pe tests/test130.pe tests/test0101.py tests/test929.py -# Remove tests for s390x +sed -i '45d;82d;101d;127d' tests/CMakeLists.txt + %build rm -rf build && mkdir build @@ -109,6 +106,9 @@ popd %{_mandir}/man1/*.1* %changelog +* Mon Apr 24 2023 liyanan - 20230101-1 +- upgrade 20230101 + * Sat Nov 12 2022 hua 20220308-1 - update to 20220308