Skip to content

Commit

Permalink
Pango: New version 1.55.5 (#10037)
Browse files Browse the repository at this point in the history
* Pango: New version 1.55.5

* Pango: Add patch for macOS
  • Loading branch information
eschnett authored Dec 19, 2024
1 parent f35d3a5 commit 77dc313
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 11 deletions.
26 changes: 15 additions & 11 deletions P/Pango/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
using BinaryBuilder

name = "Pango"
fakeversion = v"1.54.1" # <-- Fake version to rebuild for new HarfBuzz version
version = v"1.54.0"
version = v"1.55.5"

# Collection of sources required to build Pango: https://download.gnome.org/sources/pango/
sources = [
ArchiveSource("http://ftp.gnome.org/pub/GNOME/sources/pango/$(version.major).$(version.minor)/pango-$(version).tar.xz",
"8a9eed75021ee734d7fc0fdf3a65c3bba51dfefe4ae51a9b414a60c70b2d1ed8"),
"e396126ea08203cbd8ef12638e6222e2e1fd8aa9cac6743072fedc5f2d820dd8"),
ArchiveSource("https://sourceforge.net/projects/mingw-w64/files/mingw-w64/mingw-w64-release/mingw-w64-v11.0.0.tar.bz2",
"bd0ea1633bd830204cc23a696889335e9d4a32b8619439ee17f22188695fcc5f"),
DirectorySource("bundled"),
]

# Bash recipe for building across all platforms
Expand All @@ -35,6 +35,8 @@ fi
cd $WORKSPACE/srcdir/pango*/
atomic_patch -p1 ../patches/sentinel.patch
if [[ "${target}" == "${MACHTYPE}" ]]; then
# When building for the host platform, the system libexpat is picked up
rm /usr/lib/libexpat.so*
Expand Down Expand Up @@ -69,14 +71,16 @@ products = [

# Dependencies that must be installed before this package can be built
dependencies = [
Dependency("Cairo_jll"; compat="1.18.0"),
Dependency("Fontconfig_jll"),
Dependency("FreeType2_jll"; compat="2.13.1"),
Dependency("FriBidi_jll"; compat="1.0.10"),
Dependency("Glib_jll"; compat="2.74.0"),
Dependency("HarfBuzz_jll"; compat="8.3.1"),
BuildDependency("Xorg_xorgproto_jll"; platforms=filter(p->Sys.islinux(p)||Sys.isfreebsd(p), platforms)),
HostBuildDependency("gperf_jll"),
Dependency("Cairo_jll"; compat="1.18.2"),
Dependency("Fontconfig_jll"; compat="2.15.0"),
Dependency("FreeType2_jll"; compat="2.13.3"),
Dependency("FriBidi_jll"; compat="1.0.16"),
Dependency("Glib_jll"; compat="2.82.2"),
Dependency("HarfBuzz_jll"; compat="8.5.0"),
BuildDependency("Xorg_xorgproto_jll"; platforms=filter(p -> Sys.isfreebsd(p) || Sys.islinux(p), platforms)),
]

# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, fakeversion, sources, script, platforms, products, dependencies; julia_compat="1.6", preferred_gcc_version = v"6", clang_use_lld=false)
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
clang_use_lld=false, julia_compat="1.6", preferred_gcc_version=v"6")
16 changes: 16 additions & 0 deletions P/Pango/bundled/patches/sentinel.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Building Pango 1.55.5 with FriBidi 1.0.16 fails with the error message
```
[00:16:53] ../pango/pango-bidi-type.c:83:10: error: use of undeclared identifier '_FRIBIDI_TYPE_SENTINEL'
```
Reported as <https://gitlab.gnome.org/GNOME/pango/-/issues/834>.

--- a/pango/pango-bidi-type.c
+++ b/pango/pango-bidi-type.c
@@ -80,7 +80,6 @@
case FRIBIDI_TYPE_RLI: return PANGO_BIDI_TYPE_RLI;
case FRIBIDI_TYPE_FSI: return PANGO_BIDI_TYPE_FSI;
case FRIBIDI_TYPE_PDI: return PANGO_BIDI_TYPE_PDI;
- case _FRIBIDI_TYPE_SENTINEL:
default:
return PANGO_BIDI_TYPE_ON;
}

0 comments on commit 77dc313

Please sign in to comment.