Browse Source

glib: update to 2.84.0

Waldemar Brodkorb 11 months ago
parent
commit
aa812c5bf1

+ 13 - 10
package/glib/Makefile

@@ -4,16 +4,16 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		glib
-PKG_VERSION:=		2.78.4
+PKG_VERSION:=		2.84.0
 PKG_RELEASE:=		1
-PKG_EXTRAVER:=		2.78
-PKG_HASH:=		24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63
+PKG_EXTRAVER:=		2.84
+PKG_HASH:=		f8823600cb85425e2815cfad82ea20fdaa538482ab74e7293d58b3f64a5aff6a
 PKG_DESCR:=		low-level core library that forms the basis of gtk+
 PKG_SECTION:=		libs/misc
-PKG_DEPENDS:=		pcre2 zlib libffi libiconv
-PKG_BUILDDEP:=		glib-host util-linux libffi zlib dbus pcre2 libiconv
-HOST_BUILDDEP:=		pkgconf-host libiconv-host libffi-host python3-host gettext-host util-linux-host
-HOST_BUILDDEP+=		pcre2-host meson-host zlib-host
+PKG_DEPENDS:=		pcre2 zlib libffi
+PKG_BUILDDEP:=		glib-host util-linux libffi zlib dbus pcre2
+HOST_BUILDDEP:=		pkgconf-host libffi-host python3-host gettext-host util-linux-host
+HOST_BUILDDEP+=		pcre2-host meson-host zlib-host libiconv-host
 PKG_NEEDS:=		threads intl iconv
 PKG_URL:=		http://www.gtk.org/
 PKG_SITES:=		http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/
@@ -35,11 +35,14 @@ CONFIG_STYLE:=		meson
 BUILD_STYLE:=		meson
 INSTALL_STYLE:=		meson
 
-HOST_MESON_FLAGS:=	--default-library static -Dtests=false -Dxattr=false -Doss_fuzz=disabled
-MESON_FLAGS:=		-Dtests=false -Dxattr=false -Doss_fuzz=disabled
+HOST_MESON_FLAGS:=	-Dintrospection=disabled -Dnls=disabled -Dtests=false -Dxattr=false \
+		       	-Doss_fuzz=disabled \
+			-Dsysprof=disabled \
+			--default-library=static
+MESON_FLAGS:=		-Dintrospection=disabled -Dtests=false -Dxattr=false -Doss_fuzz=disabled -Dsysprof=disabled
 
 hostpost-install:
-	$(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/glib-2.0.pc \
+	$(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/*.pc \
 		$(STAGING_HOST_DIR)/usr/lib/pkgconfig
 	$(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-mkenums \
 		$(STAGING_HOST_DIR)/usr/bin

+ 3 - 3
package/glib/patches/patch-glib_gnulib_meson_build

@@ -1,6 +1,6 @@
---- glib-2.75.2.orig/glib/gnulib/meson.build	2023-01-06 13:49:52.000000000 +0100
-+++ glib-2.75.2/glib/gnulib/meson.build	2023-01-22 14:08:55.068305964 +0100
-@@ -312,9 +312,6 @@ endif
+--- glib-2.84.0.orig/glib/gnulib/meson.build	2025-03-06 14:09:13.000000000 +0100
++++ glib-2.84.0/glib/gnulib/meson.build	2025-03-30 06:00:21.051043526 +0200
+@@ -315,9 +315,6 @@ endif
  if not gl_cv_func_frexp_works and gl_cv_func_frexp_broken_beyond_repair
    error ('frexp() is missing or broken beyond repair, and we have nothing to replace it with')
  endif

+ 0 - 10
package/glib/patches/patch-meson_build

@@ -1,10 +0,0 @@
---- glib-2.78.4.orig/meson.build	2024-01-21 20:48:20.000000000 +0100
-+++ glib-2.78.4/meson.build	2024-08-30 10:20:24.877632538 +0200
-@@ -527,6 +527,7 @@ if cc.get_id() == 'gcc' or cc.get_id() =
-     '-Werror=missing-include-dirs',
-     '-Werror=pointer-arith',
-     '-Werror=unused-result',
-+    '-Wno-error=format-nonliteral',
-   ]
- 
-   warning_c_args = warning_common_args + [