summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/glib/Makefile14
-rw-r--r--package/glib/patches/patch-glib_gnulib_meson_build12
-rw-r--r--package/glib/patches/patch-meson_build12
3 files changed, 24 insertions, 14 deletions
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 18ad87240..aeb4cfdec 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,16 +4,16 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= glib
-PKG_VERSION:= 2.72.3
+PKG_VERSION:= 2.75.2
PKG_RELEASE:= 1
-PKG_EXTRAVER:= 2.72
-PKG_HASH:= 4a39a2f624b8512d500d5840173eda7fa85f51c109052eae806acece85d345f0
+PKG_EXTRAVER:= 2.75
+PKG_HASH:= 360d6fb75202c0eb0d07f0ab812b19b526f1c05ccc0a8ed7e5d2c988616d343a
PKG_DESCR:= low-level core library that forms the basis of gtk+
PKG_SECTION:= libs/misc
-PKG_DEPENDS:= libpcre zlib libffi
-PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre
+PKG_DEPENDS:= pcre2 zlib libffi
+PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2
HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python3-host gettext-host util-linux-host
-HOST_BUILDDEP+= pcre-host meson-host
+HOST_BUILDDEP+= pcre2-host meson-host
PKG_NEEDS:= threads intl iconv
PKG_URL:= http://www.gtk.org/
PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/
@@ -28,8 +28,6 @@ $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS
HOSTWRKBUILD= $(WRKSRC)
WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj
-TARGET_CFLAGS+= -Wno-error=format-nonliteral
-
HOST_CONFIG_STYLE:= manual
HOST_STYLE:= manual
CONFIG_STYLE:= meson
diff --git a/package/glib/patches/patch-glib_gnulib_meson_build b/package/glib/patches/patch-glib_gnulib_meson_build
new file mode 100644
index 000000000..4039f468f
--- /dev/null
+++ b/package/glib/patches/patch-glib_gnulib_meson_build
@@ -0,0 +1,12 @@
+--- 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
+ 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
+-if not gl_cv_func_frexpl_works and gl_cv_func_frexpl_broken_beyond_repair
+- error ('frexpl() is missing or broken beyond repair, and we have nothing to replace it with')
+-endif
+
+ math_h_config.set ('REPLACE_FREXP', gl_cv_func_frexp_works ? 0 : 1)
+ math_h_config.set ('REPLACE_FREXPL', gl_cv_func_frexpl_works ? 0 : 1)
diff --git a/package/glib/patches/patch-meson_build b/package/glib/patches/patch-meson_build
index 7a68e0a57..c410eac33 100644
--- a/package/glib/patches/patch-meson_build
+++ b/package/glib/patches/patch-meson_build
@@ -1,10 +1,10 @@
---- glib-2.70.0.orig/meson.build 2021-09-17 12:17:56.849962700 +0200
-+++ glib-2.70.0/meson.build 2022-02-28 20:24:15.048295012 +0100
-@@ -449,6 +449,7 @@ if cc.get_id() == 'gcc' or cc.get_id() =
+--- glib-2.75.2.orig/meson.build 2023-01-06 13:49:52.000000000 +0100
++++ glib-2.75.2/meson.build 2023-01-22 14:18:11.633406695 +0100
+@@ -513,6 +513,7 @@ if cc.get_id() == 'gcc' or cc.get_id() =
'-Werror=missing-include-dirs',
- '-Werror=missing-prototypes',
'-Werror=pointer-arith',
+ '-Werror=unused-result',
+ '-Wno-error=format-nonliteral',
]
- warning_c_link_args = [
- '-Wl,-z,nodelete',
+
+ warning_c_args = warning_common_args + [