From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 23 Nov 2022 07:57:33 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oxjhN-00GFPW-AC for lore@lore.pengutronix.de; Wed, 23 Nov 2022 07:57:33 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oxjhL-0004Mx-KR; Wed, 23 Nov 2022 07:57:31 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oxjhA-0003hq-Jr; Wed, 23 Nov 2022 07:57:20 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oxjh8-005zx5-Vt; Wed, 23 Nov 2022 07:57:19 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oxjh8-008Rvf-VF; Wed, 23 Nov 2022 07:57:18 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Wed, 23 Nov 2022 07:57:18 +0100 Message-Id: <20221123065718.2013878-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221122122240.3967729-1-christian.melki@t2data.com> References: <20221122122240.3967729-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] glib: Version bump. 2.72.3 -> 2.74.1. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 042e2bd2603c2eecf6a0ef7c105ea788491653be. Michael [sent from post-receive hook] On Wed, 23 Nov 2022 07:57:18 +0100, Christian Melki wrote: > Move to next stable series. > https://gitlab.gnome.org/GNOME/glib/-/blob/main/NEWS > A bunch of fixes and improvements, as usual. > Notable is the replacement of pcre for pcre2. > Likely to cause some minor headaches. > As usual, glib needs wringing with various packages. > > * License changed from LGPL-2.0 or later to LGPL-2.1 or later. > * glib.h had a SPDX identifier added. > * COPYING points to the actual license file in the license directory. > * Remove -Dfam (gamin file monitor). Deprecated. > * Replace PCRE with PCRE2. PCRE2 selects 8-bit by default. > > Signed-off-by: Christian Melki > Message-Id: <20221122122240.3967729-1-christian.melki@t2data.com> > [mol: squash host-glib changes and add missing PCRE2_8 dependency] > Signed-off-by: Michael Olbrich > > fixup! glib: Version bump. 2.72.3 -> 2.74.1. > > diff --git a/rules/glib.in b/rules/glib.in > index 140bf013154e..00485112aaea 100644 > --- a/rules/glib.in > +++ b/rules/glib.in > @@ -8,8 +8,8 @@ menuconfig GLIB > select LIBC_PTHREAD > select ICONV > select LIBFFI > - select LIBPCRE > - select LIBPCRE_ENABLE_UTF8 > + select PCRE2 > + select PCRE2_8 > select UTIL_LINUX if GLIB_LIBMOUNT > select UTIL_LINUX_LIBMOUNT if GLIB_LIBMOUNT > select ZLIB > diff --git a/rules/glib.make b/rules/glib.make > index 8b1fd17f93bc..39fb555439ae 100644 > --- a/rules/glib.make > +++ b/rules/glib.make > @@ -15,17 +15,17 @@ PACKAGES-$(PTXCONF_GLIB) += glib > # > # Paths and names > # > -GLIB_VERSION := 2.72.3 > -GLIB_MD5 := ef67f7e19e47c8e082256d614f1ab8f4 > +GLIB_VERSION := 2.74.1 > +GLIB_MD5 := abcfe42128bbace7a63c795551131d93 > GLIB := glib-$(GLIB_VERSION) > GLIB_SUFFIX := tar.xz > GLIB_URL := $(call ptx/mirror, GNOME, glib/$(basename $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX)) > GLIB_SOURCE := $(SRCDIR)/$(GLIB).$(GLIB_SUFFIX) > GLIB_DIR := $(BUILDDIR)/$(GLIB) > -GLIB_LICENSE := LGPL-2.0-or-later > +GLIB_LICENSE := LGPL-2.1-or-later > GLIB_LICENSE_FILES := \ > - file://glib/glib.h;startline=1;endline=16;md5=48a2e189b0f5db4b3c3fd8f53bdb55a0 \ > - file://COPYING;md5=4fbd65380cdd255951079008b364516c > + file://glib/glib.h;startline=1;endline=18;md5=c97f6829778db537db59d1ce41090b51 \ > + file://LICENSES/LGPL-2.1-or-later.txt;md5=41890f71f740302b785c27661123bff5 > > # ---------------------------------------------------------------------------- > # Prepare > @@ -39,7 +39,6 @@ GLIB_CONF_OPT := \ > $(CROSS_MESON_USR) \ > -Dbsymbolic_functions=true \ > -Ddtrace=false \ > - -Dfam=false \ > -Dforce_posix_threads=true \ > -Dglib_assert=true \ > -Dglib_checks=true \ > diff --git a/rules/host-glib.in b/rules/host-glib.in > index b87c339374fc..08f5cae2c8e4 100644 > --- a/rules/host-glib.in > +++ b/rules/host-glib.in > @@ -4,6 +4,6 @@ config HOST_GLIB > tristate > default y if ALLYES > select HOST_LIBFFI > - select HOST_LIBPCRE > select HOST_MESON > + select HOST_PCRE2 > select HOST_ZLIB > diff --git a/rules/host-glib.make b/rules/host-glib.make > index c062ad884c19..71973203bc84 100644 > --- a/rules/host-glib.make > +++ b/rules/host-glib.make > @@ -28,7 +28,6 @@ HOST_GLIB_CONF_OPT := \ > $(HOST_MESON_OPT) \ > -Dbsymbolic_functions=true \ > -Ddtrace=false \ > - -Dfam=false \ > -Dforce_posix_threads=true \ > -Dglib_assert=true \ > -Dglib_checks=true \