Title: [186655] trunk/Tools
- Revision
- 186655
- Author
- mcatanz...@igalia.com
- Date
- 2015-07-09 17:20:31 -0700 (Thu, 09 Jul 2015)
Log Message
[GTK] pango should be included in the default jhbuild moduleset
https://bugs.webkit.org/show_bug.cgi?id=146683
Reviewed by Martin Robinson.
Recent releases of pango 1.36 use functions that are only provided by fontconfig 2.12 when
compiled against sufficiently-new versions of fontconfig. Since we depend on both pango and
fontconfig, and pango depends on fontconfig, we must either add pango to our jhbuild
moduleset or else upgrade fontconfig to a recent unstable release (knowing that we will have
the same problem again the next time pango wants to use a new fontconfig feature), or remove
fontconfig (which would make it hard to keep tests working). On the balance, adding pango is
best.
* gtk/jhbuild-optional.modules: Remove pango
* gtk/jhbuild.modules: Add pango and update to latest 1.36.8
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (186654 => 186655)
--- trunk/Tools/ChangeLog 2015-07-10 00:11:09 UTC (rev 186654)
+++ trunk/Tools/ChangeLog 2015-07-10 00:20:31 UTC (rev 186655)
@@ -1,3 +1,21 @@
+2015-07-09 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [GTK] pango should be included in the default jhbuild moduleset
+ https://bugs.webkit.org/show_bug.cgi?id=146683
+
+ Reviewed by Martin Robinson.
+
+ Recent releases of pango 1.36 use functions that are only provided by fontconfig 2.12 when
+ compiled against sufficiently-new versions of fontconfig. Since we depend on both pango and
+ fontconfig, and pango depends on fontconfig, we must either add pango to our jhbuild
+ moduleset or else upgrade fontconfig to a recent unstable release (knowing that we will have
+ the same problem again the next time pango wants to use a new fontconfig feature), or remove
+ fontconfig (which would make it hard to keep tests working). On the balance, adding pango is
+ best.
+
+ * gtk/jhbuild-optional.modules: Remove pango
+ * gtk/jhbuild.modules: Add pango and update to latest 1.36.8
+
2015-07-09 Devin Rousso <drou...@apple.com>
Unreviewed. Added myself as a committer.
Modified: trunk/Tools/gtk/jhbuild-optional.modules (186654 => 186655)
--- trunk/Tools/gtk/jhbuild-optional.modules 2015-07-10 00:11:09 UTC (rev 186654)
+++ trunk/Tools/gtk/jhbuild-optional.modules 2015-07-10 00:20:31 UTC (rev 186655)
@@ -56,16 +56,4 @@
</branch>
</autotools>
- <autotools id="pango" autogen-sh="configure"
- autogenargs="--enable-cairo">
- <dependencies>
- <dep package="cairo"/>
- <dep package="fontconfig"/>
- </dependencies>
- <branch module="/pub/GNOME/sources/pango/1.34/pango-1.34.0.tar.xz" version="1.34.0"
- repo="ftp.gnome.org"
- hash="sha256:105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27">
- </branch>
- </autotools>
-
</moduleset>
Modified: trunk/Tools/gtk/jhbuild.modules (186654 => 186655)
--- trunk/Tools/gtk/jhbuild.modules 2015-07-10 00:11:09 UTC (rev 186654)
+++ trunk/Tools/gtk/jhbuild.modules 2015-07-10 00:20:31 UTC (rev 186655)
@@ -151,6 +151,7 @@
<dep package="cairo"/>
<dep package="at-spi2-atk"/>
<dep package="gdk-pixbuf"/>
+ <dep package="pango"/>
</dependencies>
<branch module="/pub/GNOME/sources/gtk+/3.16/gtk+-3.16.4.tar.xz" version="3.16.4"
repo="ftp.gnome.org"
@@ -390,4 +391,19 @@
<branch repo="github.com" module="EricssonResearch/openwebrtc.git" checkoutdir="openwebrtc" tag="13516c7f79a0c48bb411464f7613d4b426c70f5b"/>
</autotools>
+ <!-- Dependencies listed below this point are not thought to affect test results, and are only
+ included because they themselves depend on other dependencies built by jhbuild. -->
+
+ <autotools id="pango" autogen-sh="configure"
+ autogenargs="--enable-cairo">
+ <dependencies>
+ <dep package="cairo"/>
+ <dep package="fontconfig"/>
+ </dependencies>
+ <branch module="/pub/GNOME/sources/pango/1.36/pango-1.36.8.tar.xz" version="1.36.8"
+ repo="ftp.gnome.org"
+ hash="sha256:18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07">
+ </branch>
+ </autotools>
+
</moduleset>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
