diff --git a/extra/glib/build b/extra/glib/build index 831624a4..0add508d 100755 --- a/extra/glib/build +++ b/extra/glib/build @@ -23,31 +23,4 @@ meson \ ninja -C build ninja -C build install -# json-glib is a separate package which we build alongside -# glib (as if they were one and the same). The upstream for -# json-glib is effectively dead (only translation work) so -# this makes my life a little easier.. -{ - cd json-glib - - # This mess of CFLAGS, etc is needed to point json-glib to - # the freshly built glib sources instead of the system's. - export PKG_CONFIG_PATH="$1/usr/lib/pkgconfig:$PKG_CONFIG_PATH" - export PATH="$1/usr/bin:$PATH" - export CFLAGS="$CFLAGS -I$1/usr/include/glib-2.0" - export CFLAGS="$CFLAGS -I$1/usr/lib/glib-2.0/include -pthread" - export LDFLAGS="$LDFLAGS -L$1/usr/lib/" - - meson \ - --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - -Ddocs=false \ - -Dintrospection=disabled \ - . output - - ninja -C output - ninja -C output install -} - -kiss l dbus >/dev/null 2>&1 || rm -rf "$1/usr/bin/gdbus" +rm -rf "$1/usr/bin/gdbus" diff --git a/extra/glib/checksums b/extra/glib/checksums index 6aa5821a..87396a48 100644 --- a/extra/glib/checksums +++ b/extra/glib/checksums @@ -1,2 +1 @@ -79f31365a99cb1cc9db028625635d1438890702acde9e2802eae0acebcf7b5b1 -0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73 +e7e1a3c20c026109c45c9ec4a31d8dcebc22e86c69486993e565817d64be3138 diff --git a/extra/glib/sources b/extra/glib/sources index cf5a9ca2..5c66acab 100644 --- a/extra/glib/sources +++ b/extra/glib/sources @@ -1,2 +1 @@ -https://download.gnome.org/sources/glib/2.66/glib-2.66.3.tar.xz -https://download.gnome.org/sources/json-glib/1.6/json-glib-1.6.0.tar.xz json-glib +https://download.gnome.org/sources/glib/2.68/glib-2.68.3.tar.xz diff --git a/extra/glib/version b/extra/glib/version index 4219642d..51f3a414 100644 --- a/extra/glib/version +++ b/extra/glib/version @@ -1 +1 @@ -2.66.3 1 +2.68.3 1