Update glib to 2.59.3

Requires meson -> python3

Author: hatstand

.github/workflows/build.yml

@@ -23,19 +23,22 @@ jobs:
           apt-get update && apt-get install -y -q
           autoconf
           bison
+          build-essential
           cmake
           flex
           gettext
           git-core
           intltool
           libglib2.0-dev
           libtool
+          meson
           mingw-w64
+          ninja
           nsis
           pkg-config
           protobuf-compiler
-          python
-          python-dev
+          python3
+          python3-setuptools
           stow
           sudo
           texinfo

downloader/downloader.py

@@ -3,6 +3,7 @@
 import os
 import sys
 import urllib
+import urllib.request
 
 DOWNLOAD_URL = 'https://storage.googleapis.com/clementine-data.appspot.com/Build%20dependencies/'
 
@@ -18,7 +19,7 @@
     ('gettext-0.20.2.tar.xz', '0cf5f68338d5d941bbf9ac93b847310f'),
     ('glew-1.5.5.tar.bz2', '25afa3ff4cff7b67add612e148a54240'),
     ('glew-1.5.5-win32.zip', '48c8c982644ba11dfe94aaf756217eec'),
-    ('glib-2.58.3.tar.xz', '8058c7bde846dcffe5fa453eca366d73'),
+    ('glib-2.59.3.tar.xz', '9a06eb1a7143a17050b0b1abef2208e1'),
     ('glib-networking-2.54.1.tar.xz', '99867463f182c2767bce0c74bc9cc981'),
     ('gmp-6.2.0.tar.xz', 'a325e3f09e6d91e62101e59f9bda3ec1'),
     ('gnutls-3.6.13.tar.xz', 'bb1fe696a11543433785b4fc70ca225f'),
@@ -74,7 +75,7 @@ def Md5File(path):
 
   file_hash = hashlib.md5()
   try:
-    with open(path) as fh:
+    with open(path, 'rb') as fh:
       while True:
         chunk = fh.read(4096)
         if len(chunk) == 0:
@@ -103,8 +104,8 @@ def DownloadFiles(flags):
     if actual_md5_checksum != md5_checksum:
       url = DOWNLOAD_URL + name
 
-      print 'Downloading %s...' % name
-      urllib.urlretrieve(url, path)
+      print('Downloading %s...' % name)
+      urllib.request.urlretrieve(url, path)
       actual_md5_checksum = Md5File(path)
 
     # If the checksum still didn't match the download must have failed.
@@ -113,7 +114,7 @@ def DownloadFiles(flags):
           'Download failed - checksums do not match (got %s, expected %s)' %
           (actual_md5_checksum, md5_checksum))
 
-  print 'All files are up-to-date'
+  print('All files are up-to-date')
 
 
 def Main(argv):

makefile.common

@@ -10,7 +10,7 @@ flac=flac-1.3.3
 gcrypt=libgcrypt-1.8.5
 gettext=gettext-0.20.2
 glew=glew-1.5.5
-glib=glib-2.58.3
+glib=glib-2.59.3
 glibnetworking=glib-networking-2.54.1
 gmp=gmp-6.2.0
 gnutls=gnutls-3.6.13
@@ -137,7 +137,7 @@ all:
 	$(MAKE) clementine-deps
 
 clean:
-	realstow=`python -c "import os.path; print os.path.realpath('$(stow)')"`; \
+	realstow=`python3 -c "import os.path; print os.path.realpath('$(stow)')"`; \
 	for path in $(stow)/*; do \
 		directory=`basename $$path`; \
 		stow -d $$realstow -D $$directory; \
@@ -148,7 +148,7 @@ clean:
 	-rm .done-*
 
 all-downloads:
-	python $(src)/downloader/downloader.py --output "$(downloads)"
+	python3 $(src)/downloader/downloader.py --output "$(downloads)"
 
 boost: .done-boost
 cdio: .done-cdio

windows/Makefile

@@ -271,10 +271,10 @@ clementine-deps: clementine-build-deps clementine-gst-plugins openssl glibnetwor
 
 .done-glib: .done-zlib .done-gettext .done-ffi .done-pcre
 	$(call extractpkg,$(glibtgz))
-	cd $(glib) && ./autogen.sh
-	cd $(glib) && $(configure) CFLAGS="$(cflags) -Wno-format-security -Wno-format-overflow -Wno-format-nonliteral"
-	cd $(glib) && $(make)
-	$(call installpkg,$(glib))
+	cd $(glib) && meson --cross-file ../cross-file.txt _build
+	cd $(glib) && ninja -C _build
+	cd $(glib) && DESTDIR=$(stow)/$(glib) ninja -C _build install
+	touch $@
 
 .done-gmp:
 	rm -f $(prefix)/share/info/dir