aboutsummaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2020-08-30 23:57:46 -0700
committerGitHub <noreply@github.com>2020-08-30 23:57:46 -0700
commite37e532b70b288452dbe6eded7163608ce8d4ed3 (patch)
treea511d7b711d868a742e284925243ee5351344d96 /libs
parent6fd175a4c504530306059020e9c0c37e33da9a78 (diff)
parent535d9ffeee9f4aaee34030207f0f68bd019293b1 (diff)
Merge pull request #13226 from neheb/glbbbbb
glib2: update to 2.65.2
Diffstat (limited to 'libs')
-rw-r--r--libs/glib2/Makefile4
-rw-r--r--libs/glib2/patches/004-no-distutils.patch2
-rw-r--r--libs/glib2/patches/005-uclibc.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/glib2/Makefile b/libs/glib2/Makefile
index cc7170a2b..95777ce19 100644
--- a/libs/glib2/Makefile
+++ b/libs/glib2/Makefile
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=glib2
-PKG_VERSION:=2.65.1
+PKG_VERSION:=2.65.2
PKG_RELEASE:=1
PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/glib/2.65
-PKG_HASH:=bc63bf6c32713e0ee1dddc28e03f23b4a20c78bcb9a2c5b0f4eea41e46fb9cee
+PKG_HASH:=445b1951eaa82d7a8af46bdff5dcc8030406db1ceeb0f0c3a88983f70152c555
PKG_MAINTAINER:=Peter Wagner <tripolar@gmx.at>
PKG_LICENSE:=LGPL-2.1-or-later
diff --git a/libs/glib2/patches/004-no-distutils.patch b/libs/glib2/patches/004-no-distutils.patch
index f43ba9b5b..b8c35d9a0 100644
--- 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
-@@ -2168,16 +2168,10 @@ endif
+@@ -2185,16 +2185,10 @@ endif
glib_conf.set('HAVE_PROC_SELF_CMDLINE', have_proc_self_cmdline)
diff --git a/libs/glib2/patches/005-uclibc.patch b/libs/glib2/patches/005-uclibc.patch
index d1059c68b..46fd16305 100644
--- a/libs/glib2/patches/005-uclibc.patch
+++ b/libs/glib2/patches/005-uclibc.patch
@@ -1,6 +1,6 @@
--- a/meson.build
+++ b/meson.build
-@@ -1986,8 +1986,8 @@ endif
+@@ -2003,8 +2003,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 = []