<p>In <a href="https://github.com/geany/geany/pull/1038#discussion_r66230660">configure.ac</a>:</p>
<pre style='color:#555'>> @@ -74,14 +74,11 @@ AS_IF([test "x$enable_gtk3" = xyes],
> AM_CONDITIONAL([GTK3], [test "x$gtk_package" = "xgtk+-3.0"])
>
> # GTK/GLib/GIO checks
> -gtk_modules="$gtk_package >= $gtk_min_version glib-2.0 >= 2.28"
> -gtk_modules_private="gio-2.0 >= 2.28 gmodule-no-export-2.0"
> +gtk_modules="$gtk_package >= $gtk_min_version glib-2.0 >= 2.32"
> +gtk_modules_private="gio-2.0 >= 2.32 gmodule-no-export-2.0"
</pre>
<p>This <em>might</em> work (overwriting with newer GLib):</p>
<div class="highlight highlight-source-diff"><pre><span class="pl-c1">diff --git a/scripts/cross-build-mingw.sh b/scripts/cross-build-mingw.sh</span>
index f3cf9b5..6aab88a 100755
<span class="pl-md">--- a/scripts/cross-build-mingw.sh</span>
<span class="pl-mi1">+++ b/scripts/cross-build-mingw.sh</span>
<span class="pl-mdr">@@ -52,7 +52,7 @@</span> fetch_and_unzip()
{
local basename=${1##*/}
curl -L -# "$1" > "$basename"
<span class="pl-md">- unzip -q "$basename" -d "$2"</span>
<span class="pl-mi1">+ unzip -qo "$basename" -d "./$2"</span>
rm -f "$basename"
}
<span class="pl-mdr">@@ -86,6 +86,11 @@</span> cd "$BUILDDIR"
mkdir _deps
fetch_and_unzip "$BUNDLE_ZIP" _deps
<span class="pl-mi1">+if [ "$GTK3" = no ]; then</span>
<span class="pl-mi1">+ # get newer GLib</span>
<span class="pl-mi1">+ fetch_and_unzip "http://win32builder.gnome.org/packages/3.6/glib-dev_2.34.3-1_win32.zip" _deps</span>
<span class="pl-mi1">+ fetch_and_unzip "http://win32builder.gnome.org/packages/3.6/glib_2.34.3-1_win32.zip" _deps</span>
<span class="pl-mi1">+fi</span>
# fixup the prefix= in the pkg-config files
sed -i "s%^\(prefix=\).*$%\1$PWD/_deps%" _deps/lib/pkgconfig/*.pc
</pre></div>
<p>Alternatively, this is trickier but might also work (add files from the GTK2 bundle onto the GTK3 one, not overwriting):</p>
<div class="highlight highlight-source-diff"><pre><span class="pl-c1">diff --git a/scripts/cross-build-mingw.sh b/scripts/cross-build-mingw.sh</span>
index f3cf9b5..6f4b2c7 100755
<span class="pl-md">--- a/scripts/cross-build-mingw.sh</span>
<span class="pl-mi1">+++ b/scripts/cross-build-mingw.sh</span>
<span class="pl-mdr">@@ -52,7 +52,7 @@</span> fetch_and_unzip()
{
local basename=${1##*/}
curl -L -# "$1" > "$basename"
<span class="pl-md">- unzip -q "$basename" -d "$2"</span>
<span class="pl-mi1">+ unzip -qn "$basename" -d "./$2"</span>
rm -f "$basename"
}
<span class="pl-mdr">@@ -85,7 +85,8 @@</span> mkdir "$BUILDDIR"
cd "$BUILDDIR"
mkdir _deps
<span class="pl-md">-fetch_and_unzip "$BUNDLE_ZIP" _deps</span>
<span class="pl-mi1">+fetch_and_unzip "$GTK3_BUNDLE_ZIP" _deps</span>
<span class="pl-mi1">+[ "$GTK3" = yes ] || fetch_and_unzip "$BUNDLE_ZIP" _deps</span>
# fixup the prefix= in the pkg-config files
sed -i "s%^\(prefix=\).*$%\1$PWD/_deps%" _deps/lib/pkgconfig/*.pc
</pre></div>
<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany/pull/1038/files/112ef938ff8c100b62c3ca12a608ed44daa365cf#r66230660">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe/ABDrJ7gxfNrAJveYRvWLCpNNk_VQ1NxFks5qJphZgaJpZM4Ifw_7">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ8CdtfNe3J3r0SWAR1lx5Vhdfj9Aks5qJphZgaJpZM4Ifw_7.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
<link itemprop="url" href="https://github.com/geany/geany/pull/1038/files/112ef938ff8c100b62c3ca12a608ed44daa365cf#r66230660"></link>
<meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>