Ana Guerrero 2024-11-25 22:19:45 +00:00 committed by Git OBS Bridge
commit 0a5fbba259
3 changed files with 86 additions and 25 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 21 20:31:36 UTC 2024 - Dirk Müller <dmueller@suse.com>
- add use-sysconfig-not-distutils.patch: fix build with python 3.13
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 5 12:17:37 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Tue Mar 5 12:17:37 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
@ -93,7 +98,7 @@ Sun Mar 20 21:20:14 UTC 2022 - Dirk Müller <dmueller@suse.com>
- update to 20220308: - update to 20220308:
* Overhauled resource/appearance management * Overhauled resource/appearance management
* Merge/Simplify improvements * Merge/Simplify improvements
* Updated Unicode support to Unicode 14.0.0 * Updated Unicode support to Unicode 14.0.0
* Add Points Of Inflection / Balance / Harmonize * Add Points Of Inflection / Balance / Harmonize
* Language system tag list/script range/feature list updates * Language system tag list/script range/feature list updates
@ -102,7 +107,7 @@ Sun Mar 20 21:20:14 UTC 2022 - Dirk Müller <dmueller@suse.com>
* UFO include path is altered, please update your fonts if needed * UFO include path is altered, please update your fonts if needed
* FontForge is now compiled with -Wall by default * FontForge is now compiled with -Wall by default
* Cidmaps are now bundled * Cidmaps are now bundled
- drop fix-return-statement.patch. obsolete - drop fix-return-statement.patch. obsolete
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Feb 20 10:46:42 UTC 2021 - Dirk Müller <dmueller@suse.com> Sat Feb 20 10:46:42 UTC 2021 - Dirk Müller <dmueller@suse.com>
@ -250,12 +255,12 @@ Thu Nov 9 19:06:46 UTC 2017 - jmatejek@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 9 14:15:44 UTC 2016 - pgajdos@suse.com Fri Dec 9 14:15:44 UTC 2016 - pgajdos@suse.com
- updated to 20161005 [bsc#1014793]: - updated to 20161005 [bsc#1014793]:
* This release introduces a new icon set, new functionality for * This release introduces a new icon set, new functionality for
custom icon selection graphics, support for GlyphOrderAndAliasDB custom icon selection graphics, support for GlyphOrderAndAliasDB
files, and support for Unicode 9.0. files, and support for Unicode 9.0.
* It also fixes a number of small bugs relating to certain bitmap * It also fixes a number of small bugs relating to certain bitmap
typefaces, stroke expansion, handling of CID ranges, and the typefaces, stroke expansion, handling of CID ranges, and the
user interface. user interface.
- removed upstreamed patches: - removed upstreamed patches:
- propagate-creation-and-modification-times-to-ttf.patch - propagate-creation-and-modification-times-to-ttf.patch
@ -270,14 +275,14 @@ Tue Jan 26 08:10:44 UTC 2016 - pgajdos@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Dec 16 14:03:36 UTC 2015 - pgajdos@suse.com Wed Dec 16 14:03:36 UTC 2015 - pgajdos@suse.com
- updated to 20150824: This fixes a few bugs, including some in - updated to 20150824: This fixes a few bugs, including some in
U. F. O. kerning classes and FreeType rasterization, and adds U. F. O. kerning classes and FreeType rasterization, and adds
a Korean translation. a Korean translation.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 11 08:36:20 UTC 2015 - pgajdos@suse.com Mon May 11 08:36:20 UTC 2015 - pgajdos@suse.com
- updated to 20150430: this release includes a few bug fixes, - updated to 20150430: this release includes a few bug fixes,
performance enhancements, and refreshed icons. performance enhancements, and refreshed icons.
- download uthash when get-source.sh - download uthash when get-source.sh
- fontforge --version now returns fontforge release version - fontforge --version now returns fontforge release version
@ -286,7 +291,7 @@ Mon May 11 08:36:20 UTC 2015 - pgajdos@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 1 13:17:09 UTC 2015 - coolo@suse.com Fri May 1 13:17:09 UTC 2015 - coolo@suse.com
- also repackage the broken gnulib links to fix build with - also repackage the broken gnulib links to fix build with
newer libtool newer libtool
------------------------------------------------------------------- -------------------------------------------------------------------
@ -298,12 +303,12 @@ Mon Apr 20 07:10:42 UTC 2015 - pgajdos@suse.com
Tue Mar 31 09:55:24 UTC 2015 - pgajdos@suse.com Tue Mar 31 09:55:24 UTC 2015 - pgajdos@suse.com
- updated to 20150330: - updated to 20150330:
* fixes a few crashes, enhances round-tripping of information in * fixes a few crashes, enhances round-tripping of information in
certain file formats, and fixes some bad logic certain file formats, and fixes some bad logic
* adds support for fine point adjustment * adds support for fine point adjustment
* etc. see https://github.com/fontforge/fontforge/releases * etc. see https://github.com/fontforge/fontforge/releases
for details for details
- remove %requires_ge libpng16-16 as it seems fontforge is not so - remove %requires_ge libpng16-16 as it seems fontforge is not so
picky anymore picky anymore
- doc is generated - doc is generated
- remove pfaedit compat - remove pfaedit compat
@ -368,7 +373,7 @@ Tue Apr 16 12:17:30 UTC 2013 - pgajdos@suse.com
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Apr 16 12:05:41 UTC 2013 - pgajdos@suse.com Tue Apr 16 12:05:41 UTC 2013 - pgajdos@suse.com
- %requires_ge libpng16-16 to avoid - %requires_ge libpng16-16 to avoid
'Application built with libpng-1.5.14 but running with 1.6.1' 'Application built with libpng-1.5.14 but running with 1.6.1'
warning when running fontforge warning when running fontforge
@ -383,8 +388,8 @@ Sun Dec 30 06:44:35 UTC 2012 - dmitry_r@opensuse.org
- Update to 20120731b - Update to 20120731b
* see included changelog.html for details * see included changelog.html for details
* removed obsolete fontforge.py27.diff * removed obsolete fontforge.py27.diff
* removed obsolete fontforge-missing-closedir.diff * removed obsolete fontforge-missing-closedir.diff
* removed obsolete libpng14.diff * removed obsolete libpng14.diff
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 20 20:25:40 UTC 2011 - coolo@suse.com Tue Dec 20 20:25:40 UTC 2011 - coolo@suse.com
@ -407,14 +412,14 @@ Mon May 16 14:38:39 CEST 2011 - pgajdos@suse.cz
- updated to 20110222: - updated to 20110222:
* Did a lot of work to improve the accuracy in remove overlap. * Did a lot of work to improve the accuracy in remove overlap.
* Fix various error messages. * Fix various error messages.
* Remove some obsolete documentation. * Remove some obsolete documentation.
* Technical fixes to stroking code. * Technical fixes to stroking code.
* Add a miterlimit to stroking code. * Add a miterlimit to stroking code.
* FontForge was using the wrong MIME type for svg files. * FontForge was using the wrong MIME type for svg files.
W3C has changed it and it's now "image/svg+xml" not W3C has changed it and it's now "image/svg+xml" not
"image/svg-xml" or "image/svg". "image/svg-xml" or "image/svg".
* etc. on * etc. on
http://fontforge.sourceforge.net/changelog.html http://fontforge.sourceforge.net/changelog.html
* libpng14.diff and fontforge.py27.diff kept but not needed yet * libpng14.diff and fontforge.py27.diff kept but not needed yet
@ -443,7 +448,7 @@ Mon Apr 5 12:00:54 UTC 2010 - toms@suse.de
Sat Oct 3 12:16:21 UTC 2009 - crrodriguez@opensuse.org Sat Oct 3 12:16:21 UTC 2009 - crrodriguez@opensuse.org
- fontforge-20090622-1.6: missing call to closedir [bnc#543458] - fontforge-20090622-1.6: missing call to closedir [bnc#543458]
- fix -devel package dependencies - fix -devel package dependencies
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 27 16:57:52 CEST 2009 - tiwai@suse.de Mon Jul 27 16:57:52 CEST 2009 - tiwai@suse.de
@ -490,7 +495,7 @@ Thu Aug 02 16:33:43 CEST 2007 - mfabian@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 24 12:49:54 CEST 2007 - coolo@suse.de Tue Jul 24 12:49:54 CEST 2007 - coolo@suse.de
- remove BuildPreRequires - remove BuildPreRequires
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 06 17:06:16 CET 2007 - mfabian@suse.de Tue Feb 06 17:06:16 CET 2007 - mfabian@suse.de
@ -523,7 +528,7 @@ Fri Nov 17 19:54:59 CET 2006 - mfabian@suse.de
Mon Nov 6 00:28:15 CET 2006 - ro@suse.de Mon Nov 6 00:28:15 CET 2006 - ro@suse.de
- fix permissions on icon file - fix permissions on icon file
- fix gcc warning for strncat - fix gcc warning for strncat
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 17 14:25:48 CEST 2006 - mfabian@suse.de Tue Oct 17 14:25:48 CEST 2006 - mfabian@suse.de
@ -598,7 +603,7 @@ Wed May 11 12:31:06 CEST 2005 - mfabian@suse.de
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 14 21:27:40 CET 2004 - hvogel@suse.de Tue Dec 14 21:27:40 CET 2004 - hvogel@suse.de
- install icon - install icon
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 11 12:48:59 CET 2004 - ro@suse.de Thu Nov 11 12:48:59 CET 2004 - ro@suse.de

View File

@ -30,6 +30,8 @@ Patch1: add-bitmap-transform-support.patch
# PATCH-FIX-UPSTREAM fontforge-CVE-2024-25081-CVE-2024-25082.patch CVE-2024-25081 CVE-2024-25082 bsc#1220404 bsc#1220405 qzhao@suse.com -- Fix Splinefont shell invocation. # PATCH-FIX-UPSTREAM fontforge-CVE-2024-25081-CVE-2024-25082.patch CVE-2024-25081 CVE-2024-25082 bsc#1220404 bsc#1220405 qzhao@suse.com -- Fix Splinefont shell invocation.
Patch2: fontforge-CVE-2024-25081-CVE-2024-25082.patch Patch2: fontforge-CVE-2024-25081-CVE-2024-25082.patch
Patch3: https://github.com/fontforge/fontforge/commit/642d8a3db6d4bc0e70b429622fdf01ecb09c4c10.patch Patch3: https://github.com/fontforge/fontforge/commit/642d8a3db6d4bc0e70b429622fdf01ecb09c4c10.patch
# PATCH-FIX-UPSTREAM: taken from https://github.com/fontforge/fontforge/commit/8c75293e924602ed09a9481b0eeb67ba6c623a81
Patch4: use-sysconfig-not-distutils.patch
BuildRequires: cairo-devel BuildRequires: cairo-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: fdupes BuildRequires: fdupes

View File

@ -0,0 +1,54 @@
From 8c75293e924602ed09a9481b0eeb67ba6c623a81 Mon Sep 17 00:00:00 2001
From: Maxim Iorsh <iorsh@users.sourceforge.net>
Date: Mon, 7 Oct 2024 11:44:00 +0300
Subject: [PATCH] Use sysconfig for Python module locations (#5423)
* Use sysconfig for Python module locations
* [TEMP] Use iorsh/fontforgebuilds repo
* [TEMP] Use iorsh/fontforgebuilds repo in Appveyor
* Update
* Revert "[TEMP] Use iorsh/fontforgebuilds repo in Appveyor"
This reverts commit 6fa80455b8b1e7cf43419c73e4de714f7925d9f8.
* test
* Cleanup
* test
* Removed debug prints
---------
Co-authored-by: Jeremy Tan <jtanx@outlook.com>
---
.github/workflows/main.yml | 24 +++++++++----------
.github/workflows/scripts/ffosxbuild.sh | 7 ++++--
.github/workflows/scripts/setup_linux_deps.sh | 2 +-
CMakeLists.txt | 6 -----
osx/CMakeLists.txt | 2 +-
pyhook/CMakeLists.txt | 5 +++-
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/pyhook/CMakeLists.txt b/pyhook/CMakeLists.txt
index dd48054aa7..53708f1099 100644
--- a/pyhook/CMakeLists.txt
+++ b/pyhook/CMakeLists.txt
@@ -20,8 +20,11 @@ target_link_libraries(psMat_pyhook PRIVATE Python3::Module)
# FindPython3 provides Python3_SITEARCH, but this is an absolute path
# So do it ourselves, getting the prefix-relative path instead
if(NOT DEFINED PYHOOK_INSTALL_DIR)
+ if(APPLE)
+ set(_PYHOOK_SYSCONFIG_PREFIX " 'posix_prefix',")
+ endif()
execute_process(
- COMMAND "${Python3_EXECUTABLE}" -c "import distutils.sysconfig as sc; print(sc.get_python_lib(prefix='', plat_specific=True,standard_lib=False))"
+ COMMAND "${Python3_EXECUTABLE}" -c "import sysconfig as sc; print(sc.get_path('platlib',${_PYHOOK_SYSCONFIG_PREFIX} vars={'platbase': '.'}))"
RESULT_VARIABLE _pyhook_install_dir_result
OUTPUT_VARIABLE PYHOOK_INSTALL_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE)