[gtk-osx] Disable meson fallbacks.



commit 0accf1270ecebdc28b32d321356fe8b3b2ad9e48
Author: John Ralls <jralls ceridwen us>
Date:   Thu Nov 7 16:09:27 2019 -0800

    Disable meson fallbacks.
    
    Because we want missing dependencies to error out so we know that we
    need to add them.
    
    Deletes the just-added pango patch because it's not needed now.

 jhbuildrc-gtk-osx                   |  7 +++++++
 modulesets-stable/gtk-osx.modules   |  1 -
 patches/pango-1.44.7-freetype.patch | 13 -------------
 3 files changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/jhbuildrc-gtk-osx b/jhbuildrc-gtk-osx
index ed5442a..fa2f3a0 100644
--- a/jhbuildrc-gtk-osx
+++ b/jhbuildrc-gtk-osx
@@ -406,6 +406,13 @@ tarballdir = None
 #
 autogenargs=''
 
+# Extra meson args. --wrapmode=nofallback prevents meson projects from
+# building dependencies on their own. We generally want failed
+# dependencies to error out so that we know to add them to the
+# appropriate modules.
+
+mesonargs='--wrap-mode=nofallback'
+
 # Use the included install-check program if available. It won't update
 # timestamps if the header hasn't changed, which speeds up builds.
 #
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 81c66e8..c29ca75 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -138,7 +138,6 @@
   <meson id="pango">
     <branch version="1.44.7" module="pango/1.44/pango-1.44.7.tar.xz"
             hash="sha256:66a5b6cc13db73efed67b8e933584509f8ddb7b10a8a40c3850ca4a985ea1b1f">
-      <patch file="https://gitlab.gnome.org/GNOME/gtk-osx/raw/master/patches/pango-1.44.7-freetype.patch"; 
strip="1"/>
     </branch>
     <dependencies>
       <dep package="glib"/>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]