Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Thomas Martitz kugel@rockbox.org Date: Thu, 23 Jun 2016 20:33:49 UTC Commit: ec15b6f5298b4a03b96a46ea49c13153450594df https://github.com/geany/geany/commit/ec15b6f5298b4a03b96a46ea49c13153450594...

Log Message: ----------- scripts/cross-build-mingw.sh: Use newer support libraries with GTK2

Combine the libraries from the GTK3 bundle with GTK from the GTK2 one to get newer GLib & co for GTK2 builds.

Modified Paths: -------------- scripts/cross-build-mingw.sh

Modified: scripts/cross-build-mingw.sh 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -54,7 +54,7 @@ fetch_and_unzip() { local basename=${1##*/} curl -L -# "$1" > "$basename" - unzip -q "$basename" -d "$2" + unzip -qn "$basename" -d "$2" rm -f "$basename" }

@@ -87,7 +87,8 @@ mkdir "$BUILDDIR" cd "$BUILDDIR"

mkdir _deps -fetch_and_unzip "$BUNDLE_ZIP" _deps +fetch_and_unzip "$GTK3_BUNDLE_ZIP" _deps +[ "$GTK3" = yes ] || fetch_and_unzip "$BUNDLE_ZIP" _deps # fixup the prefix= in the pkg-config files sed -i "s%^(prefix=).*$%\1$PWD/_deps%" _deps/lib/pkgconfig/*.pc

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).