Attachment 228008 Details for Bug 258598 – v1 (apply via "git am")

[patch] v1 (apply via "git am")

bug258598.diff (text/plain), 3.70 KB, created by Jan Beich on 2021-09-19 09:58:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2021-09-19 09:58:19 UTC

Size: 3.70 KB

patch

obsolete

>From bcca82fab77c40b09872890c2cb9490aa2b645ba Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Fri, 17 Sep 2021 10:17:56 +0000
>Subject: [PATCH] devel/glib20: update to 2.70.0
>
>Changes:	https://gitlab.gnome.org/GNOME/glib/-/blob/2.70.0/NEWS
>PR:		258598
>Approved by:	?
>---
> devel/glib20/Makefile                     |  4 ++--
> devel/glib20/distinfo                     |  6 +++---
> devel/glib20/files/patch-glib_meson.build | 10 +++++-----
> devel/glib20/pkg-plist                    |  2 ++
> 4 files changed, 12 insertions(+), 10 deletions(-)
>
>diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
>index f497fd1c9d2b..62d08626ae72 100644
>--- a/devel/glib20/Makefile
>+++ b/devel/glib20/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
> 
> PORTNAME=	glib
>-DISTVERSION=	2.68.4
>+DISTVERSION=	2.70.0
> PORTEPOCH=	2
> CATEGORIES=	devel
> MASTER_SITES=	GNOME
>@@ -33,7 +33,7 @@ BINARY_ALIAS=	python3=${PYTHON_CMD}
> PORTSCOUT=	limitw:1,even
> CPE_VENDOR=	gnome
> 
>-_LIBVERSION=	0.6800.4
>+_LIBVERSION=	0.7000.0
> PLIST_SUB=	LIBVERSION=${_LIBVERSION}
> 
> OPTIONS_DEFINE=	DEBUG FAM_ALTBACKEND MANPAGES NLS
>diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
>index 20f655e839fc..4b649f9977f0 100644
>--- a/devel/glib20/distinfo
>+++ b/devel/glib20/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1629386845
>-SHA256 (gnome/glib-2.68.4.tar.xz) = 62fd061d08a75492617e625a73e2c05e259f831acbb8e1f8b9c81f23f7993a3b
>-SIZE (gnome/glib-2.68.4.tar.xz) = 4945212
>+TIMESTAMP = 1631873876
>+SHA256 (gnome/glib-2.70.0.tar.xz) = 200d7df811c5ba634afbf109f14bb40ba7fde670e89389885da14e27c0840742
>+SIZE (gnome/glib-2.70.0.tar.xz) = 4796812
>diff --git a/devel/glib20/files/patch-glib_meson.build b/devel/glib20/files/patch-glib_meson.build
>index a8370e5de939..35d4a9fae9c3 100644
>--- a/devel/glib20/files/patch-glib_meson.build
>+++ b/devel/glib20/files/patch-glib_meson.build
>@@ -1,11 +1,11 @@
>---- glib/meson.build.orig	2021-06-10 11:57:57.246194400 -0700
>-+++ glib/meson.build	2021-07-17 12:05:52.342851000 -0700
>-@@ -377,7 +377,7 @@
>+--- glib/meson.build.orig	2021-09-17 10:17:56 UTC
>++++ glib/meson.build
>+@@ -367,7 +367,7 @@ libglib = library('glib-2.0',
>    # intl.lib is not compatible with SAFESEH
>    link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
>    include_directories : configinc,
>--  dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
>-+  dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + libutil,
>+-  dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
>++  dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep] + libutil,
>    c_args : glib_c_args,
>    objc_args : glib_c_args,
>  )
>diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
>index a292150ea817..ac0d084c45cc 100644
>--- a/devel/glib20/pkg-plist
>+++ b/devel/glib20/pkg-plist
>@@ -123,6 +123,7 @@ include/glib-2.0/gio/gpermission.h
> include/glib-2.0/gio/gpollableinputstream.h
> include/glib-2.0/gio/gpollableoutputstream.h
> include/glib-2.0/gio/gpollableutils.h
>+include/glib-2.0/gio/gpowerprofilemonitor.h
> include/glib-2.0/gio/gpropertyaction.h
> include/glib-2.0/gio/gproxy.h
> include/glib-2.0/gio/gproxyaddress.h
>@@ -211,6 +212,7 @@ include/glib-2.0/glib/gi18n.h
> include/glib-2.0/glib/giochannel.h
> include/glib-2.0/glib/gkeyfile.h
> include/glib-2.0/glib/glib-autocleanups.h
>+include/glib-2.0/glib/glib-typeof.h
> include/glib-2.0/glib/glist.h
> include/glib-2.0/glib/gmacros.h
> include/glib-2.0/glib/gmain.h

Actions: View | Diff

Attachments on bug 258598: 228008