GNOME.org
 

[gtk-osx] Fixups for modulesets builds.

commit ecf1c5d3067f289e5304ad2ba84e2f0fc23ccdcc
Author: John Ralls <jralls ceridwen us>
Date:   Fri Aug 11 10:58:17 2017 +0300

    Fixups for modulesets builds.

 modulesets/gtk-osx-bootstrap.modules |    7 +++++--
 modulesets/gtk-osx-network.modules   |    3 +--
 modulesets/gtk-osx-python.modules    |   20 +++++++++++++++-----
 modulesets/gtk-osx-random.modules    |    5 ++---
 modulesets/gtk-osx.modules           |   18 ++++++++++--------
 5 files changed, 33 insertions(+), 20 deletions(-)
---
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 73bfbcf..8ce058e 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -23,6 +23,7 @@
   <repository type="git" name="git.gnome.org"
               href="git://git.gnome.org/"/>
   <repository type="git" name="github" href="https://github.com/"/>
+  <repository type="tarball" name="github.com" href="git://github.com/"/>
   <repository type="tarball" name="icu"
               href="http://download.icu-project.org/files/"/>
   <repository type="tarball" name="ragel"
@@ -140,7 +141,7 @@
   </autotools>
 
   <autotools id="freetype-no-harfbuzz" skip-autogen="never" autogenargs="--without-bzip2 --without-harfbuzz"
-            autogen-template="%(srcdir)s/%(autogen-sh)s &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  
%(autogenargs)s">
+            autogen-template="pushd %(srcdir)s &amp;&amp; ./%(autogen-sh)s &amp;&amp; popd &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s">
     <branch module="freetype/freetype2" tag="VER-2-7-1" repo="nongnu"/>
     <dependencies>
       <dep package="zlib"/>
@@ -148,7 +149,7 @@
  </autotools>
 
   <autotools id="freetype" skip-autogen="never" autogenargs="--without-bzip2"
