!38 update version from 20200314 to 20220308
From: @dan1111 Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot
Gitee
commit
1b14728b83
@ -1,27 +0,0 @@
|
||||
From ee14a6389d19e2f45219134058e07f10585fa6d3 Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Tan <jtanx@outlook.com>
|
||||
Date: Thu, 2 Apr 2020 18:03:47 +0800
|
||||
Subject: [PATCH] Call gdk_set_allowed_backends before gdk_init
|
||||
|
||||
Fixes #4247
|
||||
---
|
||||
fontforgeexe/startui.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/fontforgeexe/startui.c b/fontforgeexe/startui.c
|
||||
index 06f5200a4..114bb7fb6 100644
|
||||
--- a/fontforgeexe/startui.c
|
||||
+++ b/fontforgeexe/startui.c
|
||||
@@ -1182,8 +1182,8 @@ int fontforge_main( int argc, char **argv ) {
|
||||
#endif
|
||||
}
|
||||
#ifdef FONTFORGE_CAN_USE_GDK
|
||||
- gdk_init(&argc, &argv);
|
||||
gdk_set_allowed_backends("win32,quartz,x11");
|
||||
+ gdk_init(&argc, &argv);
|
||||
#endif
|
||||
ensureDotFontForgeIsSetup();
|
||||
#if defined(__MINGW32__) && !defined(_NO_LIBCAIRO)
|
||||
--
|
||||
2.26.0
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
From 36b52b9902a9e3858ef34ec006b6ad5da6374de1 Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Tan <jtanx@outlook.com>
|
||||
Date: Mon, 6 Apr 2020 20:57:14 +1000
|
||||
Subject: [PATCH] sphinx: make changes to support Sphinx 3
|
||||
|
||||
---
|
||||
doc/sphinx/scripting/python/fontforge.rst | 18 +++---------------
|
||||
1 file changed, 3 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/doc/sphinx/scripting/python/fontforge.rst b/doc/sphinx/scripting/python/fontforge.rst
|
||||
index b97332229..f726b1ed4 100644
|
||||
--- a/doc/sphinx/scripting/python/fontforge.rst
|
||||
+++ b/doc/sphinx/scripting/python/fontforge.rst
|
||||
@@ -1365,6 +1365,7 @@ Layers may be compared to see if their contours are similar.
|
||||
layer.stroke("calligraphic", width, height, angle[, FLAGS])
|
||||
layer.stroke("polygon", contour[, FLAGS])
|
||||
(Legacy interface)
|
||||
+ :noindex:
|
||||
|
||||
.. method:: layer.stroke("circular", width [, CAP, JOIN, ANGLE, KEYWORD])
|
||||
layer.stroke("elliptical", width, minor_width [, ANGLE, CAP, JOIN, KEYWORD])
|
||||
@@ -2458,6 +2459,7 @@ must be created through the font.
|
||||
glyph.stroke("calligraphic", width, height, angle[, FLAGS])
|
||||
glyph.stroke("polygon", contour[, FLAGS])
|
||||
(Legacy interface)
|
||||
+ :noindex:
|
||||
|
||||
.. method:: glyph.stroke("circular", width[, CAP, JOIN, ANGLE, KEYWORD])
|
||||
glyph.stroke("elliptical", width, minor_width[, ANGLE, CAP, JOIN, KEYWORD])
|
||||
@@ -4786,21 +4788,6 @@ See the :class:`selection` type for how to alter the selection.
|
||||
Extrema should be marked by on-curve points. If a curve in any selected
|
||||
glyph lacks a point at a significant extremum this command will add one.
|
||||
|
||||
-.. method:: font.addSmallCaps()
|
||||
-
|
||||
- For all selected upper or lower case letters in the latin, greek and
|
||||
- cyrillic scripts this will try to create a small caps version of that glyph
|
||||
- in a new glyph slot.
|
||||
-
|
||||
- So if you select "A" (or "a") then a glyph "a.sc" will be created (if "a.sc"
|
||||
- already exists, it will be reused, and its current contents cleared).
|
||||
-
|
||||
- The contents of "a.sc" will be based on the upper case variant of this glyph
|
||||
- (and that variant must be present for the command to work). FontForge will
|
||||
- also create two lookups (unless appropriate ones already exist) one, bound
|
||||
- to the feature 'c2sc' will map upper case letters to small caps, the other,
|
||||
- bound to feature 'smcp' will map lower case letters to small caps.
|
||||
-
|
||||
.. method:: font.autoHint()
|
||||
|
||||
Generates PostScript hints for all selected glyphs.
|
||||
@@ -4993,6 +4980,7 @@ See the :class:`selection` type for how to alter the selection.
|
||||
font.stroke("calligraphic", width, height, angle[, FLAGS])
|
||||
font.stroke("polygon", contour[, FLAGS])
|
||||
(Legacy interface)
|
||||
+ :noindex:
|
||||
|
||||
.. method:: font.stroke("circular", width[, CAP, JOIN, ANGLE, KEYWORD])
|
||||
font.stroke("elliptical", width, minor_width[, ANGLE, CAP, JOIN, KEYWORD])
|
||||
--
|
||||
2.26.0
|
||||
|
||||
Binary file not shown.
BIN
fontforge-20220308.tar.gz
Normal file
BIN
fontforge-20220308.tar.gz
Normal file
Binary file not shown.
21
fontforge-remove-20220308-test-need-NotoSans-Regular.patch
Normal file
21
fontforge-remove-20220308-test-need-NotoSans-Regular.patch
Normal file
@ -0,0 +1,21 @@
|
||||
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")
|
||||
@ -2,15 +2,14 @@
|
||||
%global gittag0 20200314
|
||||
|
||||
Name: fontforge
|
||||
Version: 20200314
|
||||
Release: 6
|
||||
Version: 20220308
|
||||
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-20200314-Call-gdk_set_allowed_backends-before-gdk_init.patch
|
||||
Patch0002: fontforge-20200314-sphinx-make-changes-to-support-Sphinx-3.patch
|
||||
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
|
||||
@ -50,7 +49,6 @@ This package contains documentation files for %{name}.
|
||||
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
|
||||
rm tests/test0004.py tests/test1009.py tests/test1010.py
|
||||
|
||||
%build
|
||||
rm -rf build && mkdir build
|
||||
@ -98,7 +96,6 @@ popd
|
||||
%{_datadir}/applications/*FontForge.desktop
|
||||
%{_datadir}/fontforge
|
||||
%{_datadir}/icons/hicolor/*/apps/org.fontforge.FontForge*
|
||||
%{_datadir}/pixmaps/org.fontforge.FontForge*
|
||||
%{_datadir}/mime/packages/fontforge.xml
|
||||
%{_metainfodir}/org.fontforge.FontForge.appdata.xml
|
||||
%{python3_sitearch}/fontforge.so
|
||||
@ -112,6 +109,9 @@ popd
|
||||
%{_mandir}/man1/*.1*
|
||||
|
||||
%changelog
|
||||
* Sat Nov 12 2022 hua <dchang@zhixundn.com> 20220308-1
|
||||
- update to 20220308
|
||||
|
||||
* Tue Jul 13 2021 wangyue <wangyue92@huawei.com> - 20200314-6
|
||||
- remove useless glib buildrequire
|
||||
- move %find_lang to correct stage
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user