[gtk-osx] Tell Cmake to put a prefix-path on libz.dylib.
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Tell Cmake to put a prefix-path on libz.dylib.
- Date: Tue, 5 Apr 2022 00:17:50 +0000 (UTC)
commit b279eb47da250f0b57cfc143022040a4e137ba2e
Author: John Ralls <jralls ceridwen us>
Date: Mon Apr 4 17:03:35 2022 -0700
Tell Cmake to put a prefix-path on libz.dylib.
jhbuildrc-gtk-osx | 1 +
modulesets-stable/gtk-osx.modules | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index 2e864fa..fba15fd 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -500,6 +500,7 @@ alwaysautogen = True
module_cmakeargs["freetype"] = '-DCMAKE_INSTALL_NAME_DIR="' + os.path.join(prefix, 'lib') + '"'
module_cmakeargs["freetype-no-harfbuzz"] = '-DCMAKE_INSTALL_NAME_DIR="' + os.path.join(prefix, 'lib') + '"'
module_cmakeargs["webkit2gtk3"] = '-DCMAKE_INSTALL_NAME_DIR="' + os.path.join(prefix, 'lib') + '"'
+module_cmakeargs["zlib"] = '-DCMAKE_INSTALL_NAME_DIR="' + os.path.join(prefix, 'lib') + '"'
# Check and warn if jhbuild is started from within jhbuild, since that
# will mess up environment variables, especially if different build
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 95d75a3..5cd349a 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -375,7 +375,7 @@
<dependencies>
<dep package="cairo"/>
<dep package="pango"/>
- <dep package="hafbuzz"/>
+ <dep package="harfbuzz"/>
<dep package="freetype"/>
</dependencies>
<after>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]