.github/workflows/coverity.yml

@@ -4,12 +4,12 @@ on:
     branches: [ coverity ]
   workflow_dispatch:
 env:
-  PYTHON: python3.9
+  PYTHON: python3.10
 jobs:
   build:
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           path: repo
       - name: Download Coverity Build Tool
@@ -22,7 +22,7 @@ jobs:
           TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
       - name: Restore cached custom dependencies
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: deps/install
           key: ${{ runner.os }}-deps-${{ hashFiles('repo/.github/workflows/scripts/setup_linux_deps.sh') }}

.github/workflows/main.yml

@@ -10,7 +10,7 @@ jobs:
   linux:
     runs-on: ${{ matrix.os }}
     env:
-      PYTHON: python3.9
+      PYTHON: python3.10
     strategy:
       matrix:
         os: ["ubuntu-latest"]
@@ -19,12 +19,12 @@ jobs:
           - os: ubuntu-18.04
             target: Release
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           path: repo
       - name: Restore cached custom dependencies
         id: cache-dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: deps/install
           key: ${{ matrix.os }}-deps-${{ hashFiles('repo/.github/workflows/scripts/setup_linux_deps.sh') }}
@@ -62,23 +62,23 @@ jobs:
           CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
         run: java -jar $DEPSPREFIX/crowdin-cli.jar -c .crowdin.yml upload
       - name: Dist archive artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: matrix.target == 'NoUI'
         with:
           name: dist-archive
           path: repo/build/fontforge-*.tar.xz
       - name: AppImage artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: matrix.target == 'Release'
         with:
           name: appimage
           path: repo/build/FontForge-*-x86_64.AppImage
   mac:
-    runs-on: macos-latest
+    runs-on: macos-10.15
     env:
       PYTHON: python3
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           path: repo
       - name: Install dependencies
@@ -108,7 +108,7 @@ jobs:
         working-directory: repo/build
         run: ninja macbundle
       - name: App Bundle artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: appbundle
           path: repo/build/osx/FontForge-*.dmg
@@ -120,11 +120,11 @@ jobs:
       matrix:
         arch: ["MINGW32", "MINGW64"]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           path: repo
       - name: Checkout FontForgeBuilds
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: fontforge/fontforgebuilds
           path: fontforgebuilds
@@ -149,7 +149,7 @@ jobs:
         working-directory: fontforgebuilds/fontforge-setup
         run: iscc -Qp fontforgesetup.iss -DMSYSTEM=${{ matrix.arch }}
       - name: Build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ matrix.arch }}
           path: |

.github/workflows/scripts/ffappimagebuild.sh

@@ -18,7 +18,8 @@ fi
 echo "Starting appimage build, folder is $APPDIR with version $VERSION"
 
 # TODO: AppStream metainfo
-PYVER=$(ldd $APPDIR/usr/bin/fontforge | grep -Eom1 'python[0-9.]{3}' | head -1 | cut -c 7-)
+PYVER=$(ldd $APPDIR/usr/bin/fontforge | grep -Eom1 'python[0-9\.]+[0-9]+' | head -1 | cut -c 7-)
+echo "FontForge built against Python $PYVER"
 
 ( cd $APPDIR ; dpkg -x /var/cache/apt/archives/libpython${PYVER}-minimal*.deb . )
 ( cd $APPDIR ; dpkg -x /var/cache/apt/archives/libpython${PYVER}-stdlib*.deb . )

CMakeLists.txt

@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 # Update the version for each new release
-project(fontforge VERSION 20220308 LANGUAGES C CXX)
+project(fontforge VERSION 20230101 LANGUAGES C CXX)
 
 # No in source builds
 if("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
@@ -108,7 +108,11 @@ set_font_family(mono "${FONT_FAMILIES_MONO}")
 find_package(Freetype 2.3.7 REQUIRED)
 find_package(Gettext REQUIRED)
 find_package_with_target(Intl REQUIRED)
-find_package(GLIB 2.6 REQUIRED COMPONENTS gio gobject)
+if(UNIX AND NOT APPLE)
+  find_package(GLIB 2.6 REQUIRED COMPONENTS gio gobject)
+else()
+  find_package(GLIB 2.58 REQUIRED COMPONENTS gio gobject)
+endif()
 find_package(Iconv REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(MathLib REQUIRED)

Unicode/ArabicForms.c

@@ -1,4 +1,4 @@
-/* This is a GENERATED file - from makeutype.py with Unicode 14.0.0 */
+/* This is a GENERATED file - from makeutype.py with Unicode 15.0.0 */
 
 /* Copyright (C) 2000-2012 by George Williams */
 /* Contributions: Khaled Hosny, Joe Da Silva */

Unicode/makeutype.py

@@ -27,7 +27,7 @@
 BASE = os.path.dirname(os.path.abspath(__file__))
 SCRIPT = os.path.basename(__file__)
 
-UNIDATA_VERSION = "14.0.0"
+UNIDATA_VERSION = "15.0.0"
 UNICODE_DATA = "UnicodeData%s.txt"
 DERIVED_CORE_PROPERTIES = "DerivedCoreProperties%s.txt"
 PROP_LIST = "PropList%s.txt"
@@ -719,16 +719,16 @@ def makeuninames(unicode, trace):
     # Chosen empirically, tweak as desired. Only ascii is allowed due to
     # how the lexicon is encoded. Generally longer replacements go first
     # so shorter replacements don't prevent them from working.
-    # As of Unicode 13 this is roughly 454kb excluding the size of the
+    # As of Unicode 15 this is roughly 468kb excluding the size of the
     # offset tables
     regexes = [
         (100, re.compile(rb"[\x20-\x7F]{3,}[ -]")),
         (100, re.compile(rb"(?:[\x21-\x7F]+[ -]+){5}")),
         (150, re.compile(rb"(?:[\x21-\x7F]+[ -]+){4}")),
-        (200, re.compile(rb"(?:[\x21-\x7F]+[ -]+){3}")),
-        (900, re.compile(rb"(?:[\x21-\x7F]+[ -]+){2}")),
+        (250, re.compile(rb"(?:[\x21-\x7F]+[ -]+){3}")),
+        (750, re.compile(rb"(?:[\x21-\x7F]+[ -]+){2}")),
         (3400, re.compile(rb"(?:[\x21-\x7F]+[ -]+){1}")),
-        (5000, re.compile(rb"\b[\x21-\x7F]{3,}\b")),
+        (5000, re.compile(rb"\b(?:[a-z]{3,}|[\x21-\x60\x7B-\x7F]{3,})\b")),
     ]
     # The initial character on annotation lines are excluded from the phrasebook
     # This allows us to substitute them for fancier characters