[gtk-osx] Update stable modulesets to current releases
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-osx] Update stable modulesets to current releases
- Date: Mon, 30 Sep 2013 00:32:19 +0000 (UTC)
commit c7eba5f54ac69ad29cf3ffda8b38097eb0d1f73b
Author: John Ralls <jralls ceridwen us>
Date: Sun Sep 29 17:31:43 2013 -0700
Update stable modulesets to current releases
modulesets-stable/gtk-osx-bootstrap.modules | 10 +-
modulesets-stable/gtk-osx-gtkmm.modules | 20 +-
modulesets-stable/gtk-osx-python.modules | 27 +-
modulesets-stable/gtk-osx.modules | 57 +-
modulesets-unstable/gtk-osx-python.modules | 6 +-
modulesets/gtk-osx-bootstrap.modules | 18 +-
modulesets/gtk-osx-gtkmm.modules | 12 +-
modulesets/gtk-osx.modules | 15 +-
...PRINTF-on-all-functions-with-format-strin.patch | 387 +++++++
...02516-Make-Werror-format-nonliteral-happy.patch | 253 +++++
patches/0001-Bug-708998-Avoid-infinite-loop.patch | 42 +
patches/delete-gnetworking.h.patch | 1116 ++++++++++++++++++++
patches/py2cairo-changelog.patch | 5 +
13 files changed, 1890 insertions(+), 78 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-bootstrap.modules b/modulesets-stable/gtk-osx-bootstrap.modules
index 4f347e2..f95ec3b 100644
--- a/modulesets-stable/gtk-osx-bootstrap.modules
+++ b/modulesets-stable/gtk-osx-bootstrap.modules
@@ -56,11 +56,11 @@
</dependencies>
</autotools>
-<!-- The python package is in gtk-osx-python.modules. If you're
- building "native" you can safely add python to the skip list, but
- otherwise the links in the SDKs are messed up and libxml's python
- module won't link. In case you're wondering, gnome-doc-utils
- needs libxml2's python module. -->
+ <!-- The python package is in gtk-osx-python.modules. If you're
+ building "native" you can safely add python to the skip list, but
+ otherwise the links in the SDKs are messed up and libxml's python
+ module won't link. In case you're wondering, gnome-doc-utils
+ needs libxml2's python module. -->
<autotools id="libxml2" autogen-sh="configure">
<branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
diff --git a/modulesets-stable/gtk-osx-gtkmm.modules b/modulesets-stable/gtk-osx-gtkmm.modules
index 20ecdd7..1505977 100644
--- a/modulesets-stable/gtk-osx-gtkmm.modules
+++ b/modulesets-stable/gtk-osx-gtkmm.modules
@@ -31,8 +31,8 @@
</autotools>
<autotools id="glibmm" autogen-sh="configure">
- <branch module="glibmm/2.34/glibmm-2.34.0.tar.xz" version="2.34.0"
- hash="sha256:ae5b8221fdace1771d2ae401b52afdca8b64ee12bd0f956fb4e92d482ddc1cbf"/>
+ <branch module="glibmm/2.36/glibmm-2.36.2.tar.xz" version="2.34.2"
+ hash="sha256:f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf"/>
<dependencies>
<dep package="glib"/>
<dep package="libsigc++2"/>
@@ -40,8 +40,8 @@
</autotools>
<autotools id="pangomm" autogen-sh="configure">
- <branch module="pangomm/2.28/pangomm-2.28.4.tar.xz" version="2.28.4"
- hash="sha256:778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82"/>
+ <branch module="pangomm/2.34/pangomm-2.34.0.tar.xz" version="2.34.0"
+ hash="sha256:0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41"/>
<dependencies>
<dep package="glibmm"/>
<dep package="cairomm"/>
@@ -50,8 +50,8 @@
</autotools>
<autotools id="atkmm" autogen-sh="configure">
- <branch module="atkmm/2.22/atkmm-2.22.6.tar.xz" version="2.22.6"
- hash="sha256:0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6"/>
+ <branch module="atkmm/2.22/atkmm-2.22.7.tar.xz" version="2.22.7"
+ hash="sha256:bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f91b"/>
</autotools>
<!-- libsigc++ depends on doxygen for documentation, but doxygen
@@ -66,8 +66,8 @@
</autotools>
<autotools id="gtkmm3" autogen-sh="configure">
- <branch module="gtkmm/3.6/gtkmm-3.6.0.tar.xz" version="3.6.0"
- hash="sha256:888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359">
+ <branch module="gtkmm/3.8/gtkmm-3.8.1.tar.xz" version="3.8.1"
+ hash="sha256:d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b">
</branch>
<dependencies>
<dep package="glibmm"/>
@@ -79,8 +79,8 @@
</autotools>
<autotools id="gtkmm" autogen-sh="configure">
- <branch module="gtkmm/2.24/gtkmm-2.24.2.tar.bz2" version="2.24.2"
- hash="sha256:771a69c3252d06b20d4e8be4822bd7fa3b58424458733e3526218a128f1fea34"/>
+ <branch module="gtkmm/2.24/gtkmm-2.24.4.tar.xz" version="2.24.4"
+ hash="sha256:443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee"/>
<dependencies>
<dep package="glibmm"/>
<dep package="cairomm"/>
diff --git a/modulesets-stable/gtk-osx-python.modules b/modulesets-stable/gtk-osx-python.modules
index ca1942b..18ffefb 100644
--- a/modulesets-stable/gtk-osx-python.modules
+++ b/modulesets-stable/gtk-osx-python.modules
@@ -66,12 +66,11 @@
<autotools id="python" autogenargs="--enable-shared --with-system-expat"
autogen-sh="configure">
<branch repo="python"
- module="2.7.3/Python-2.7.3.tar.xz" version="2.7.3">
+ module="2.7.4/Python-2.7.4.tar.xz" version="2.7.4">
</branch>
<dependencies>
<dep package="gettext-runtime"/>
<dep package='readline'/>
- <dep package='libxml2'/>
</dependencies>
<after>
<dep package="berkeleydb"/>
@@ -80,11 +79,10 @@
</autotools>
<autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
- <branch repo="python" module="3.3.0/Python-3.3.0.tar.xz" version="3.3.0"/>
+ <branch repo="python" module="3.3.2/Python-3.3.2.tar.xz" version="3.3.2"/>
<dependencies>
<dep package="gettext-runtime"/>
<dep package='readline'/>
- <dep package='libxml2'/>
</dependencies>
<after>
<dep package="berkeleydb"/>
@@ -118,11 +116,14 @@
</autotools>
<!-- Cairographics have changed the name to py2cairo for python 2 holdouts. -->
-<!-- They also broke configure (left install-sh out of the tarball) but waf works -->
- <waf id="pycairo-python2.6">
+<!-- Needs ChangeLog to autoreconf -->
+ <autotools id="pycairo-python2.6" autogen-sh="autoreconf"
+ supports-non-srcdir-builds="no">
<branch module="py2cairo-1.10.0.tar.bz2" repo="cairographics.org"
version="1.10.0"
- hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb"/>
+ hash="sha1:2efa8dfafbd6b8e492adaab07231556fec52d6eb">
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/py2cairo-changelog.patch"; strip="1"/>
+ </branch>
<dependencies>
<dep package="cairo"/>
</dependencies>
@@ -130,7 +131,7 @@
<dep package="python"/>
<dep package="meta-gtk-osx-core"/>
</after>
- </waf>
+ </autotools>
<!-- Pycairo-python3 for those who've made the leap. -->
<waf id="pycairo-python3" autogen-sh="configure">
@@ -164,8 +165,8 @@
</autotools>
<autotools id="pygobject3" autogen-sh="configure" >
- <branch version="3.4.1" module="pygobject/3.4/pygobject-3.4.1.tar.xz"
- hash="sha256:21dbef53f5a29bcb547f36ba42e021f71981e1c50e8f89526e393d77b36a8b1f"/>
+ <branch version="3.10.0" module="pygobject/3.10/pygobject-3.10.0.tar.xz"
+ hash="sha256:8aaa1f83fdb2e30bae77405a63a8be600b311a04a4cdc952b2ab62ee81aad077"/>
<dependencies>
<dep package="meta-gtk-osx-gtk3"/>
</dependencies>
@@ -194,9 +195,9 @@
<autotools id="gtk-mac-integration-python" autogen-sh="configure"
autogenargs="--enable-python">
- <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.1.tar.bz2"
- version="2.0.1"
- hash="sha256:1a3f6c418819499bbf63a1bb8da7f725eb07c3a929028b7bd0c3d5cd5077a181"/>
+ <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.3.tar.xz"
+ version="2.0.3"
+ hash="sha1:053328fb3c5f03d9f784e821e7860a052754d8fc8c04f2d5d5dafb324367066b"/>
<dependencies>
</dependencies>
<after>
diff --git a/modulesets-stable/gtk-osx.modules b/modulesets-stable/gtk-osx.modules
index 6195a12..15add5f 100644
--- a/modulesets-stable/gtk-osx.modules
+++ b/modulesets-stable/gtk-osx.modules
@@ -66,8 +66,11 @@
</metamodule>
<autotools id="glib" autogen-sh="configure">
- <branch module="glib/2.34/glib-2.34.3.tar.xz" version="2.34.3"
- hash="sha256:855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7"/>
+ <branch module="glib/2.38/glib-2.38.0.tar.xz" version="2.38.0"
+ hash="sha256:7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-702516-Make-Werror-format-nonliteral-happy.patch";
strip="1"/>
+ <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/delete-gnetworking.h.patch"; strip="1"/>
+ </branch>
<dependencies>
<dep package="libffi"/>
</dependencies>
@@ -97,20 +100,23 @@
</autotools>
<autotools id="gobject-introspection" autogen-sh="configure">
- <branch module="gobject-introspection/1.34/gobject-introspection-1.34.2.tar.xz"
- version="1.34.2"
- hash="sha256:bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429">
+ <branch module="gobject-introspection/1.36/gobject-introspection-1.36.0.tar.xz"
+ version="1.36.0"
+ hash="sha256:3575e5d353c17a567fdf7ffaaa7aebe9347b5b0eee8e69d612ba56a9def67d73">
<patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/girscanner-objc.patch"; strip="1"/>
</branch>
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
</dependencies>
+ <after>
+ <dep package='python'/>
+ </after>
</autotools>
<autotools id="pango" autogen-sh="configure">
- <branch version="1.34.0" module="pango/1.34/pango-1.34.0.tar.xz"
- hash="sha256:105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27">
+ <branch version="1.36.0" module="pango/1.36/pango-1.36.0.tar.xz"
+ hash="sha256:bb41d1b26ee7450e5430a7d2765f38c51ebe72db9fce616a9ee52611b55906a0">
</branch>
<dependencies>
<dep package="cairo"/>
@@ -124,8 +130,8 @@
</autotools>
<autotools id="atk" autogen-sh="configure">
- <branch module="atk/2.6/atk-2.6.0.tar.xz" version="2.6.0"
- hash="sha256:eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f"/>
+ <branch module="atk/2.10/atk-2.10.0.tar.xz" version="2.10.0"
+ hash="sha256:636917a5036bc851d8491194645d284798ec118919a828be5e713b6ecc5b50b0"/>
<dependencies>
</dependencies>
<after>
@@ -136,8 +142,8 @@
</autotools>
<autotools id="gdk-pixbuf" autogen-sh="configure">
- <branch module="gdk-pixbuf/2.26/gdk-pixbuf-2.26.5.tar.xz" version="2.26.5"
- hash="sha256:77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84"/>
+ <branch module="gdk-pixbuf/2.30/gdk-pixbuf-2.30.0.tar.xz" version="2.30.0"
+ hash="sha256:4a73600525621283a14436c5f873c1126c4feafcb07d24a746f13215e2caa658"/>
<after>
<dep package="pango"/>
</after>
@@ -145,9 +151,9 @@
<autotools id="gtk+" autogen-sh="autoreconf"
autogenargs="--with-gdktarget=quartz --enable-quartz-relocation --disable-introspection">
- <branch module="gtk+/2.24/gtk+-2.24.16.tar.xz" version="2.24.16"
- hash="sha256:93cd69cc2cecf9a3aa31a50caf4a24752a6928a48c527ae967b109df6f9302d3">
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch";
strip="1"/>
+ <branch module="gtk+/2.24/gtk+-2.24.21.tar.xz" version="2.24.21"
+ hash="sha256:302e9216dd19ec4b5b9e2f77275e23758253f7e86b06287284d8e794ef38dce3">
+ <!--patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0004-Bug-571582-GtkSelection-implementation-for-quartz.patch";
strip="1"/-->
<patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0008-Implement-GtkDragSourceOwner-pasteboardChangedOwner.patch";
strip="1"/>
<patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0006-Bug-658722-Drag-and-Drop-sometimes-stops-working.patch";
strip="1"/>
</branch>
@@ -165,9 +171,9 @@
<autotools id="gtk+-3.0" autogen-sh="autogen.sh"
autogenargs="--enable-quartz-backend --enable-quartz-relocation">
- <branch module="gtk+/3.6/gtk+-3.6.4.tar.xz" version="3.6.4"
- hash="sha256:dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1">
- <patch
file='http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-667759-gtkdnd-quartz.c-is-missing-annotations-fo.patch'
strip='1'/>
+ <branch module="gtk+/3.10/gtk+-3.10.0.tar.xz" version="3.10.0"
+ hash="sha256:6559feb360cd935d341cd7a0b69a72f8f4346ed6ee9b7c4040c02b73b75c53fe">
+ <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-Bug-708998-Avoid-infinite-loop.patch"; strip="1"/>
</branch>
<dependencies>
<dep package="glib"/>
@@ -182,9 +188,9 @@
</autotools>
<autotools id="pixman" autogenargs="--disable-gtk" autogen-sh="configure">
- <branch version="0.26.2" module="pixman-0.26.2.tar.gz"
+ <branch version="0.30.2" module="pixman-0.30.2.tar.gz"
repo="cairographics"
- hash="sha1:3c7d72b5b52e6d301efc68aa480f0737a641bdd3"/>
+ hash="sha1:59cc9cd91a2394b7c0aa90ffc7c141f06d75f066"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
</after>
@@ -192,11 +198,9 @@
<autotools id="cairo" autogen-sh="configure"
autogenargs="--enable-pdf --enable-quartz --enable-xlib=no --without-x">
- <branch module="cairo-1.12.6.tar.xz" version="1.12.6"
+ <branch module="cairo-1.12.16.tar.xz" version="1.12.16"
repo="cairographics"
- hash="sha1:a383c6cb4495e18848ea43e1031c294aa9417a43">
- <!--patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/Cairo-44584-llvm-no-flto.patch";
strip="1"/>
- <patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/0001-quartz-Fix-the-32-bits-build-on-MacOSX-10.7.patch";
strip="1"/-->
+ hash="sha1:4f6e337d5d3edd7ea79d1426f575331552b003ec">
</branch>
<dependencies>
<dep package="pixman"/>
@@ -210,10 +214,9 @@
<autotools id="gtk-mac-integration" autogen-sh="configure"
autogenargs="--disable-python">
- <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.1.tar.xz"
- version="2.0.1"
- hash="sha256:1a3f6c418819499bbf63a1bb8da7f725eb07c3a929028b7bd0c3d5cd5077a181">
- </branch>
+ <branch module="gtk-mac-integration/2.0/gtk-mac-integration-2.0.3.tar.xz"
+ version="2.0.3"
+ hash="sha1:053328fb3c5f03d9f784e821e7860a052754d8fc8c04f2d5d5dafb324367066b"/>
<dependencies>
</dependencies>
<after>
diff --git a/modulesets-unstable/gtk-osx-python.modules b/modulesets-unstable/gtk-osx-python.modules
index a041fe1..56dd360 100644
--- a/modulesets-unstable/gtk-osx-python.modules
+++ b/modulesets-unstable/gtk-osx-python.modules
@@ -38,11 +38,11 @@
<branch module="berkeley-db/db-4.8.30.NC.tar.gz" version="4.8.30"
repo="oracle" />
</autotools>
-
+<!-- Python-2.7.5's hashlib doesn't build correctly with gcc-4.2, though it does fine with Clang (and
probably later gccs as well). -->
<autotools id="python2.7" autogenargs="--enable-shared"
autogen-sh="configure">
<branch repo="python"
- module="2.7.3/Python-2.7.3.tar.xz" version="2.7.3">
+ module="2.7.4/Python-2.7.4.tar.xz" version="2.7.4">
</branch>
<dependencies>
</dependencies>
@@ -61,7 +61,7 @@
<autotools id="python3" autogenargs="--enable-shared" autogen-sh="configure">
<branch repo="python"
- module="3.3/Python-3.3.0.tar.xz" version="3.3.0">
+ module="3.3.2/Python-3.3.2.tar.xz" version="3.3.2">
</branch>
<after>
<dep package="berkeleydb5.0"/>
diff --git a/modulesets/gtk-osx-bootstrap.modules b/modulesets/gtk-osx-bootstrap.modules
index 60f3c97..23e2d68 100644
--- a/modulesets/gtk-osx-bootstrap.modules
+++ b/modulesets/gtk-osx-bootstrap.modules
@@ -56,19 +56,21 @@
</dependencies>
</autotools>
-<!-- The python package is in gtk-osx-python.modules. If you're
- building "native" you can safely add python to the skip list, but
- otherwise the links in the SDKs are messed up and libxml's python
- module won't link. In case you're wondering, gnome-doc-utils
- needs libxml2's python module. -->
+ <!-- The python package is in gtk-osx-python.modules. If you're
+ building "native" you can safely add python to the skip list, but
+ otherwise the links in the SDKs are messed up and libxml's python
+ module won't link. In case you're wondering, gnome-doc-utils
+ needs libxml2's python module. -->
+
<autotools id="libxml2" autogen-sh="configure">
- <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
+ <branch version="2.9.0" module="libxml2-2.9.0.tar.gz"
repo="xmlsoft.org">
<patch
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libxml2-Bug-686118-pthreads_once_init.patch";
strip="1"/>
</branch>
- <dependencies>
+ <after>
<dep package="python"/>
- </dependencies>
+ <dep package="python3"/>
+ </after>
</autotools>
<autotools id="libxslt" autogen-sh="configure">
diff --git a/modulesets/gtk-osx-gtkmm.modules b/modulesets/gtk-osx-gtkmm.modules
index 63e4ddb..03966ed 100644
--- a/modulesets/gtk-osx-gtkmm.modules
+++ b/modulesets/gtk-osx-gtkmm.modules
@@ -34,7 +34,7 @@
</autotools>
<autotools id="glibmm" >
- <branch tag="glibmm-2-34"/>
+ <branch tag="glibmm-2-36"/>
<dependencies>
<dep package="libsigc++2"/>
</dependencies>
@@ -45,13 +45,13 @@
<!-- Pangomm's last stable branch was 2-24 -->
<autotools id="pangomm" >
- <branch tag="2.28.4"/>
+ <branch tag="2.34.0"/>
<dependencies>
<dep package="cairomm"/>
</dependencies>
<after>
<dep package="glibmm"/>
- <dep package="glibmm3"/>
+ <dep package="glibmm"/>
<dep package="pango"/>
</after>
</autotools>
@@ -71,7 +71,7 @@
<!-- atkmm doesn't branch -->
<autotools id="atkmm">
- <branch module="atkmm" tag="2.22.6"/>
+ <branch module="atkmm" tag="2.22.7"/>
<dependencies>
<dep package="atk"/>
</dependencies>
@@ -89,9 +89,9 @@
</autotools>
<autotools id="gtkmm3" >
- <branch revision="gtkmm-3-6" module="gtkmm"/>
+ <branch revision="gtkmm-3-8" module="gtkmm"/>
<dependencies>
- <dep package="glibmm3"/>
+ <dep package="glibmm"/>
<dep package="cairomm"/>
<dep package="pangomm"/>
<dep package="atkmm"/>
diff --git a/modulesets/gtk-osx.modules b/modulesets/gtk-osx.modules
index c5beb97..db6f5f4 100644
--- a/modulesets/gtk-osx.modules
+++ b/modulesets/gtk-osx.modules
@@ -84,15 +84,18 @@
</autotools>
<autotools id="gobject-introspection">
- <branch tag="gnome-3-6" module="gobject-introspection"/>
+ <branch tag="gnome-3-8" module="gobject-introspection"/>
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
</dependencies>
+ <after>
+ <dep package='python'/>
+ </after>
</autotools>
<autotools id="pango">
- <branch tag="1.34.0"/>
+ <branch tag="1.36.0"/>
<dependencies>
<dep package="glib"/>
<dep package="cairo"/>
@@ -106,7 +109,7 @@
</autotools>
<autotools id="atk">
- <branch tag="ATK_2_6_0"/>
+ <branch tag="ATK_2_10_0"/>
<dependencies>
<dep package="glib"/>
</dependencies>
@@ -138,7 +141,7 @@
<autotools id="gtk+-3.0"
autogenargs="--enable-quartz-backend --disable-colord --enable-quartz-relocation">
- <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-6"/>
+ <branch module="gtk+" checkoutdir="gtk+-3.0" revision="gtk-3-10"/>
<dependencies>
<dep package="glib"/>
<dep package="pango"/>
@@ -152,7 +155,7 @@
</autotools>
<autotools id="pixman" autogenargs="--disable-gtk">
- <branch repo="cairographics" module="pixman" tag="0.26"/>
+ <branch repo="cairographics" module="pixman" tag="0.30"/>
<after>
<dep package="meta-gtk-osx-bootstrap"/>
</after>
@@ -171,7 +174,7 @@
</autotools>
<autotools id="gtk-mac-integration" autogenargs="--disable-python">
- <branch tag="gtk-mac-integration-2.0.1" />
+ <branch tag="gtk-mac-integration-2.0.2" />
<dependencies>
</dependencies>
<after>
diff --git a/patches/0001-Add-G_GNUC_PRINTF-on-all-functions-with-format-strin.patch
b/patches/0001-Add-G_GNUC_PRINTF-on-all-functions-with-format-strin.patch
new file mode 100644
index 0000000..1072b09
--- /dev/null
+++ b/patches/0001-Add-G_GNUC_PRINTF-on-all-functions-with-format-strin.patch
@@ -0,0 +1,387 @@
+From 0955160e15ec303d4d3f6a56bd424c68a41b0a54 Mon Sep 17 00:00:00 2001
+From: Henrique Dante de Almeida <hdante gmail com>
+Date: Sun, 13 Jan 2013 14:05:14 -0200
+Subject: [PATCH] Add G_GNUC_PRINTF on all functions with format strings
+
+This allows compilation with clang wihtout errors, even
+when -Wformat-nonliteral is active (as long as there are
+no real cases of non literal formatting).
+
+https://bugzilla.gnome.org/show_bug.cgi?id=691608
+---
+ gio/gdbusauth.c | 1 +
+ gio/gdbusauthmechanismsha1.c | 1 +
+ gio/gdbusdaemon.c | 1 +
+ gio/gdbuserror.h | 4 ++--
+ gio/gdbusmessage.c | 1 +
+ gio/gdbusmethodinvocation.h | 5 +++--
+ gio/gsimpleasyncresult.h | 5 +++--
+ gio/gtask.h | 2 +-
+ glib/gerror.c | 1 +
+ glib/gerror.h | 2 +-
+ glib/gmarkup.c | 2 ++
+ glib/gmarkup.h | 2 +-
+ glib/gmessages.h | 4 ++--
+ glib/gprintf.h | 8 ++++----
+ glib/gstrfuncs.h | 3 ++-
+ glib/gstring.h | 6 ++++--
+ glib/gutils.h | 3 ++-
+ glib/gvariant-parser.c | 4 ++++
+ glib/tests/markup-escape.c | 1 +
+ glib/tests/string.c | 1 +
+ glib/tests/test-printf.c | 1 +
+ 21 files changed, 39 insertions(+), 19 deletions(-)
+
+diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
+index 962a218..dd4cc2c 100644
+--- a/gio/gdbusauth.c
++++ b/gio/gdbusauth.c
+@@ -46,6 +46,7 @@
+
+ #include "glibintl.h"
+
++G_GNUC_PRINTF(1, 2)
+ static void
+ debug_print (const gchar *message, ...)
+ {
+diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c
+index 4729208..5e8b6c0 100644
+--- a/gio/gdbusauthmechanismsha1.c
++++ b/gio/gdbusauthmechanismsha1.c
+@@ -469,6 +469,7 @@ keyring_lookup_entry (const gchar *cookie_context,
+ }
+
+ /* function for logging important events that the system administrator should take notice of */
++G_GNUC_PRINTF(1, 2)
+ static void
+ _log (const gchar *message,
+ ...)
+diff --git a/gio/gdbusdaemon.c b/gio/gdbusdaemon.c
+index 35a724c..2393771 100644
+--- a/gio/gdbusdaemon.c
++++ b/gio/gdbusdaemon.c
+@@ -1346,6 +1346,7 @@ handle_start_service_by_name (_GFreedesktopDBus *object,
+ return TRUE;
+ }
+
++G_GNUC_PRINTF(5, 6)
+ static void
+ return_error (Client *client, GDBusMessage *message,
+ GQuark domain,
+diff --git a/gio/gdbuserror.h b/gio/gdbuserror.h
+index d32b928..c1d3e9c 100644
+--- a/gio/gdbuserror.h
++++ b/gio/gdbuserror.h
+@@ -87,12 +87,12 @@ void g_dbus_error_set_dbus_error (GError **error,
+ const gchar *dbus_error_name,
+ const gchar *dbus_error_message,
+ const gchar *format,
+- ...);
++ ...) G_GNUC_PRINTF(4, 5);
+ void g_dbus_error_set_dbus_error_valist (GError **error,
+ const gchar *dbus_error_name,
+ const gchar *dbus_error_message,
+ const gchar *format,
+- va_list var_args);
++ va_list var_args) G_GNUC_PRINTF(4, 0);
+ gchar *g_dbus_error_encode_gerror (const GError *error);
+
+ G_END_DECLS
+diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
+index ecbc033..9181029 100644
+--- a/gio/gdbusmessage.c
++++ b/gio/gdbusmessage.c
+@@ -827,6 +827,7 @@ g_dbus_message_new_method_error_literal (GDBusMessage *method_call_message,
+ *
+ * Since: 2.26
+ */
++G_GNUC_PRINTF(3, 0)
+ GDBusMessage *
+ g_dbus_message_new_method_error_valist (GDBusMessage *method_call_message,
+ const gchar *error_name,
+diff --git a/gio/gdbusmethodinvocation.h b/gio/gdbusmethodinvocation.h
+index 9146b21..29cfe63 100644
+--- a/gio/gdbusmethodinvocation.h
++++ b/gio/gdbusmethodinvocation.h
+@@ -55,12 +55,13 @@ void g_dbus_method_invocation_return_error (GDBusMetho
+ GQuark domain,
+ gint code,
+ const gchar *format,
+- ...);
++ ...) G_GNUC_PRINTF(4, 5);
+ void g_dbus_method_invocation_return_error_valist (GDBusMethodInvocation *invocation,
+ GQuark domain,
+ gint code,
+ const gchar *format,
+- va_list var_args);
++ va_list var_args)
++ G_GNUC_PRINTF(4, 0);
+ void g_dbus_method_invocation_return_error_literal (GDBusMethodInvocation *invocation,
+ GQuark domain,
+ gint code,
+diff --git a/gio/gsimpleasyncresult.h b/gio/gsimpleasyncresult.h
+index 6233369..1ea98f4 100644
+--- a/gio/gsimpleasyncresult.h
++++ b/gio/gsimpleasyncresult.h
+@@ -110,7 +110,8 @@ void g_simple_async_result_set_error_va (GSimpleAsyncResult
+ GQuark domain,
+ gint code,
+ const char *format,
+- va_list args);
++ va_list args)
++ G_GNUC_PRINTF(4, 0);
+ gboolean g_simple_async_result_is_valid (GAsyncResult *result,
+ GObject *source,
+ gpointer source_tag);
+@@ -121,7 +122,7 @@ void g_simple_async_report_error_in_idle (GObject *object,
+ GQuark domain,
+ gint code,
+ const char *format,
+- ...);
++ ...) G_GNUC_PRINTF(6, 7);
+ void g_simple_async_report_gerror_in_idle (GObject *object,
+ GAsyncReadyCallback callback,
+ gpointer user_data,
+diff --git a/gio/gtask.h b/gio/gtask.h
+index bb03226..d5a2d77 100644
+--- a/gio/gtask.h
++++ b/gio/gtask.h
+@@ -61,7 +61,7 @@ void g_task_report_new_error (gpointer source_object,
+ GQuark domain,
+ gint code,
+ const char *format,
+- ...);
++ ...) G_GNUC_PRINTF(7, 8);
+
+ GLIB_AVAILABLE_IN_2_36
+ void g_task_set_task_data (GTask *task,
+diff --git a/glib/gerror.c b/glib/gerror.c
+index e6ce3c0..2adbdf8 100644
+--- a/glib/gerror.c
++++ b/glib/gerror.c
+@@ -645,6 +645,7 @@ g_clear_error (GError **err)
+ }
+ }
+
++G_GNUC_PRINTF(2, 0)
+ static void
+ g_error_add_prefix (gchar **string,
+ const gchar *format,
+diff --git a/glib/gerror.h b/glib/gerror.h
+index f9020d6..8b5de28 100644
+--- a/glib/gerror.h
++++ b/glib/gerror.h
+@@ -60,7 +60,7 @@ GError* g_error_new_literal (GQuark domain,
+ GError* g_error_new_valist (GQuark domain,
+ gint code,
+ const gchar *format,
+- va_list args);
++ va_list args) G_GNUC_PRINTF(3, 0);
+
+ void g_error_free (GError *error);
+ GError* g_error_copy (const GError *error);
+diff --git a/glib/gmarkup.c b/glib/gmarkup.c
+index 11f68de..bf7c008 100644
+--- a/glib/gmarkup.c
++++ b/glib/gmarkup.c
+@@ -403,6 +403,7 @@ set_error_literal (GMarkupParseContext *context,
+ g_propagate_error (error, tmp_error);
+ }
+
++G_GNUC_PRINTF(4, 5)
+ static void
+ set_error (GMarkupParseContext *context,
+ GError **error,
+@@ -564,6 +565,7 @@ utf8_str (const gchar *utf8,
+ return buf;
+ }
+
++G_GNUC_PRINTF(5, 6)
+ static void
+ set_unescape_error (GMarkupParseContext *context,
+ GError **error,
+diff --git a/glib/gmarkup.h b/glib/gmarkup.h
+index d26c2ad..d0eda4f 100644
+--- a/glib/gmarkup.h
++++ b/glib/gmarkup.h
+@@ -214,7 +214,7 @@ gchar* g_markup_escape_text (const gchar *text,
+ gchar *g_markup_printf_escaped (const char *format,
+ ...) G_GNUC_PRINTF (1, 2);
+ gchar *g_markup_vprintf_escaped (const char *format,
+- va_list args);
++ va_list args) G_GNUC_PRINTF(1, 0);
+
+ typedef enum
+ {
+diff --git a/glib/gmessages.h b/glib/gmessages.h
+index 777cda2..d0c1930 100644
+--- a/glib/gmessages.h
++++ b/glib/gmessages.h
+@@ -46,7 +46,7 @@ G_BEGIN_DECLS
+ /* calculate a string size, guaranteed to fit format + args.
+ */
+ gsize g_printf_string_upper_bound (const gchar* format,
+- va_list args);
++ va_list args) G_GNUC_PRINTF(1, 0);
+
+ /* Log level shift offset for user defined
+ * log levels (0-7 are used by GLib).
+@@ -101,7 +101,7 @@ void g_log (const gchar *log_domain,
+ void g_logv (const gchar *log_domain,
+ GLogLevelFlags log_level,
+ const gchar *format,
+- va_list args);
++ va_list args) G_GNUC_PRINTF(3, 0);
+ GLogLevelFlags g_log_set_fatal_mask (const gchar *log_domain,
+ GLogLevelFlags fatal_mask);
+ GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask);
+diff --git a/glib/gprintf.h b/glib/gprintf.h
+index d96870f..2ed5ecc 100644
+--- a/glib/gprintf.h
++++ b/glib/gprintf.h
+@@ -36,16 +36,16 @@ gint g_sprintf (gchar *string,
+ ...) G_GNUC_PRINTF (2, 3);
+
+ gint g_vprintf (gchar const *format,
+- va_list args);
++ va_list args) G_GNUC_PRINTF(1, 0);
+ gint g_vfprintf (FILE *file,
+ gchar const *format,
+- va_list args);
++ va_list args) G_GNUC_PRINTF(2, 0);
+ gint g_vsprintf (gchar *string,
+ gchar const *format,
+- va_list args);
++ va_list args) G_GNUC_PRINTF(2, 0);
+ gint g_vasprintf (gchar **string,
+ gchar const *format,
+- va_list args);
++ va_list args) G_GNUC_PRINTF(2, 0);
+
+ G_END_DECLS
+
+diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
+index 3142485..e0752d3 100644
+--- a/glib/gstrfuncs.h
++++ b/glib/gstrfuncs.h
+@@ -188,7 +188,8 @@ gchar* g_strdup (const gchar *str) G_GNUC_MALLOC;
+ gchar* g_strdup_printf (const gchar *format,
+ ...) G_GNUC_PRINTF (1, 2) G_GNUC_MALLOC;
+ gchar* g_strdup_vprintf (const gchar *format,
+- va_list args) G_GNUC_MALLOC;
++ va_list args) G_GNUC_PRINTF(1, 0)
++ G_GNUC_MALLOC;
+ gchar* g_strndup (const gchar *str,
+ gsize n) G_GNUC_MALLOC;
+ gchar* g_strnfill (gsize length,
+diff --git a/glib/gstring.h b/glib/gstring.h
+index a97aa4e..c6a11ae 100644
+--- a/glib/gstring.h
++++ b/glib/gstring.h
+@@ -109,13 +109,15 @@ GString* g_string_ascii_down (GString *string);
+ GString* g_string_ascii_up (GString *string);
+ void g_string_vprintf (GString *string,
+ const gchar *format,
+- va_list args);
++ va_list args)
++ G_GNUC_PRINTF(2, 0);
+ void g_string_printf (GString *string,
+ const gchar *format,
+ ...) G_GNUC_PRINTF (2, 3);
+ void g_string_append_vprintf (GString *string,
+ const gchar *format,
+- va_list args);
++ va_list args)
++ G_GNUC_PRINTF(2, 0);
+ void g_string_append_printf (GString *string,
+ const gchar *format,
+ ...) G_GNUC_PRINTF (2, 3);
+diff --git a/glib/gutils.h b/glib/gutils.h
+index 8102f53..6c21bf7 100644
+--- a/glib/gutils.h
++++ b/glib/gutils.h
+@@ -187,7 +187,8 @@ gint g_snprintf (gchar *string,
+ gint g_vsnprintf (gchar *string,
+ gulong n,
+ gchar const *format,
+- va_list args);
++ va_list args)
++ G_GNUC_PRINTF(3, 0);
+
+ void g_nullify_pointer (gpointer *nullify_location);
+
+diff --git a/glib/gvariant-parser.c b/glib/gvariant-parser.c
+index e2e85ab..d5c036a 100644
+--- a/glib/gvariant-parser.c
++++ b/glib/gvariant-parser.c
+@@ -78,6 +78,7 @@ typedef struct
+ gint start, end;
+ } SourceRef;
+
++G_GNUC_PRINTF(5, 0)
+ static void
+ parser_set_error_va (GError **error,
+ SourceRef *location,
+@@ -105,6 +106,7 @@ parser_set_error_va (GError **error,
+ g_string_free (msg, TRUE);
+ }
+
++G_GNUC_PRINTF(5, 6)
+ static void
+ parser_set_error (GError **error,
+ SourceRef *location,
+@@ -130,6 +132,7 @@ typedef struct
+ } TokenStream;
+
+
++G_GNUC_PRINTF(5, 6)
+ static void
+ token_stream_set_error (TokenStream *stream,
+ GError **error,
+@@ -525,6 +528,7 @@ ast_free (AST *ast)
+ ast->class->free (ast);
+ }
+
++G_GNUC_PRINTF(5, 6)
+ static void
+ ast_set_error (AST *ast,
+ GError **error,
+diff --git a/glib/tests/markup-escape.c b/glib/tests/markup-escape.c
+index 0cd90ef..b2de289 100644
+--- a/glib/tests/markup-escape.c
++++ b/glib/tests/markup-escape.c
+@@ -96,6 +96,7 @@ unichar_test (gconstpointer d)
+ escape_test (&t);
+ }
+
++G_GNUC_PRINTF(1, 3)
+ static void
+ test_format (const gchar *format,
+ const gchar *expected,
+diff --git a/glib/tests/string.c b/glib/tests/string.c
+index 454574b..ba55d3d 100644
+--- a/glib/tests/string.c
++++ b/glib/tests/string.c
+@@ -106,6 +106,7 @@ test_string_new (void)
+ g_string_free (string2, TRUE);
+ }
+
++G_GNUC_PRINTF(2, 3)
+ static void
+ my_string_printf (GString *string,
+ const gchar *format,
+diff --git a/glib/tests/test-printf.c b/glib/tests/test-printf.c
+index 10d0a1d..dbfc8fc 100644
+--- a/glib/tests/test-printf.c
++++ b/glib/tests/test-printf.c
+@@ -942,6 +942,7 @@ _Pragma ("GCC diagnostic pop")
+ #endif
+ }
+
++G_GNUC_PRINTF(1, 2)
+ static gsize
+ upper_bound (const gchar *format, ...)
+ {
+--
+1.7.10.4
+
diff --git a/patches/0001-Bug-702516-Make-Werror-format-nonliteral-happy.patch
b/patches/0001-Bug-702516-Make-Werror-format-nonliteral-happy.patch
new file mode 100644
index 0000000..476eea6
--- /dev/null
+++ b/patches/0001-Bug-702516-Make-Werror-format-nonliteral-happy.patch
@@ -0,0 +1,253 @@
+From 96e40ec7321990fe63fb41b1be0ceead21b3ffc3 Mon Sep 17 00:00:00 2001
+From: John Ralls <jralls ceridwen us>
+Date: Sun, 29 Sep 2013 11:40:25 -0700
+Subject: [PATCH] Bug 702516 - Make -Werror=format-nonliteral happy
+
+---
+ gio/gcontenttype.c | 5 ++++-
+ gio/gthreadedresolver.c | 5 +++++
+ glib/gfileutils.c | 50 +++++++++++++++++++++++++++++++++++--------------
+ glib/gmarkup.c | 7 ++++++-
+ glib/gstrfuncs.c | 6 +++++-
+ glib/gutils.c | 5 +++++
+ 6 files changed, 61 insertions(+), 17 deletions(-)
+
+diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
+index 575d6fe..8dc5896 100644
+--- a/gio/gcontenttype.c
++++ b/gio/gcontenttype.c
+@@ -393,6 +393,8 @@ g_content_type_get_mime_type (const char *type)
+ return g_strdup (type);
+ }
+
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+
+ static GIcon *
+ g_content_type_get_icon_internal (const gchar *type,
+@@ -423,7 +425,7 @@ g_content_type_get_icon_internal (const gchar *type,
+ G_LOCK (gio_xdgmime);
+ xdg_icon = xdg_mime_get_icon (type);
+ G_UNLOCK (gio_xdgmime);
+- if (xdg_icon != NULL)
++ if (xdg_icon != NULL)
+ xdg_mimetype_icon = g_strdup_printf (file_template, xdg_icon);
+
+ if (xdg_mimetype_icon)
+@@ -450,6 +452,7 @@ g_content_type_get_icon_internal (const gchar *type,
+
+ return themed_icon;
+ }
++#pragma GCC diagnostic pop
+
+ /**
+ * g_content_type_get_icon:
+diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
+index 37f930c..1ffaf15 100644
+--- a/gio/gthreadedresolver.c
++++ b/gio/gthreadedresolver.c
+@@ -505,6 +505,9 @@ g_resolver_record_type_to_rrtype (GResolverRecordType type)
+ g_return_val_if_reached (-1);
+ }
+
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++
+ static GList *
+ g_resolver_records_from_res_query (const gchar *rrname,
+ gint rrtype,
+@@ -619,6 +622,8 @@ g_resolver_records_from_res_query (const gchar *rrname,
+ return records;
+ }
+
++#pragma GCC diagnostic pop
++
+ #elif defined(G_OS_WIN32)
+
+ static GVariant *
+diff --git a/glib/gfileutils.c b/glib/gfileutils.c
+index 7e5bedc..eb5baea 100644
+--- a/glib/gfileutils.c
++++ b/glib/gfileutils.c
+@@ -1004,25 +1004,47 @@ rename_file (const char *old_name,
+ return TRUE;
+ }
+
+-/* format string must have two '%s':
+- *
+- * - the place for the filename
+- * - the place for the strerror
+- */
+-static void
+-format_error_message (GError **error,
+- const gchar *filename,
++static char *
++format_error_message (const gchar *filename,
++ const gchar *format_string) G_GNUC_FORMAT(2);
++
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++
++static char *
++format_error_message (const gchar *filename,
+ const gchar *format_string)
+ {
+ gint saved_errno = errno;
+ gchar *display_name;
++ gchar *msg;
+
+ display_name = g_filename_display_name (filename);
++ msg = g_strdup_printf (format_string, display_name, g_strerror (saved_errno));
++ g_free (display_name);
++
++ return msg;
++}
+
+- g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (saved_errno),
+- format_string, display_name, g_strerror (saved_errno));
++#pragma GCC diagnostic pop
+
+- g_free (display_name);
++/* format string must have two '%s':
++ *
++ * - the place for the filename
++ * - the place for the strerror
++ */
++static void
++set_file_error (GError **error,
++ const gchar *filename,
++ const gchar *format_string)
++
++{
++ int saved_errno = errno;
++ char *msg = format_error_message (filename, format_string);
++
++ g_set_error_literal (error, G_FILE_ERROR, g_file_error_from_errno (saved_errno),
++ msg);
++ g_free (msg);
+ }
+
+ static gchar *
+@@ -1044,7 +1066,7 @@ write_to_temp_file (const gchar *contents,
+
+ if (fd == -1)
+ {
+- format_error_message (err, tmp_name, _("Failed to create file '%s': %s"));
++ set_file_error (err, tmp_name, _("Failed to create file '%s': %s"));
+ goto out;
+ }
+
+@@ -1068,7 +1090,7 @@ write_to_temp_file (const gchar *contents,
+ if (errno == EINTR)
+ continue;
+
+- format_error_message (err, tmp_name, _("Failed to write file '%s': write() failed: %s"));
++ set_file_error (err, tmp_name, _("Failed to write file '%s': write() failed: %s"));
+ close (fd);
+ g_unlink (tmp_name);
+
+@@ -1108,7 +1130,7 @@ write_to_temp_file (const gchar *contents,
+ */
+ if (g_lstat (dest_file, &statbuf) == 0 && statbuf.st_size > 0 && fsync (fd) != 0)
+ {
+- format_error_message (err, tmp_name, _("Failed to write file '%s': fsync() failed: %s"));
++ set_file_error (err, tmp_name, _("Failed to write file '%s': fsync() failed: %s"));
+ close (fd);
+ g_unlink (tmp_name);
+
+diff --git a/glib/gmarkup.c b/glib/gmarkup.c
+index 552773f..fb02a42 100644
+--- a/glib/gmarkup.c
++++ b/glib/gmarkup.c
+@@ -2366,6 +2366,9 @@ find_conversion (const char *format,
+ *
+ * Since: 2.4
+ */
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++
+ gchar *
+ g_markup_vprintf_escaped (const gchar *format,
+ va_list args)
+@@ -2430,6 +2433,7 @@ g_markup_vprintf_escaped (const gchar *format,
+ G_VA_COPY (args2, args);
+
+ output1 = g_strdup_vprintf (format1->str, args);
++
+ if (!output1)
+ {
+ va_end (args2);
+@@ -2440,7 +2444,6 @@ g_markup_vprintf_escaped (const gchar *format,
+ va_end (args2);
+ if (!output2)
+ goto cleanup;
+-
+ result = g_string_new (NULL);
+
+ /* Iterate through the original format string again,
+@@ -2492,6 +2495,8 @@ g_markup_vprintf_escaped (const gchar *format,
+ return NULL;
+ }
+
++#pragma GCC diagnostic pop
++
+ /**
+ * g_markup_printf_escaped:
+ * @format: printf() style format string
+diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
+index 9509233..4fcd91c 100644
+--- a/glib/gstrfuncs.c
++++ b/glib/gstrfuncs.c
+@@ -881,6 +881,9 @@ g_ascii_dtostr (gchar *buffer,
+ return g_ascii_formatd (buffer, buf_len, "%.17g", d);
+ }
+
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++
+ /**
+ * g_ascii_formatd:
+ * @buffer: A buffer to place the resulting string in
+@@ -909,7 +912,7 @@ g_ascii_formatd (gchar *buffer,
+ locale_t old_locale;
+
+ old_locale = uselocale (get_C_locale ());
+- _g_snprintf (buffer, buf_len, format, d);
++ _g_snprintf (buffer, buf_len, format, d);
+ uselocale (old_locale);
+
+ return buffer;
+@@ -988,6 +991,7 @@ g_ascii_formatd (gchar *buffer,
+ return buffer;
+ #endif
+ }
++#pragma GCC diagnostic pop
+
+ #define ISSPACE(c) ((c) == ' ' || (c) == '\f' || (c) == '\n' || \
+ (c) == '\r' || (c) == '\t' || (c) == '\v')
+diff --git a/glib/gutils.c b/glib/gutils.c
+index 0a9944f..2620cb6 100644
+--- a/glib/gutils.c
++++ b/glib/gutils.c
+@@ -2148,6 +2148,9 @@ g_format_size (guint64 size)
+ * Flags to modify the format of the string returned by g_format_size_full().
+ */
+
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wformat-nonliteral"
++
+ /**
+ * g_format_size_full:
+ * @size: a size in bytes
+@@ -2281,6 +2284,8 @@ g_format_size_full (guint64 size,
+ return g_string_free (string, FALSE);
+ }
+
++#pragma GCC diagnostic pop
++
+ /**
+ * g_format_size_for_display:
+ * @size: a size in bytes
+--
+1.8.3.rc0
+
diff --git a/patches/0001-Bug-708998-Avoid-infinite-loop.patch
b/patches/0001-Bug-708998-Avoid-infinite-loop.patch
new file mode 100644
index 0000000..d5a8e72
--- /dev/null
+++ b/patches/0001-Bug-708998-Avoid-infinite-loop.patch
@@ -0,0 +1,42 @@
+From e1dcd5c77d52db0033cafd23d84f392c4d9f457e Mon Sep 17 00:00:00 2001
+From: Hamish Mackenzie <Hamish K Mackenzie googlemail com>
+Date: Sun, 29 Sep 2013 05:06:53 +1300
+Subject: [PATCH] Fix infinite loop in gdkevents.c _gdk_event_queue_find_first
+
+---
+ gdk/gdkevents.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c
+index 327b543..e770f47 100644
+--- a/gdk/gdkevents.c
++++ b/gdk/gdkevents.c
+@@ -96,16 +96,16 @@ _gdk_event_queue_find_first (GdkDisplay *display)
+ {
+ GdkEventPrivate *event = tmp_list->data;
+
+- if (event->flags & GDK_EVENT_PENDING)
+- continue;
+-
+- if (pending_motion)
+- return pending_motion;
++ if (!(event->flags & GDK_EVENT_PENDING))
++ {
++ if (pending_motion)
++ return pending_motion;
+
+- if (event->event.type == GDK_MOTION_NOTIFY && !display->flushing_events)
+- pending_motion = tmp_list;
+- else
+- return tmp_list;
++ if (event->event.type == GDK_MOTION_NOTIFY && !display->flushing_events)
++ pending_motion = tmp_list;
++ else
++ return tmp_list;
++ }
+
+ tmp_list = g_list_next (tmp_list);
+ }
+--
+1.7.12.4 (Apple Git-37)
+
diff --git a/patches/delete-gnetworking.h.patch b/patches/delete-gnetworking.h.patch
new file mode 100644
index 0000000..c4695d4
--- /dev/null
+++ b/patches/delete-gnetworking.h.patch
@@ -0,0 +1,1116 @@
+diff -Nu glib-2.38.0/gio/Makefile.am glib-2.38.0-A/gio/Makefile.am
+--- glib-2.38.0/gio/Makefile.am 2013-09-23 07:02:04.000000000 -0700
++++ glib-2.38.0-A/gio/Makefile.am 2013-09-28 14:34:00.000000000 -0700
+@@ -560,7 +560,6 @@
+ gmountoperation.h \
+ gnativevolumemonitor.h \
+ gnetworkaddress.h \
+- gnetworking.h \
+ gnetworkmonitor.h \
+ gnetworkservice.h \
+ goutputstream.h \
+@@ -617,6 +616,10 @@
+ $(gio_headers) \
+ gioenumtypes.h
+
++nodist_gioinclude_HEADERS = \
++ gnetworking.h \
++ $(NULL)
++
+ # these sources (also mentioned above) are generated.
+ BUILT_SOURCES += \
+ gconstructor_as_data.h \
+diff -Nu glib-2.38.0/gio/Makefile.in glib-2.38.0-A/gio/Makefile.in
+--- glib-2.38.0/gio/Makefile.in 2013-09-23 14:07:45.000000000 -0700
++++ glib-2.38.0-A/gio/Makefile.in 2013-09-28 15:00:32.000000000 -0700
+@@ -1,7 +1,7 @@
+-# Makefile.in generated by automake 1.13.4 from Makefile.am.
++# Makefile.in generated by automake 1.12.2 from Makefile.am.
+ # @configure_input@
+
+-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
++# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -21,51 +21,23 @@
+
+
+ VPATH = @srcdir@
+-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+-am__make_running_with_option = \
+- case $${target_option-} in \
+- ?) ;; \
+- *) echo "am__make_running_with_option: internal error: invalid" \
+- "target option '$${target_option-}' specified" >&2; \
+- exit 1;; \
+- esac; \
+- has_opt=no; \
+- sane_makeflags=$$MAKEFLAGS; \
+- if $(am__is_gnu_make); then \
+- sane_makeflags=$$MFLAGS; \
+- else \
++am__make_dryrun = \
++ { \
++ am__dry=no; \
+ case $$MAKEFLAGS in \
+ *\\[\ \ ]*) \
+- bs=\\; \
+- sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+- | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
+- esac; \
+- fi; \
+- skip_next=no; \
+- strip_trailopt () \
+- { \
+- flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+- }; \
+- for flg in $$sane_makeflags; do \
+- test $$skip_next = yes && { skip_next=no; continue; }; \
+- case $$flg in \
+- *=*|--*) continue;; \
+- -*I) strip_trailopt 'I'; skip_next=yes;; \
+- -*I?*) strip_trailopt 'I';; \
+- -*O) strip_trailopt 'O'; skip_next=yes;; \
+- -*O?*) strip_trailopt 'O';; \
+- -*l) strip_trailopt 'l'; skip_next=yes;; \
+- -*l?*) strip_trailopt 'l';; \
+- -[dEDm]) skip_next=yes;; \
+- -[JT]) skip_next=yes;; \
++ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
++ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
++ *) \
++ for am__flg in $$MAKEFLAGS; do \
++ case $$am__flg in \
++ *=*|--*) ;; \
++ *n*) am__dry=yes; break;; \
++ esac; \
++ done;; \
+ esac; \
+- case $$flg in \
+- *$$target_option*) has_opt=yes; break;; \
+- esac; \
+- done; \
+- test $$has_opt = yes
+-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
++ test $$am__dry = yes; \
++ }
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+@@ -84,12 +56,12 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-DIST_COMMON = $(top_srcdir)/glib.mk $(srcdir)/Makefile.in \
+- $(srcdir)/Makefile.am $(srcdir)/gnetworking.h.in \
+- $(srcdir)/gio.rc.in $(top_srcdir)/depcomp $(dist_schema_DATA) \
+- $(gioinclude_HEADERS) $(am__giounixinclude_HEADERS_DIST) \
+- $(am__giowin32include_HEADERS_DIST) $(top_srcdir)/test-driver \
+- ChangeLog
++DIST_COMMON = $(am__giounixinclude_HEADERS_DIST) \
++ $(am__giowin32include_HEADERS_DIST) $(dist_schema_DATA) \
++ $(gioinclude_HEADERS) $(srcdir)/Makefile.am \
++ $(srcdir)/Makefile.in $(srcdir)/gio.rc.in \
++ $(srcdir)/gnetworking.h.in $(top_srcdir)/depcomp \
++ $(top_srcdir)/glib.mk ChangeLog
+ installed_test_PROGRAMS = $(am__EXEEXT_1)
+ noinst_PROGRAMS = $(am__EXEEXT_3)
+ check_PROGRAMS = $(am__EXEEXT_2)
+@@ -217,7 +189,7 @@
+ "$(DESTDIR)$(schemadir)" "$(DESTDIR)$(installed_test_metadir)" \
+ "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(gioincludedir)" \
+ "$(DESTDIR)$(giounixincludedir)" \
+- "$(DESTDIR)$(giowin32includedir)"
++ "$(DESTDIR)$(giowin32includedir)" "$(DESTDIR)$(gioincludedir)"
+ LTLIBRARIES = $(installed_test_LTLIBRARIES) $(lib_LTLIBRARIES) \
+ $(noinst_LTLIBRARIES)
+ @OS_UNIX_TRUE am__DEPENDENCIES_1 = xdgmime/libxdgmime.la
+@@ -573,14 +545,13 @@
+ $(gio_querymodules_SOURCES) $(glib_compile_resources_SOURCES) \
+ $(glib_compile_schemas_SOURCES) $(gresource_SOURCES) \
+ $(gsettings_SOURCES)
+-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+- ctags-recursive dvi-recursive html-recursive info-recursive \
+- install-data-recursive install-dvi-recursive \
+- install-exec-recursive install-html-recursive \
+- install-info-recursive install-pdf-recursive \
+- install-ps-recursive install-recursive installcheck-recursive \
+- installdirs-recursive pdf-recursive ps-recursive \
+- tags-recursive uninstall-recursive
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++ html-recursive info-recursive install-data-recursive \
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
+ am__can_run_installinfo = \
+ case $$AM_UPDATE_INFO_DIR in \
+ n|no|NO) false;; \
+@@ -597,208 +568,18 @@
+ am__giowin32include_HEADERS_DIST = gwin32inputstream.h \
+ gwin32outputstream.h
+ HEADERS = $(gioinclude_HEADERS) $(giounixinclude_HEADERS) \
+- $(giowin32include_HEADERS)
++ $(giowin32include_HEADERS) $(nodist_gioinclude_HEADERS)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
+-am__recursive_targets = \
+- $(RECURSIVE_TARGETS) \
+- $(RECURSIVE_CLEAN_TARGETS) \
+- $(am__extra_recursive_targets)
+-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+- check recheck distdir
+-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+-# Read a list of newline-separated strings from the standard input,
+-# and print each of them once, without duplicates. Input order is
+-# *not* preserved.
+-am__uniquify_input = $(AWK) '\
+- BEGIN { nonempty = 0; } \
+- { items[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in items) print i; }; } \
+-'
+-# Make sure the list of sources is unique. This is necessary because,
+-# e.g., the same source file might be shared among _SOURCES variables
+-# for different programs/libraries.
+-am__define_uniq_tagged_files = \
+- list='$(am__tagged_files)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | $(am__uniquify_input)`
++AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
++ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
++ distdir
+ ETAGS = etags
+ CTAGS = ctags
+ am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+-am__tty_colors = { \
+- $(am__tty_colors_dummy); \
+- if test "X$(AM_COLOR_TESTS)" = Xno; then \
+- am__color_tests=no; \
+- elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+- am__color_tests=yes; \
+- elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+- am__color_tests=yes; \
+- fi; \
+- if test $$am__color_tests = yes; then \
+- red='[0;31m'; \
+- grn='[0;32m'; \
+- lgn='[1;32m'; \
+- blu='[1;34m'; \
+- mgn='[0;35m'; \
+- brg='[1m'; \
+- std='[m'; \
+- fi; \
+-}
+-am__recheck_rx = ^[ ]*:recheck:[ ]*
+-am__global_test_result_rx = ^[ ]*:global-test-result:[ ]*
+-am__copy_in_global_log_rx = ^[ ]*:copy-in-global-log:[ ]*
+-# A command that, given a newline-separated list of test names on the
+-# standard input, print the name of the tests that are to be re-run
+-# upon "make recheck".
+-am__list_recheck_tests = $(AWK) '{ \
+- recheck = 1; \
+- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+- { \
+- if (rc < 0) \
+- { \
+- if ((getline line2 < ($$0 ".log")) < 0) \
+- recheck = 0; \
+- break; \
+- } \
+- else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \
+- { \
+- recheck = 0; \
+- break; \
+- } \
+- else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \
+- { \
+- break; \
+- } \
+- }; \
+- if (recheck) \
+- print $$0; \
+- close ($$0 ".trs"); \
+- close ($$0 ".log"); \
+-}'
+-# A command that, given a newline-separated list of test names on the
+-# standard input, create the global log from their .trs and .log files.
+-am__create_global_log = $(AWK) ' \
+-function fatal(msg) \
+-{ \
+- print "fatal: making $@: " msg | "cat >&2"; \
+- exit 1; \
+-} \
+-function rst_section(header) \
+-{ \
+- print header; \
+- len = length(header); \
+- for (i = 1; i <= len; i = i + 1) \
+- printf "="; \
+- printf "\n\n"; \
+-} \
+-{ \
+- copy_in_global_log = 1; \
+- global_test_result = "RUN"; \
+- while ((rc = (getline line < ($$0 ".trs"))) != 0) \
+- { \
+- if (rc < 0) \
+- fatal("failed to read from " $$0 ".trs"); \
+- if (line ~ /$(am__global_test_result_rx)/) \
+- { \
+- sub("$(am__global_test_result_rx)", "", line); \
+- sub("[ ]*$$", "", line); \
+- global_test_result = line; \
+- } \
+- else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \
+- copy_in_global_log = 0; \
+- }; \
+- if (copy_in_global_log) \
+- { \
+- rst_section(global_test_result ": " $$0); \
+- while ((rc = (getline line < ($$0 ".log"))) != 0) \
+- { \
+- if (rc < 0) \
+- fatal("failed to read from " $$0 ".log"); \
+- print line; \
+- }; \
+- printf "\n"; \
+- }; \
+- close ($$0 ".trs"); \
+- close ($$0 ".log"); \
+-}'
+-# Restructured Text title.
+-am__rst_title = { sed 's/.*/ & /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }
+-# Solaris 10 'make', and several other traditional 'make' implementations,
+-# pass "-e" to $(SHELL), and POSIX 2008 even requires this. Work around it
+-# by disabling -e (using the XSI extension "set +e") if it's set.
+-am__sh_e_setup = case $$- in *e*) set +e;; esac
+-# Default flags passed to test drivers.
+-am__common_driver_flags = \
+- --color-tests "$$am__color_tests" \
+- --enable-hard-errors "$$am__enable_hard_errors" \
+- --expect-failure "$$am__expect_failure"
+-# To be inserted before the command running the test. Creates the
+-# directory for the log if needed. Stores in $dir the directory
+-# containing $f, in $tst the test, in $log the log. Executes the
+-# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
+-# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
+-# will run the test scripts (or their associated LOG_COMPILER, if
+-# thy have one).
+-am__check_pre = \
+-$(am__sh_e_setup); \
+-$(am__vpath_adj_setup) $(am__vpath_adj) \
+-$(am__tty_colors); \
+-srcdir=$(srcdir); export srcdir; \
+-case "$@" in \
+- */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;; \
+- *) am__odir=.;; \
+-esac; \
+-test "x$$am__odir" = x"." || test -d "$$am__odir" \
+- || $(MKDIR_P) "$$am__odir" || exit $$?; \
+-if test -f "./$$f"; then dir=./; \
+-elif test -f "$$f"; then dir=; \
+-else dir="$(srcdir)/"; fi; \
+-tst=$$dir$$f; log='$@'; \
+-if test -n '$(DISABLE_HARD_ERRORS)'; then \
+- am__enable_hard_errors=no; \
+-else \
+- am__enable_hard_errors=yes; \
+-fi; \
+-case " $(XFAIL_TESTS) " in \
+- *[\ \ ]$$f[\ \ ]* | *[\ \ ]$$dir$$f[\ \ ]*) \
+- am__expect_failure=yes;; \
+- *) \
+- am__expect_failure=no;; \
+-esac; \
+-$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)
+-# A shell command to get the names of the tests scripts with any registered
+-# extension removed (i.e., equivalently, the names of the test logs, with
+-# the '.log' extension removed). The result is saved in the shell variable
+-# '$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly,
+-# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",
+-# since that might cause problem with VPATH rewrites for suffix-less tests.
+-# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.
+-am__set_TESTS_bases = \
+- bases='$(TEST_LOGS)'; \
+- bases=`for i in $$bases; do echo $$i; done | sed 's/\.log$$//'`; \
+- bases=`echo $$bases`
+-RECHECK_LOGS = $(TEST_LOGS)
+-TEST_SUITE_LOG = test-suite.log
+-TEST_EXTENSIONS = @EXEEXT@ .test
+-am__test_logs1 = $(TESTS:=.log)
+-am__test_logs2 = $(am__test_logs1:@EXEEXT log= log)
+-TEST_LOGS = $(am__test_logs2:.test.log=.log)
+-TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
+-TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
+- $(TEST_LOG_FLAGS)
+-am__set_b = \
+- case '$@' in \
+- */*) \
+- case '$*' in \
+- */*) b='$*';; \
+- *) b=`echo '$@' | sed 's/\.log$$//'`; \
+- esac;; \
+- *) \
+- b='$*';; \
+- esac
++am__tty_colors = $(am__tty_colors_dummy)
+ DIST_SUBDIRS = gdbus-2.0/codegen xdgmime inotify kqueue fen win32 . \
+ tests fam
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -1590,7 +1371,6 @@
+ gmountoperation.h \
+ gnativevolumemonitor.h \
+ gnetworkaddress.h \
+- gnetworking.h \
+ gnetworkmonitor.h \
+ gnetworkservice.h \
+ goutputstream.h \
+@@ -1647,6 +1427,10 @@
+ $(gio_headers) \
+ gioenumtypes.h
+
++nodist_gioinclude_HEADERS = \
++ gnetworking.h \
++ $(NULL)
++
+ glib_compile_resources_LDADD = \
+ $(top_builddir)/glib/libglib-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la \
+@@ -1704,7 +1488,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) all-recursive
+
+ .SUFFIXES:
+-.SUFFIXES: .c .lo .log .o .obj .test .test$(EXEEXT) .trs
++.SUFFIXES: .c .lo .o .obj
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/glib.mk
$(am__configure_deps)
+ @for dep in $?; do \
+ case '$(am__configure_deps)' in \
+@@ -1751,7 +1535,6 @@
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+-
+ install-installed_testLTLIBRARIES: $(installed_test_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \
+@@ -1786,7 +1569,6 @@
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+-
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+@@ -1832,7 +1614,6 @@
+ echo rm -f $${locs}; \
+ rm -f $${locs}; \
+ }
+-
+ libgio-2.0.la: $(libgio_2_0_la_OBJECTS) $(libgio_2_0_la_DEPENDENCIES) $(EXTRA_libgio_2_0_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(libgio_2_0_la_LINK) -rpath $(libdir) $(libgio_2_0_la_OBJECTS) $(libgio_2_0_la_LIBADD)
$(LIBS)
+ install-binPROGRAMS: $(bin_PROGRAMS)
+@@ -1844,12 +1625,10 @@
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+- while read p p1; do if test -f $$p \
+- || test -f $$p1 \
+- ; then echo "$$p"; echo "$$p"; else :; fi; \
++ while read p p1; do if test -f $$p || test -f $$p1; \
++ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+- sed -e 'p;s,.*/,,;n;h' \
+- -e 's|.*|.|' \
++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+@@ -1870,8 +1649,7 @@
+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+- -e 's/$$/$(EXEEXT)/' \
+- `; \
++ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
+@@ -1902,12 +1680,10 @@
+ fi; \
+ for p in $$list; do echo "$$p $$p"; done | \
+ sed 's/$(EXEEXT)$$//' | \
+- while read p p1; do if test -f $$p \
+- || test -f $$p1 \
+- ; then echo "$$p"; echo "$$p"; else :; fi; \
++ while read p p1; do if test -f $$p || test -f $$p1; \
++ then echo "$$p"; echo "$$p"; else :; fi; \
+ done | \
+- sed -e 'p;s,.*/,,;n;h' \
+- -e 's|.*|.|' \
++ sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+ sed 'N;N;N;s,\n, ,g' | \
+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+@@ -1928,8 +1704,7 @@
+ @list='$(installed_test_PROGRAMS)'; test -n "$(installed_testdir)" || list=; \
+ files=`for p in $$list; do echo "$$p"; done | \
+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+- -e 's/$$/$(EXEEXT)/' \
+- `; \
++ -e 's/$$/$(EXEEXT)/' `; \
+ test -n "$$list" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(installed_testdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(installed_testdir)" && rm -f $$files
+@@ -1951,27 +1726,21 @@
+ list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+ echo " rm -f" $$list; \
+ rm -f $$list
+-
+ gdbus$(EXEEXT): $(gdbus_OBJECTS) $(gdbus_DEPENDENCIES) $(EXTRA_gdbus_DEPENDENCIES)
+ @rm -f gdbus$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gdbus_OBJECTS) $(gdbus_LDADD) $(LIBS)
+-
+ gio-querymodules$(EXEEXT): $(gio_querymodules_OBJECTS) $(gio_querymodules_DEPENDENCIES)
$(EXTRA_gio_querymodules_DEPENDENCIES)
+ @rm -f gio-querymodules$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gio_querymodules_OBJECTS) $(gio_querymodules_LDADD) $(LIBS)
+-
+ glib-compile-resources$(EXEEXT): $(glib_compile_resources_OBJECTS) $(glib_compile_resources_DEPENDENCIES)
$(EXTRA_glib_compile_resources_DEPENDENCIES)
+ @rm -f glib-compile-resources$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(glib_compile_resources_OBJECTS) $(glib_compile_resources_LDADD) $(LIBS)
+-
+ glib-compile-schemas$(EXEEXT): $(glib_compile_schemas_OBJECTS) $(glib_compile_schemas_DEPENDENCIES)
$(EXTRA_glib_compile_schemas_DEPENDENCIES)
+ @rm -f glib-compile-schemas$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(glib_compile_schemas_OBJECTS) $(glib_compile_schemas_LDADD) $(LIBS)
+-
+ gresource$(EXEEXT): $(gresource_OBJECTS) $(gresource_DEPENDENCIES) $(EXTRA_gresource_DEPENDENCIES)
+ @rm -f gresource$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gresource_OBJECTS) $(gresource_LDADD) $(LIBS)
+-
+ gsettings$(EXEEXT): $(gsettings_OBJECTS) $(gsettings_DEPENDENCIES) $(EXTRA_gsettings_DEPENDENCIES)
+ @rm -f gsettings$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(gsettings_OBJECTS) $(gsettings_LDADD) $(LIBS)
+@@ -3781,6 +3550,27 @@
+ @list='$(giowin32include_HEADERS)'; test -n "$(giowin32includedir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(giowin32includedir)'; $(am__uninstall_files_from_dir)
++install-nodist_gioincludeHEADERS: $(nodist_gioinclude_HEADERS)
++ @$(NORMAL_INSTALL)
++ @list='$(nodist_gioinclude_HEADERS)'; test -n "$(gioincludedir)" || list=; \
++ if test -n "$$list"; then \
++ echo " $(MKDIR_P) '$(DESTDIR)$(gioincludedir)'"; \
++ $(MKDIR_P) "$(DESTDIR)$(gioincludedir)" || exit 1; \
++ fi; \
++ for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ echo "$$d$$p"; \
++ done | $(am__base_list) | \
++ while read files; do \
++ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(gioincludedir)'"; \
++ $(INSTALL_HEADER) $$files "$(DESTDIR)$(gioincludedir)" || exit $$?; \
++ done
++
++uninstall-nodist_gioincludeHEADERS:
++ @$(NORMAL_UNINSTALL)
++ @list='$(nodist_gioinclude_HEADERS)'; test -n "$(gioincludedir)" || list=; \
++ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++ dir='$(DESTDIR)$(gioincludedir)'; $(am__uninstall_files_from_dir)
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run 'make' without going through this Makefile.
+@@ -3788,13 +3578,14 @@
+ # (1) if the variable is set in 'config.status', edit 'config.status'
+ # (which will cause the Makefiles to be regenerated when you run 'make');
+ # (2) otherwise, pass the desired values on the 'make' command line.
+-$(am__recursive_targets):
+- @fail=; \
+- if $(am__make_keepgoing); then \
+- failcom='fail=yes'; \
+- else \
+- failcom='exit 1'; \
+- fi; \
++$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
++ @fail= failcom='exit 1'; \
++ for f in x $$MAKEFLAGS; do \
++ case $$f in \
++ *=* | --[!k]*);; \
++ *k*) failcom='fail=yes';; \
++ esac; \
++ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ case "$@" in \
+@@ -3815,13 +3606,31 @@
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
++tags-recursive:
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
++ done
++ctags-recursive:
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++ done
++cscopelist-recursive:
++ list='$(SUBDIRS)'; for subdir in $$list; do \
++ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
++ done
+
+-ID: $(am__tagged_files)
+- $(am__define_uniq_tagged_files); mkid -fID $$unique
+-tags: tags-recursive
+-TAGS: tags
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
++ mkid -fID $$unique
++tags: TAGS
+
+-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
++TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
+ set x; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+@@ -3837,7 +3646,12 @@
+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+- $(am__define_uniq_tagged_files); \
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ shift; \
+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+@@ -3849,11 +3663,15 @@
+ $$unique; \
+ fi; \
+ fi
+-ctags: ctags-recursive
+-
+-CTAGS: ctags
+-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+- $(am__define_uniq_tagged_files); \
++ctags: CTAGS
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
++ $(TAGS_FILES) $(LISP)
++ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++ unique=`for i in $$list; do \
++ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++ done | \
++ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++ END { if (nonempty) { for (i in files) print i; }; }'`; \
+ test -z "$(CTAGS_ARGS)$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$unique
+@@ -3862,10 +3680,9 @@
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && $(am__cd) $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) "$$here"
+-cscopelist: cscopelist-recursive
+
+-cscopelist-am: $(am__tagged_files)
+- list='$(am__tagged_files)'; \
++cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
++ list='$(SOURCES) $(HEADERS) $(LISP)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+@@ -3881,161 +3698,98 @@
+ distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+-# Recover from deleted '.trs' file; this should ensure that
+-# "rm -f foo.log; make foo.trs" re-run 'foo.test', and re-create
+-# both 'foo.log' and 'foo.trs'. Break the recipe in two subshells
+-# to avoid problems with "make -n".
+-.log.trs:
+- rm -f $< $@
+- $(MAKE) $(AM_MAKEFLAGS) $<
+-
+-# Leading 'am--fnord' is there to ensure the list of targets does not
+-# expand to empty, as could happen e.g. with make check TESTS=''.
+-am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck)
+-am--force-recheck:
+- @:
+-
+-$(TEST_SUITE_LOG): $(TEST_LOGS)
+- @$(am__set_TESTS_bases); \
+- am__f_ok () { test -f "$$1" && test -r "$$1"; }; \
+- redo_bases=`for i in $$bases; do \
+- am__f_ok $$i.trs && am__f_ok $$i.log || echo $$i; \
+- done`; \
+- if test -n "$$redo_bases"; then \
+- redo_logs=`for i in $$redo_bases; do echo $$i.log; done`; \
+- redo_results=`for i in $$redo_bases; do echo $$i.trs; done`; \
+- if $(am__make_dryrun); then :; else \
+- rm -f $$redo_logs && rm -f $$redo_results || exit 1; \
+- fi; \
+- fi; \
+- if test -n "$$am__remaking_logs"; then \
+- echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
+- "recursion detected" >&2; \
+- else \
+- am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+- fi; \
+- if $(am__make_dryrun); then :; else \
+- st=0; \
+- errmsg="fatal: making $(TEST_SUITE_LOG): failed to create"; \
+- for i in $$redo_bases; do \
+- test -f $$i.trs && test -r $$i.trs \
+- || { echo "$$errmsg $$i.trs" >&2; st=1; }; \
+- test -f $$i.log && test -r $$i.log \
+- || { echo "$$errmsg $$i.log" >&2; st=1; }; \
++check-TESTS: $(TESTS)
++ @failed=0; all=0; xfail=0; xpass=0; skip=0; \
++ srcdir=$(srcdir); export srcdir; \
++ list=' $(TESTS) '; \
++ $(am__tty_colors); \
++ if test -n "$$list"; then \
++ for tst in $$list; do \
++ if test -f ./$$tst; then dir=./; \
++ elif test -f $$tst; then dir=; \
++ else dir="$(srcdir)/"; fi; \
++ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
++ all=`expr $$all + 1`; \
++ case " $(XFAIL_TESTS) " in \
++ *[\ \ ]$$tst[\ \ ]*) \
++ xpass=`expr $$xpass + 1`; \
++ failed=`expr $$failed + 1`; \
++ col=$$red; res=XPASS; \
++ ;; \
++ *) \
++ col=$$grn; res=PASS; \
++ ;; \
++ esac; \
++ elif test $$? -ne 77; then \
++ all=`expr $$all + 1`; \
++ case " $(XFAIL_TESTS) " in \
++ *[\ \ ]$$tst[\ \ ]*) \
++ xfail=`expr $$xfail + 1`; \
++ col=$$lgn; res=XFAIL; \
++ ;; \
++ *) \
++ failed=`expr $$failed + 1`; \
++ col=$$red; res=FAIL; \
++ ;; \
++ esac; \
++ else \
++ skip=`expr $$skip + 1`; \
++ col=$$blu; res=SKIP; \
++ fi; \
++ echo "$${col}$$res$${std}: $$tst"; \
+ done; \
+- test $$st -eq 0 || exit 1; \
+- fi
+- @$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
+- ws='[ ]'; \
+- results=`for b in $$bases; do echo $$b.trs; done`; \
+- test -n "$$results" || results=/dev/null; \
+- all=` grep "^$$ws*:test-result:" $$results | wc -l`; \
+- pass=` grep "^$$ws*:test-result:$$ws*PASS" $$results | wc -l`; \
+- fail=` grep "^$$ws*:test-result:$$ws*FAIL" $$results | wc -l`; \
+- skip=` grep "^$$ws*:test-result:$$ws*SKIP" $$results | wc -l`; \
+- xfail=`grep "^$$ws*:test-result:$$ws*XFAIL" $$results | wc -l`; \
+- xpass=`grep "^$$ws*:test-result:$$ws*XPASS" $$results | wc -l`; \
+- error=`grep "^$$ws*:test-result:$$ws*ERROR" $$results | wc -l`; \
+- if test `expr $$fail + $$xpass + $$error` -eq 0; then \
+- success=true; \
+- else \
+- success=false; \
+- fi; \
+- br='==================='; br=$$br$$br$$br$$br; \
+- result_count () \
+- { \
+- if test x"$$1" = x"--maybe-color"; then \
+- maybe_colorize=yes; \
+- elif test x"$$1" = x"--no-color"; then \
+- maybe_colorize=no; \
++ if test "$$all" -eq 1; then \
++ tests="test"; \
++ All=""; \
++ else \
++ tests="tests"; \
++ All="All "; \
++ fi; \
++ if test "$$failed" -eq 0; then \
++ if test "$$xfail" -eq 0; then \
++ banner="$$All$$all $$tests passed"; \
+ else \
+- echo "$@: invalid 'result_count' usage" >&2; exit 4; \
++ if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++ banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ fi; \
+- shift; \
+- desc=$$1 count=$$2; \
+- if test $$maybe_colorize = yes && test $$count -gt 0; then \
+- color_start=$$3 color_end=$$std; \
++ else \
++ if test "$$xpass" -eq 0; then \
++ banner="$$failed of $$all $$tests failed"; \
+ else \
+- color_start= color_end=; \
++ if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++ banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ fi; \
+- echo "$${color_start}# $$desc $$count$${color_end}"; \
+- }; \
+- create_testsuite_report () \
+- { \
+- result_count $$1 "TOTAL:" $$all "$$brg"; \
+- result_count $$1 "PASS: " $$pass "$$grn"; \
+- result_count $$1 "SKIP: " $$skip "$$blu"; \
+- result_count $$1 "XFAIL:" $$xfail "$$lgn"; \
+- result_count $$1 "FAIL: " $$fail "$$red"; \
+- result_count $$1 "XPASS:" $$xpass "$$red"; \
+- result_count $$1 "ERROR:" $$error "$$mgn"; \
+- }; \
+- { \
+- echo "$(PACKAGE_STRING): $(subdir)/$(TEST_SUITE_LOG)" | \
+- $(am__rst_title); \
+- create_testsuite_report --no-color; \
+- echo; \
+- echo ".. contents:: :depth: 2"; \
+- echo; \
+- for b in $$bases; do echo $$b; done \
+- | $(am__create_global_log); \
+- } >$(TEST_SUITE_LOG).tmp || exit 1; \
+- mv $(TEST_SUITE_LOG).tmp $(TEST_SUITE_LOG); \
+- if $$success; then \
+- col="$$grn"; \
+- else \
+- col="$$red"; \
+- test x"$$VERBOSE" = x || cat $(TEST_SUITE_LOG); \
+- fi; \
+- echo "$${col}$$br$${std}"; \
+- echo "$${col}Testsuite summary for $(PACKAGE_STRING)$${std}"; \
+- echo "$${col}$$br$${std}"; \
+- create_testsuite_report --maybe-color; \
+- echo "$$col$$br$$std"; \
+- if $$success; then :; else \
+- echo "$${col}See $(subdir)/$(TEST_SUITE_LOG)$${std}"; \
+- if test -n "$(PACKAGE_BUGREPORT)"; then \
+- echo "$${col}Please report to $(PACKAGE_BUGREPORT)$${std}"; \
+- fi; \
+- echo "$$col$$br$$std"; \
+- fi; \
+- $$success || exit 1
+-
+-check-TESTS:
+- @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
+- @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list
+- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+- @set +e; $(am__set_TESTS_bases); \
+- log_list=`for i in $$bases; do echo $$i.log; done`; \
+- trs_list=`for i in $$bases; do echo $$i.trs; done`; \
+- log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
+- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
+- exit $$?;
+-recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS) $(check_SCRIPTS) $(check_DATA)
+- @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+- @set +e; $(am__set_TESTS_bases); \
+- bases=`for i in $$bases; do echo $$i; done \
+- | $(am__list_recheck_tests)` || exit 1; \
+- log_list=`for i in $$bases; do echo $$i.log; done`; \
+- log_list=`echo $$log_list`; \
+- $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) \
+- am__force_recheck=am--force-recheck \
+- TEST_LOGS="$$log_list"; \
+- exit $$?
+-.test.log:
+- @p='$<'; \
+- $(am__set_b); \
+- $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+- --log-file $$b.log --trs-file $$b.trs \
+- $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) --
$(TEST_LOG_COMPILE) \
+- "$$tst" $(AM_TESTS_FD_REDIRECT)
+- am__EXEEXT_TRUE@.test$(EXEEXT).log:
+- am__EXEEXT_TRUE@ @p='$<'; \
+- am__EXEEXT_TRUE@ $(am__set_b); \
+- am__EXEEXT_TRUE@ $(am__check_pre) $(TEST_LOG_DRIVER) --test-name "$$f" \
+- am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
+- am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) --
$(TEST_LOG_COMPILE) \
+- am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
++ fi; \
++ dashes="$$banner"; \
++ skipped=""; \
++ if test "$$skip" -ne 0; then \
++ if test "$$skip" -eq 1; then \
++ skipped="($$skip test was not run)"; \
++ else \
++ skipped="($$skip tests were not run)"; \
++ fi; \
++ test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
++ dashes="$$skipped"; \
++ fi; \
++ report=""; \
++ if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
++ report="Please report to $(PACKAGE_BUGREPORT)"; \
++ test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
++ dashes="$$report"; \
++ fi; \
++ dashes=`echo "$$dashes" | sed s/./=/g`; \
++ if test "$$failed" -eq 0; then \
++ col="$$grn"; \
++ else \
++ col="$$red"; \
++ fi; \
++ echo "$${col}$$dashes$${std}"; \
++ echo "$${col}$$banner$${std}"; \
++ test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
++ test -z "$$report" || echo "$${col}$$report$${std}"; \
++ echo "$${col}$$dashes$${std}"; \
++ test "$$failed" -eq 0; \
++ else :; fi
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+@@ -4107,7 +3861,7 @@
+
+ installdirs: installdirs-recursive
+ installdirs-am:
+- for dir in "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(completiondir)"
"$(DESTDIR)$(schemadir)" "$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_testdir)"
"$(DESTDIR)$(gioincludedir)" "$(DESTDIR)$(giounixincludedir)" "$(DESTDIR)$(giowin32includedir)"; do \
++ for dir in "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
"$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(completiondir)"
"$(DESTDIR)$(schemadir)" "$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_testdir)"
"$(DESTDIR)$(gioincludedir)" "$(DESTDIR)$(giounixincludedir)" "$(DESTDIR)$(giowin32includedir)"
"$(DESTDIR)$(gioincludedir)"; do \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+@@ -4131,9 +3885,6 @@
+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+ fi
+ mostlyclean-generic:
+- -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS)
+- -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs)
+- -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+
+ clean-generic:
+ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+@@ -4181,7 +3932,8 @@
+ install-installed_testLTLIBRARIES \
+ install-installed_testPROGRAMS install-installed_testSCRIPTS \
+ install-installed_test_metaDATA \
+- install-nobase_installed_testDATA
++ install-nobase_installed_testDATA \
++ install-nodist_gioincludeHEADERS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-recursive
+@@ -4236,35 +3988,40 @@
+ uninstall-installed_testPROGRAMS \
+ uninstall-installed_testSCRIPTS \
+ uninstall-installed_test_metaDATA uninstall-libLTLIBRARIES \
+- uninstall-local uninstall-nobase_installed_testDATA
+-
+-.MAKE: $(am__recursive_targets) all check check-am install install-am \
+- install-data-am install-strip
++ uninstall-local uninstall-nobase_installed_testDATA \
++ uninstall-nodist_gioincludeHEADERS
+
+-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
+- check check-TESTS check-am check-local clean clean-binPROGRAMS \
+- clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \
++ check-am cscopelist-recursive ctags-recursive install \
++ install-am install-data-am install-strip tags-recursive
++
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am all-local check check-TESTS check-am check-local \
++ clean clean-binPROGRAMS clean-checkLTLIBRARIES \
++ clean-checkPROGRAMS clean-generic \
+ clean-installed_testLTLIBRARIES clean-installed_testPROGRAMS \
+ clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
+- clean-noinstPROGRAMS cscopelist-am ctags ctags-am dist-hook \
+- distclean distclean-compile distclean-generic \
+- distclean-libtool distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-binPROGRAMS \
+- install-completionDATA install-data install-data-am \
+- install-data-hook install-data-local install-dist_schemaDATA \
+- install-dvi install-dvi-am install-exec install-exec-am \
+- install-gioincludeHEADERS install-giounixincludeHEADERS \
+- install-giowin32includeHEADERS install-html install-html-am \
+- install-info install-info-am install-installed_testLTLIBRARIES \
++ clean-noinstPROGRAMS cscopelist cscopelist-recursive ctags \
++ ctags-recursive dist-hook distclean distclean-compile \
++ distclean-generic distclean-libtool distclean-tags distdir dvi \
++ dvi-am html html-am info info-am install install-am \
++ install-binPROGRAMS install-completionDATA install-data \
++ install-data-am install-data-hook install-data-local \
++ install-dist_schemaDATA install-dvi install-dvi-am \
++ install-exec install-exec-am install-gioincludeHEADERS \
++ install-giounixincludeHEADERS install-giowin32includeHEADERS \
++ install-html install-html-am install-info install-info-am \
++ install-installed_testLTLIBRARIES \
+ install-installed_testPROGRAMS install-installed_testSCRIPTS \
+ install-installed_test_metaDATA install-libLTLIBRARIES \
+- install-man install-nobase_installed_testDATA install-pdf \
+- install-pdf-am install-ps install-ps-am install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am recheck tags tags-am uninstall \
+- uninstall-am uninstall-binPROGRAMS uninstall-completionDATA \
++ install-man install-nobase_installed_testDATA \
++ install-nodist_gioincludeHEADERS install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
++ installcheck-am installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am \
++ uninstall-binPROGRAMS uninstall-completionDATA \
+ uninstall-dist_schemaDATA uninstall-gioincludeHEADERS \
+ uninstall-giounixincludeHEADERS \
+ uninstall-giowin32includeHEADERS \
+@@ -4272,7 +4029,8 @@
+ uninstall-installed_testPROGRAMS \
+ uninstall-installed_testSCRIPTS \
+ uninstall-installed_test_metaDATA uninstall-libLTLIBRARIES \
+- uninstall-local uninstall-nobase_installed_testDATA
++ uninstall-local uninstall-nobase_installed_testDATA \
++ uninstall-nodist_gioincludeHEADERS
+
+
+ ### testing rules
+Common subdirectories: glib-2.38.0/gio/completion and glib-2.38.0-A/gio/completion
+Common subdirectories: glib-2.38.0/gio/fam and glib-2.38.0-A/gio/fam
+Common subdirectories: glib-2.38.0/gio/fen and glib-2.38.0-A/gio/fen
+Common subdirectories: glib-2.38.0/gio/gdbus-2.0 and glib-2.38.0-A/gio/gdbus-2.0
+diff -Nu glib-2.38.0/gio/gdbusobjectmanagerclient.c glib-2.38.0-A/gio/gdbusobjectmanagerclient.c
+--- glib-2.38.0/gio/gdbusobjectmanagerclient.c 2013-08-08 03:00:40.000000000 -0700
++++ glib-2.38.0-A/gio/gdbusobjectmanagerclient.c 2013-09-28 14:34:00.000000000 -0700
+@@ -1113,7 +1113,7 @@
+
+ ret = g_dbus_connection_call_sync (manager->priv->connection,
+ "org.freedesktop.DBus",
+- "/org/freedeskop/DBus",
++ "/org/freedesktop/DBus",
+ "org.freedesktop.DBus",
+ "AddMatch",
+ g_variant_new ("(s)",
+@@ -1198,7 +1198,7 @@
+ */
+ g_dbus_connection_call (manager->priv->connection,
+ "org.freedesktop.DBus",
+- "/org/freedeskop/DBus",
++ "/org/freedesktop/DBus",
+ "org.freedesktop.DBus",
+ "RemoveMatch",
+ g_variant_new ("(s)",
+diff -Nu glib-2.38.0/gio/gnetworking.h glib-2.38.0-A/gio/gnetworking.h
+--- glib-2.38.0/gio/gnetworking.h 2013-09-23 14:07:56.000000000 -0700
++++ glib-2.38.0-A/gio/gnetworking.h 1969-12-31 16:00:00.000000000 -0800
+@@ -1,84 +0,0 @@
+-/* GIO - GLib Input, Output and Streaming Library
+- *
+- * Copyright (C) 2008-2011 Red Hat, Inc.
+- *
+- * This library is free software; you can redistribute it and/or
+- * modify it under the terms of the GNU Lesser General Public
+- * License as published by the Free Software Foundation; either
+- * version 2 of the License, or (at your option) any later version.
+- *
+- * This library is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+- * Lesser General Public License for more details.
+- *
+- * You should have received a copy of the GNU Lesser General
+- * Public License along with this library; if not, write to the
+- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+- * Boston, MA 02111-1307, USA.
+- */
+-
+-#ifndef __G_NETWORKING_H__
+-#define __G_NETWORKING_H__
+-
+-#include <glib.h>
+-
+-#ifdef G_OS_WIN32
+-
+-#ifndef _WIN32_WINNT
+-#define _WIN32_WINNT 0x0501
+-#endif
+-#include <winsock2.h>
+-#undef interface
+-#include <ws2tcpip.h>
+-#include <windns.h>
+-#include <mswsock.h>
+-
+-#include <iphlpapi.h>
+-
+-#else /* !G_OS_WIN32 */
+-
+-#include <sys/types.h>
+-
+-#include <netdb.h>
+-#include <netinet/in.h>
+-#include <netinet/tcp.h>
+-#include <resolv.h>
+-#include <sys/socket.h>
+-#include <sys/un.h>
+-#include <net/if.h>
+-
+-#include <arpa/inet.h>
+-#include <arpa/nameser.h>
+-
+-
+-#ifndef T_SRV
+-#define T_SRV 33
+-#endif
+-
+-#ifndef _PATH_RESCONF
+-#define _PATH_RESCONF "/etc/resolv.conf"
+-#endif
+-
+-#ifndef CMSG_LEN
+-/* CMSG_LEN and CMSG_SPACE are defined by RFC 2292, but missing on
+- * some older platforms.
+- */
+-#define CMSG_LEN(len) ((size_t)CMSG_DATA((struct cmsghdr *)NULL) + (len))
+-
+-/* CMSG_SPACE must add at least as much padding as CMSG_NXTHDR()
+- * adds. We overestimate here.
+- */
+-#define GLIB_ALIGN_TO_SIZEOF(len, obj) (((len) + sizeof (obj) - 1) & ~(sizeof (obj) - 1))
+-#define CMSG_SPACE(len) GLIB_ALIGN_TO_SIZEOF (CMSG_LEN (len), struct cmsghdr)
+-#endif
+-#endif
+-
+-G_BEGIN_DECLS
+-
+-GLIB_AVAILABLE_IN_2_36
+-void g_networking_init (void);
+-
+-G_END_DECLS
+-
+-#endif /* __G_NETWORKING_H__ */
+diff -Nu glib-2.38.0/gio/gsocket.c glib-2.38.0-A/gio/gsocket.c
+--- glib-2.38.0/gio/gsocket.c 2013-09-17 11:47:14.000000000 -0700
++++ glib-2.38.0-A/gio/gsocket.c 2013-09-28 14:34:00.000000000 -0700
+@@ -499,7 +499,7 @@
+ return fd;
+
+ /* It's possible that libc has SOCK_CLOEXEC but the kernel does not */
+- if (fd < 0 && errno == EINVAL)
++ if (fd < 0 && (errno == EINVAL || errno == EPROTOTYPE))
+ #endif
+ fd = socket (domain, type, protocol);
+
+Common subdirectories: glib-2.38.0/gio/gvdb and glib-2.38.0-A/gio/gvdb
+Common subdirectories: glib-2.38.0/gio/inotify and glib-2.38.0-A/gio/inotify
+Common subdirectories: glib-2.38.0/gio/kqueue and glib-2.38.0-A/gio/kqueue
+Common subdirectories: glib-2.38.0/gio/tests and glib-2.38.0-A/gio/tests
+Common subdirectories: glib-2.38.0/gio/win32 and glib-2.38.0-A/gio/win32
+Common subdirectories: glib-2.38.0/gio/xdgmime and glib-2.38.0-A/gio/xdgmime
diff --git a/patches/py2cairo-changelog.patch b/patches/py2cairo-changelog.patch
new file mode 100644
index 0000000..27666a5
--- /dev/null
+++ b/patches/py2cairo-changelog.patch
@@ -0,0 +1,5 @@
+--- py2cairo-1.10.0/ChangeLog 1969-12-31 16:00:00.000000000 -0800
++++ py2cairo-1.10.0-A/ChangeLog 2013-09-29 10:17:00.000000000 -0700
+@@ -0,0 +1,2 @@
++Bogus entry to make autoreconf happy
++.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
