[gtk-osx] Set up external PCRE for glib main



commit 9d50837fb57ee976f4088eab7883cee1a0d92c98
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jun 29 14:57:36 2021 -0700

    Set up external PCRE for glib main
    
    No longer provides an internal one.

 modulesets-unstable/gtk-osx-random.modules |  4 ++--
 modulesets-unstable/gtk-osx.modules        | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index c601d3c3..c9feeb3f 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -103,9 +103,9 @@
   </meson>
 
    <autotools id="libpcre2" autogen-sh="configure">
-    <branch repo="pcre" version="20.36"
+    <branch repo="pcre" version="10.37"
             module="pcre/pcre2-10.36.tar.bz2"
-            hash="sha256:a9ef39278113542968c7c73a31cfcb81aca1faa64690f400b907e8ab6b4a665c"/>
+            hash="sha256:4d95a96e8b80529893b4562be12648d798b957b1ba1aae39606bbc2ab956d270"/>
   </autotools>
   
  <meson id="gtksourceview4">
diff --git a/modulesets-unstable/gtk-osx.modules b/modulesets-unstable/gtk-osx.modules
index e559eeff..cc9ffdf1 100644
--- a/modulesets-unstable/gtk-osx.modules
+++ b/modulesets-unstable/gtk-osx.modules
@@ -9,6 +9,7 @@
               href="https://gitlab.freedesktop.org/"/>
   <repository type="git" name="nongnu"
              href="git://git.sv.nongnu.org/"/>
+  <repository type="tarball" name="pcre" href="https://ftp.pcre.org/pub/"/>
   <repository type="system" name="system"/>
 
   <!-- This module set works a bit differently than for example the
@@ -60,9 +61,16 @@
     <branch module="atgreen/libffi" repo="github"/>
   </autotools>
 
-  <meson id="glib" mesonargs="-Dinternal_pcre=true -Dlibmount=disabled">
+   <autotools id="libpcre" autogen-sh="configure">
+    <branch repo="pcre" version="8.45"
+            module="pcre/pcre-8.45.tar.bz2"
+            hash="sha256:4dae6fdcd2bb0bb6c37b5f97c33c2be954da743985369cddac3546e3218bffb8"/>
+  </autotools>
+  
+  <meson id="glib" mesonargs="-Dlibmount=disabled">
     <branch/>
     <dependencies>
+      <dep package="libpcre"/>
       <dep package="libffi"/>
     </dependencies>
   </meson>


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