public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/godot] main: Use vendored harfbuzz on Fedora < 44 or Mageia < 11, needs harfbuzz >= 13
Date: Mon, 27 Jul 2026 12:24:23 GMT	[thread overview]
Message-ID: <178515506390.1.13431797063031532579.rpms-godot-3580ad318c12@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/godot
Branch : main
Commit : 3580ad318c12ab0cca4aa37a61f1771d22ea23ed
Author : Rémi Verschelde <rverschelde@gmail.com>
Date   : 2026-07-27T13:28:33+02:00
Stats  : +16/-5 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/godot/c/3580ad318c12ab0cca4aa37a61f1771d22ea23ed?branch=main

Log:
Use vendored harfbuzz on Fedora < 44 or Mageia < 11, needs harfbuzz >= 13

---
diff --git a/godot.spec b/godot.spec
index d1d6848..4d5fb93 100644
--- a/godot.spec
+++ b/godot.spec
@@ -39,10 +39,6 @@ BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(harfbuzz)
-BuildRequires:  pkgconfig(harfbuzz-icu)
-BuildRequires:  pkgconfig(harfbuzz-raster)
-BuildRequires:  pkgconfig(harfbuzz-vector)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(graphite2)
 BuildRequires:  pkgconfig(icu-i18n)
@@ -91,12 +87,20 @@ BuildRequires:  python3-scons
 
 # See bundled section for explanations.
 %define system_glslang 0
+%define system_harfbuzz %{expr:0%{?fedora} >= 44 || 0%{?mageia} >= 11}
 %define system_recastnavigation 0%{?mageia}
 
 %if %{system_glslang}
 BuildRequires:  glslang-devel
 %endif
 
+%if %{system_harfbuzz}
+BuildRequires:  pkgconfig(harfbuzz)
+BuildRequires:  pkgconfig(harfbuzz-icu)
+BuildRequires:  pkgconfig(harfbuzz-raster)
+BuildRequires:  pkgconfig(harfbuzz-vector)
+%endif
+
 %if %{system_recastnavigation}
 BuildRequires:  recastnavigation-devel
 %endif
@@ -130,6 +134,10 @@ Provides:       bundled(enet) = 1.3.18
 # Fedora package only provides static libs, needs more work to be usable.
 Provides:       bundled(glslang) = 16.1.0
 %endif
+%if ! %{system_harfbuzz}
+# Requires harfbuzz >= 13.0 for vector and raster APIs.
+Provides:       bundled(harfbuzz) = 14.2.0
+%endif
 # Has custom changes to support seeking in zip archives.
 # Should not be unbundled.
 Provides:       bundled(minizip) = 1.3.2
@@ -213,11 +221,14 @@ end}
 %build
 # Needs to be in %%build so that system_libs stays in scope
 # We don't unbundle enet and minizip as they have necessary custom changes
-to_unbundle="brotli embree freetype graphite harfbuzz icu4c libjpeg_turbo libogg libpng libtheora libvorbis libwebp mbedtls miniupnpc openxr pcre2 sdl wslay zlib zstd"
+to_unbundle="brotli embree freetype graphite icu4c libjpeg_turbo libogg libpng libtheora libvorbis libwebp mbedtls miniupnpc openxr pcre2 sdl wslay zlib zstd"
 
 %if %{system_glslang}
 to_unbundle+=" glslang"
 %endif
+%if %{system_harfbuzz}
+to_unbundle+=" harfbuzz"
+%endif
 %if %{system_recastnavigation}
 to_unbundle+=" recastnavigation"
 %endif

                 reply	other threads:[~2026-07-27 12:24 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178515506390.1.13431797063031532579.rpms-godot-3580ad318c12@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox