Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pango: fix the build on newer clang releases #58853

Closed
wants to merge 2 commits into from
Closed

pango: fix the build on newer clang releases #58853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e21d7ec
glib: ensure G_GNUC_FALLTHROUGH is defined
mistydemeo Jul 30, 2020
9d42ce0
pango: add a patch for newer clang
mistydemeo Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion Formula/glib.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class Glib < Formula
url "https://download.gnome.org/sources/glib/2.64/glib-2.64.4.tar.xz"
sha256 "f7e0b325b272281f0462e0f7fff25a833820cac19911ff677251daf6d87bce50"
license "LGPL-2.1"
revision 1
revision 2

bottle do
sha256 "5b4079bc14d3e16b745686b6cc7a3bca8877ac914f4ea11b82cda7e5af21c51c" => :catalina
Expand Down Expand Up @@ -42,6 +42,14 @@ class Glib < Formula
sha256 "9e3de41571edaa4bce03959abf885aad4edd069a622a5b642bf40294d748792e"
end

# Enables G_GNUC_FALLTHROUGH on clang.
# Necessary for pango to build on recent versions of clang.
# Will be in the next release.
patch do
url "https://gitlab.gnome.org/GNOME/glib/-/commit/5f38ae5ffca3213addc5b279a46d537792d031db.patch"
sha256 "12128966a693dd45d2e20286437aea13b1fe554aed0907cbc33131d3b76be890"
end

def install
inreplace %w[gio/gdbusprivate.c gio/xdgmime/xdgmime.c glib/gutils.c],
"@@HOMEBREW_PREFIX@@", HOMEBREW_PREFIX
Expand Down
15 changes: 13 additions & 2 deletions Formula/pango.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
class Pango < Formula
desc "Framework for layout and rendering of i18n text"
homepage "https://www.pango.org/"
url "https://download.gnome.org/sources/pango/1.44/pango-1.44.7.tar.xz"
sha256 "66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f"
license "GPL-2.0"

stable do
url "https://download.gnome.org/sources/pango/1.44/pango-1.44.7.tar.xz"
sha256 "66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f"

# Adopts an upstream patch to fix compilers that are picky about
# fallthrough (e.g., newer clang).
# Can be removed on the next release.
patch do
url "https://gitlab.gnome.org/GNOME/pango/-/commit/0b3cd20be5249c51ec981a66c07a39d54d1d1c9d.patch"
sha256 "252378845c5b1b09bf5ae1e06200bba7bf3d4bd679aff2888e95233cf8762a76"
end
end

bottle do
sha256 "38a8cab63ed7ea37fc5448b74dae21b7f935d4f4ea9c08b658f3553f20ec8f28" => :catalina
sha256 "643284e68fcb4699572e7ab327a16ae3eb1c242527a96cb404cd98f14f22a893" => :mojave
Expand Down