Use same version of glib for osx and win32y

bootstrap.sh

@@ -53,16 +53,17 @@ build_host_autoconf pkg-config "${PKG_CONFIG_VERSION}" "--enable-indirect-deps -
 # ---------------------------------------------------------------------------------------------------------------------
 # glib
 
-if [ -n "${GLIB_VERSION}" ]; then
-    GLIB_EXTRAFLAGS=""
-
-    if [ "${WIN32}" -eq 0 ]; then
-        GLIB_EXTRAFLAGS+=" --with-threads=win32"
+if [ "${MACOS}" -eq 1 ] || [ "${WIN32}" -eq 1 ]; then
+    if [ "${WIN32}" -eq 1 ]; then
+        GLIB_EXTRAFLAGS="--with-threads=win32"
+    else
+        GLIB_EXTRAFLAGS="--with-threads=posix"
     fi
 
     download glib ${GLIB_VERSION} "http://caesar.ftp.acc.umu.se/pub/GNOME/sources/glib/${GLIB_MVERSION}" "${GLIB_TAR_EXT}"
     if [ "${MACOS}" -eq 1 ]; then
-        remove_file glib ${GLIB_VERSION} "m4macros/glib-gettext.m4"
+        patch_file glib ${GLIB_VERSION} "glib/gconvert.c" '/#error/g'
+        export EXTRA_LDFLAGS="-lresolv"
     fi
     build_autoconfgen glib ${GLIB_VERSION} "${GLIB_EXTRAFLAGS}"
 fi

patches/glib/macos/01_skip-gettext.patch

@@ -1,89 +0,0 @@
-diff --git a/acinclude.m4 b/acinclude.m4
-index cac7f21..aff165a 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -449,4 +449,3 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
- m4_include(acglib.m4)dnl
- m4_include(glib/libcharset/codeset.m4)dnl
- m4_include(glib/libcharset/glibc21.m4)dnl
--m4_include(m4macros/glib-gettext.m4)dnl
-diff --git a/autogen.sh b/autogen.sh
-old mode 100644
-new mode 100755
-diff --git a/configure.ac b/configure.ac
-index b6640da..55262f3 100644
---- a/configure.in
-+++ b/configure.in
-@@ -454,13 +454,6 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
- AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
- GLIB_GNU_GETTEXT
- 
--if test "$gt_cv_have_gettext" != "yes" ; then
--  AC_MSG_ERROR([
--*** You must have either have gettext support in your C library, or use the 
--*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
--])
--fi
--
- LIBS="$INTLLIBS $LIBS"
- 
- GETTEXT_PACKAGE=glib20
-diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c
-index 3bfbd4f..f27e731 100644
---- a/gio/gunixconnection.c
-+++ b/gio/gunixconnection.c
-@@ -26,6 +26,8 @@
- #include <string.h>
- #include <unistd.h>
- 
-+#define ngettext(t1, t2, n) t1
-+
- /**
-  * SECTION:gunixconnection
-  * @title: GUnixConnection
-diff --git a/glib/ggettext.c b/glib/ggettext.c
-index bf74ccb..2430a0d 100644
---- a/glib/ggettext.c
-+++ b/glib/ggettext.c
-@@ -40,7 +40,6 @@
- 
- #include <string.h>
- #include <locale.h>
--#include <libintl.h>
- 
- #ifdef G_OS_WIN32
- 
-diff --git a/glib/gi18n.h b/glib/gi18n.h
-index f765c3d..2c950cd 100644
---- a/glib/gi18n.h
-+++ b/glib/gi18n.h
-@@ -20,13 +20,13 @@
- 
- #include <glib.h>
- 
--#include <libintl.h>
- #include <string.h>
- 
--#define  _(String) gettext (String)
--#define Q_(String) g_dpgettext (NULL, String, 0)
-+#define  _(String) String
- #define N_(String) (String)
--#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
- #define NC_(Context, String) (String)
- 
-+#define textdomain(...)
-+#define bindtextdomain(...)
-+
- #endif  /* __G_I18N_H__ */
-diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
-index 971871c..8a4f40c 100644
---- a/m4macros/Makefile.am
-+++ b/m4macros/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/glib.mk
- 
--installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4
-+installed_m4= glib-2.0.m4 gsettings.m4
- 
- EXTRA_DIST+=$(installed_m4)
- 

patches/glib/win64

@@ -1 +0,0 @@
-win32

setup/functions.sh

@@ -178,12 +178,15 @@ function build_autoconfgen() {
 
     local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}"
 
+    local EXTRA_CFLAGS2="${EXTRA_CFLAGS}"
+    local EXTRA_CXXFLAGS2="${EXTRA_CXXFLAGS}"
+    local EXTRA_LDFLAGS2="${EXTRA_LDFLAGS}"
+    local EXTRA_MAKE_ARGS2="${EXTRA_MAKE_ARGS}"
+
     _prebuild "${name}" "${pkgdir}"
 
     if [ ! -f "${pkgdir}/.stamp_preconfigured" ]; then
         pushd "${pkgdir}"
-#         autoreconf --force --install --verbose
-#         ./autogen.sh
         autoconf
         touch .stamp_preconfigured
         popd
@@ -191,6 +194,11 @@ function build_autoconfgen() {
 
     _postbuild
 
+    export EXTRA_CFLAGS="${EXTRA_CFLAGS2}"
+    export EXTRA_CXXFLAGS="${EXTRA_CXXFLAGS2}"
+    export EXTRA_LDFLAGS="${EXTRA_LDFLAGS2}"
+    export EXTRA_MAKE_ARGS="${EXTRA_MAKE_ARGS2}"
+
     build_autoconf "${name}" "${version}" "${extraconfrules}"
 }
 

setup/versions.sh

@@ -6,6 +6,8 @@ FILE_VERSION=5.34
 FLAC_VERSION=1.3.2
 FLUIDSYNTH_VERSION=1.1.11
 FFTW_VERSION=3.3.8
+GLIB_VERSION=2.22.5
+GLIB_MVERSION=2.22
 LIBLO_VERSION=0.30
 LIBOGG_VERSION=1.3.4
 LIBSAMPLERATE_VERSION=0.1.9
@@ -15,16 +17,6 @@ LV2_VERSION=1.18.0
 MXML_VERSION=3.1
 ZLIB_VERSION=1.2.11
 
-if [ "${MACOS}" -eq 1 ]; then
-    GLIB_VERSION=2.44.1
-    GLIB_MVERSION=2.44
-    GLIB_TAR_EXT="tar.xz"
-elif [ "${WIN32}" -eq 1 ]; then
-    GLIB_VERSION=2.22.5
-    GLIB_MVERSION=2.22
-    GLIB_TAR_EXT="tar.gz"
-fi
-
 # qt stuff
 QT5_VERSION=5.9.8
 QT5_MVERSION=5.9