glib2: update to 2.68.1

Removed two now pointless patches as they were added as options.

Switch to AUTORELEASE for simplicity.

Update MESON_ARGS.

Signed-off-by: Rosen Penev <redacted>

diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index 3e46675ffc5d643e91cedd3e680e499b778070c6..e5aee0feec7bba011068790f1fcba9b8c7b14987 100644 (file)
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=glib2
-PKG_VERSION:=2.66.4
-PKG_RELEASE:=1
+PKG_VERSION:=2.68.1
+PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/glib/2.66
-PKG_HASH:=97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984
+PKG_SOURCE_URL:=@GNOME/glib/2.68
+PKG_HASH:=241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333
 
 PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
 PKG_LICENSE:=LGPL-2.1-or-later
@@ -57,15 +57,19 @@ COMP_ARGS= \
        -Dman=false \
        -Ddtrace=false \
        -Dsystemtap=false \
+       -Dsysprof=disabled \
        -Dgtk_doc=false \
        -Dbsymbolic_functions=true \
        -Dforce_posix_threads=true \
        -Dfam=false \
+       -Dtests=false \
        -Dinstalled_tests=false \
        -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled \
        -Doss_fuzz=disabled \
+       -Dglib_debug=disabled \
        -Dglib_assert=false \
-       -Dglib_checks=false
+       -Dglib_checks=false \
+       -Dlibelf=disabled
 
 MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false
 MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true

diff --git a/libs/glib2/patches/001-no-libelf.patch b/libs/glib2/patches/001-no-libelf.patch
deleted file mode 100644 (file)
index a1fe738..0000000
--- a/libs/glib2/patches/001-no-libelf.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gio/meson.build
-+++ b/gio/meson.build
-@@ -874,20 +874,6 @@ endif
- 
- # Dependencies used by executables below
- have_libelf = false
--libelf = dependency('libelf', version : '>= 0.8.12', required : false)
--if libelf.found()
--  have_libelf = true
--else
--  # This fallback is necessary on *BSD. elfutils isn't the only libelf
--  # implementation, and *BSD usually includes their own libelf as a system
--  # library which doesn't have a corresponding .pc file.
--  libelf = cc.find_library('elf', required : false)
--  have_libelf = libelf.found()
--  have_libelf = have_libelf and cc.has_function('elf_begin', dependencies : libelf)
--  have_libelf = have_libelf and cc.has_function('elf_getshdrstrndx', dependencies : libelf)
--  have_libelf = have_libelf and cc.has_function('elf_getshdrnum', dependencies : libelf)
--  have_libelf = have_libelf and cc.has_header('libelf.h')
--endif
- 
- if have_libelf
-   glib_conf.set('HAVE_LIBELF', 1)

diff --git a/libs/glib2/patches/002-no-tests.patch b/libs/glib2/patches/002-no-tests.patch
deleted file mode 100644 (file)
index fbd35b7..0000000
--- a/libs/glib2/patches/002-no-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -94,7 +94,7 @@ installed_tests_template = files('templa
- installed_tests_template_tap = files('template-tap.test.in')
- 
- # Don’t build the tests unless we can run them (either natively, in an exe wrapper, or by installing them for later use)
--build_tests = not meson.is_cross_build() or (meson.is_cross_build() and meson.has_exe_wrapper()) or installed_tests_enabled
-+build_tests = false
- 
- add_project_arguments('-D_GNU_SOURCE', language: 'c')
- 

diff --git a/libs/glib2/patches/004-no-distutils.patch b/libs/glib2/patches/004-no-distutils.patch
index b8c35d9a014005223ffc592cd5bae21baa3d01f5..5dc541189d941b8db850f544410af7bad39c5293 100644 (file)
--- a/libs/glib2/patches/004-no-distutils.patch
+++ b/libs/glib2/patches/004-no-distutils.patch
@@ -1,6 +1,6 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -2185,16 +2185,10 @@ endif
+@@ -2220,16 +2220,10 @@ endif
  
  glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
  
@@ -17,4 +17,4 @@
 -
  # Determine which user environment-dependent files that we want to install
  have_bash = find_program('bash', required : false).found() # For completion scripts
- have_sh = find_program('sh', required : false).found() # For glib-gettextize
+ bash_comp_dep = dependency('bash-completion', version: '>=2.0', required: false)

diff --git a/libs/glib2/patches/005-uclibc.patch b/libs/glib2/patches/005-uclibc.patch
index 46fd16305d615d186fb3e0e7ae5bc03e6a811b15..ab3ac4ba21e186e68561d8c63424e7d7364711c3 100644 (file)
--- a/libs/glib2/patches/005-uclibc.patch
+++ b/libs/glib2/patches/005-uclibc.patch
@@ -1,6 +1,6 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -2003,8 +2003,8 @@ endif
+@@ -2038,8 +2038,8 @@ endif
  # FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
  # implementations. This could be extended if issues are found in some platforms.
  libintl_deps = []

diff --git a/libs/glib2/patches/006-c99.patch b/libs/glib2/patches/006-c99.patch
index 60db223fd36a45fcb076e8c7e2db04d43d4a412a..76180e2e8933d006130b6bbdb17896d4df06d451 100644 (file)
--- a/libs/glib2/patches/006-c99.patch
+++ b/libs/glib2/patches/006-c99.patch
@@ -1,6 +1,6 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -923,7 +923,7 @@ if host_system == 'windows' and (cc.get_
+@@ -944,7 +944,7 @@ if host_system == 'windows' and (cc.get_
    glib_conf.set('HAVE_C99_SNPRINTF', false)
    glib_conf.set('HAVE_C99_VSNPRINTF', false)
    glib_conf.set('HAVE_UNIX98_PRINTF', false)