-            autogen-template="make distclean &amp;&amp; %(srcdir)s/autogen.sh &amp;&amp; 
%(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s">
+            autogen-template="if test -f Makefile; then make distclean; fi &amp;&amp; pushd %(srcdir)s 
&amp;&amp; ./autogen.sh &amp;&amp; popd &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s  %(autogenargs)s">
     <branch module="freetype/freetype2" tag="VER-2-7-1" repo="nongnu"/>
     <dependencies>
       <dep package="harfbuzz"/>
@@ -160,6 +161,8 @@
     <branch repo="freedesktop" tag="2.12.1"/>
     <dependencies>
       <dep package="freetype"/>
+      <dep package="pylxml"/>
+      <dep package="pysix"/>
     </dependencies>
   </autotools>
 
diff --git a/modulesets/gtk-osx-network.modules b/modulesets/gtk-osx-network.modules
index 545d372..24f9af3 100644
--- a/modulesets/gtk-osx-network.modules
+++ b/modulesets/gtk-osx-network.modules
@@ -146,7 +146,7 @@
     <dependencies>
       <dep package="libwebp"/>
       <dep package="enchant"/>
-      <dep package="icu"55/>
+      <dep package="icu"/>
       <dep package="libsoup"/>
       <dep package="meta-gtk-osx-freetype"/>
     </dependencies>
@@ -197,7 +197,6 @@
   <cmake id="webkit2gtk3"
          cmakeargs="-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_TOOLS=ON 
-DENABLE_MINIBROWSER=ON -DENABLE_PLUGIN_PROCESS_GTK2=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF 
-DENABLE_CREDENTIAL_STORAGE=OFF -DENABLE_GEOLOCATION=OFF -DENABLE_OPENGL=OFF -DUSE_LIBNOTIFY=OFF 
-DUSE_LIBHYPHEN=OFF -DCMAKE_CXX_FLAGS='-stdlib=libc++'">
     <branch repo="webkit.org" module="webkitgtk-2.16.1.tar.xz" version="2.16.1">
-    <branch repo="webkit.org" module="webkitgtk-2.16.1.tar.xz" version="2.16.1">
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/WebKit-2.16.1-Bug-167343-wtf-unicode-UTF8.h.patch"; 
strip="1"/>
       <patch 
file="https://git.gnome.org/browse/gtk-osx/plain/patches/Webkit-2.16-build-without-OpenGL.patch"; strip="1"/>
 <patch file="https://git.gnome.org/browse/gtk-osx/plain/patches/Webkit-2.16-Fix-some-includes.patch"; 
strip="1"/>
diff --git a/modulesets/gtk-osx-python.modules b/modulesets/gtk-osx-python.modules
index 66d5e2c..15c4202 100644
--- a/modulesets/gtk-osx-python.modules
+++ b/modulesets/gtk-osx-python.modules
@@ -99,13 +99,23 @@
     </after>
   </distutils>
 
-  <distutils id="pybsddb">
-    <branch module="b/bsddb3/bsddb3-6.2.4.tar.gz"
-           hash="md5:eec77d104c5981366701c6b0de585504" repo="pymodules"
-           version="6.2.4"/>
+  <distutils id="pylxml">
+    <branch module="20/b3/9f245de14b7696e2d2a386c0b09032a2ff6625270761d6543827e667d8de/lxml-3.8.0.tar.gz"
+           hash="md5:e54e2fae44d684d6b9c636fe189e93ff" repo="pymodules"
+           version="3.8.0" />
+    <dependencies>
+      <dep package="python3"/>
+      <dep package="libxml2"/>
+      <dep package="libxslt"/>
+    </dependencies>
+  </distutils>
+
+  <distutils id="pysix">
+    <branch module="b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-1.10.0.tar.gz"
+           hash="md5:34eed507548117b2ab523ab14b2f8b55" repo="pymodules"
+           version="1.1.0"/>
     <dependencies>
       <dep package="python3"/>
-      <dep package="berkeleydb"/>
     </dependencies>
   </distutils>
 
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index f1be42e..7927271 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -16,7 +16,6 @@
   <repository type="tarball" name="sourceforge"
               href="http://downloads.sourceforge.net/sourceforge/"/>
   <repository type="tarball" name="sqlite" href="http://www.sqlite.org/"/>
-  <repository type="git" name="github" href="git://github.com/"/>
   <repository type="git" name="savannah" href="git://git.sv.gnu/org/"/>
   <repository type="tarball" name="boehm"
              href="http://www.hboem.info/"/>
@@ -271,8 +270,8 @@
   </autotools>
 
   <autotools id="libatomic-ops"
-             autogen-template="%(autogen-sh)s && ./configure --prefix=%(prefix)s> %(autogen-args)s"
-    <branch repo="github.com" module="ivmai/libatomic_ops"
+             autogen-template="%(autogen-sh)s &amp;&amp; ./configure --prefix=%(prefix)s> %(autogen-args)s">
+    <branch repo="github" module="ivmai/libatomic_ops"
            revision="libatomic_ops-7_4_4"/>
   </autotools>
 
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index a7ac3b7..e9fba01 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -66,7 +66,7 @@
     </after>
   </metamodule>
 
-  <autotools id="glib">
+  <autotools id="glib" autogenargs="--with-pcre=internal">
     <branch tag="glib-2-52"/>
     <dependencies>
       <dep package="libffi"/>
@@ -92,8 +92,9 @@
     </after>
   </autotools>
 
+  <!-- Pango seems to be releasing from master these days. -->
   <autotools id="pango">
-    <branch tag="pango-1-40"/>
+    <branch tag="1.40.7"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -117,12 +118,13 @@
   </autotools>
 
   <autotools id="gdk-pixbuf">
-<!--gdk-pixbuf is releasing from master-->
-    <branch />
-    <after>
+    <!--gdk-pixbuf is releasing from master-->
+    <branch/>
+    <dependencies>
       <dep package="pango"/>
       <dep package="gobject-introspection"/>
-    </after>
+      <dep package="shared-mime-info"/>
+    </dependencies>
   </autotools>
 
   <autotools id="xorg-util-macros">
@@ -130,7 +132,7 @@
   </autotools>
 
   <autotools id="libepoxy">
-    <branch repo="github" module="anholt/libepoxy" revision="v1.4.1"/>
+    <branch repo="github" module="anholt/libepoxy" revision="1.4.3"/>
     <dependencies>
       <dep package="xorg-util-macros"/>
     </dependencies>
@@ -185,7 +187,7 @@
     </dependencies>
     <after>
       <dep package="meta-gtk-osx-bootstrap"/>
-      <dep package="freetype-no-harfbuzz"/>
+      <dep package="meta-gtk-osx-freetype"/>
     </after>
   </autotools>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]