Merge pull request #724 from wingtk/fontconfig-2.14.1

Update fontconfig to 2.14.1

.github/workflows/ci.yml

@@ -101,7 +101,9 @@ jobs:
  run: poetry install
  # Temporarily move the preinstalled git, it causes errors related to cygwin.
  - name: Move git binary
- run: move "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
+ run: |
+ move "C:\Program Files\Git\usr\bin" "C:\Program Files\Git\usr\notbin"
+ move "C:\Program Files\Git\bin" "C:\Program Files\Git\notbin"
  shell: cmd
  - name: Build
  run: >
@@ -112,7 +114,9 @@ jobs:
  if: steps.cache.outputs.cache-hit != 'true'
  run: Get-ChildItem C:\gtk-build\build\x64\release\*\dist\*.whl | ForEach-Object -process { cp $_ C:\gtk-build\gtk\x64\release\ }
  - name: Restore git binary
- run: move "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
+ run: |
+ move "C:\Program Files\Git\usr\notbin" "C:\Program Files\Git\usr\bin"
+ move "C:\Program Files\Git\notbin" "C:\Program Files\Git\bin"
  shell: cmd
  - name: Create Source Dist and Wheel
  run: poetry build

gvsbuild/projects/__init__.py

@@ -12,6 +12,7 @@
 from gvsbuild.projects.dev_shell import DevShell
 from gvsbuild.projects.emeus import Emeus
 from gvsbuild.projects.enchant import Enchant
+from gvsbuild.projects.expat import Expat
 from gvsbuild.projects.ffmpeg import Ffmpeg
 from gvsbuild.projects.fontconfig import Fontconfig
 from gvsbuild.projects.freerdp import FreeRDP
@@ -21,6 +22,7 @@
 from gvsbuild.projects.gettext import Gettext
 from gvsbuild.projects.glib import GLib, GLibNetworking, GLibPyWrapper
 from gvsbuild.projects.gobject_introspection import GObjectIntrospection
+from gvsbuild.projects.gperf import Gperf
 from gvsbuild.projects.graphene import Graphene
 from gvsbuild.projects.gsettings_desktop_schemas import GSettingsDesktopSchemas
 from gvsbuild.projects.gstreamer import (

gvsbuild/projects/expat.py

@@ -0,0 +1,35 @@
+# Copyright (C) 2016 - Yevgen Muntyan
+# Copyright (C) 2016 - Ignacio Casal Quinteiro
+# Copyright (C) 2016 - Arnavion
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+from gvsbuild.utils.base_builders import CmakeProject
+from gvsbuild.utils.base_expanders import Tarball
+from gvsbuild.utils.base_project import Project, project_add
+
+
+@project_add
+class Expat(Tarball, CmakeProject):
+ def __init__(self):
+ Project.__init__(
+ self,
+ "expat",
+ archive_url="https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.xz",
+ hash="ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe",
+ dependencies=["cmake", "ninja"],
+ )
+
+ def build(self):
+ CmakeProject.build(self, use_ninja=True)
+ self.install(r".\COPYING share\doc\expat")

gvsbuild/projects/fontconfig.py

@@ -26,10 +26,11 @@ def __init__(self):
  Project.__init__(
  self,
  "fontconfig",
- archive_url="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.0.tar.gz",
- hash="b8f607d556e8257da2f3616b4d704be30fd73bd71e367355ca78963f9a7f0434",
- dependencies=["freetype", "libxml2"],
+ archive_url="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.14.1.tar.gz",
+ hash="ae480e9ca34382790312ff062c625ec70df94d6d9a9366e2b2b3d525f7f90387",
+ dependencies=["freetype", "gperf", "expat"],
  )
+ self.add_param("-Dtests=disabled")
 
  def build(self):
  Meson.build(self)

gvsbuild/projects/gperf.py

@@ -0,0 +1,37 @@
+# Copyright (C) 2016 - Yevgen Muntyan
+# Copyright (C) 2016 - Ignacio Casal Quinteiro
+# Copyright (C) 2016 - Arnavion
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
+from gvsbuild.utils.base_builders import Meson
+from gvsbuild.utils.base_expanders import GitRepo
+from gvsbuild.utils.base_project import Project, project_add
+
+
+@project_add
+class Gperf(GitRepo, Meson):
+ def __init__(self):
+ Project.__init__(
+ self,
+ "gperf",
+ repo_url="https://gitlab.freedesktop.org/tpm/gperf.git",
+ fetch_submodules=False,
+ tag="705c85fee6254ac5eb0df7de6a8ca6f567f34472",
+ dependencies=["ninja"],
+ )
+
+ def build(self):
+ Meson.build(self)
+ self.install(r"COPYING share\doc\gperf")

gvsbuild/projects/librsvg.py

@@ -26,13 +26,14 @@ def __init__(self):
  Project.__init__(
  self,
  "librsvg",
- archive_url="https://download.gnome.org/sources/librsvg/2.54/librsvg-2.54.4.tar.xz",
- hash="ea152a243f6a43c0e036a28c70de3fcbcdea5664c6811c78592bc229ecc24833",
+ archive_url="https://download.gnome.org/sources/librsvg/2.54/librsvg-2.54.5.tar.xz",
+ hash="4f03190f45324d1fa1f52a79dfcded1f64eaf49b3ae2f88eedab0c07617cae6e",
  dependencies=[
  "cargo",
  "cairo",
  "pango",
  "gdk-pixbuf",
+ "libxml2",
  ],
  patches=[],
  )