git: e4a8e4ec8963 - main - devel/glib20: revert update to 2.68.2

[Dima Panov]

The branch main has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e4a8e4ec896337d75f78d8bb913e316b378aa37e

commit e4a8e4ec896337d75f78d8bb913e316b378aa37e
Author:     Dima Panov <fluffy at FreeBSD.org>
AuthorDate: 2021-05-27 10:16:45 +0000
Commit:     Dima Panov <fluffy at FreeBSD.org>
CommitDate: 2021-05-27 10:27:28 +0000

    devel/glib20: revert update to 2.68.2
    
    This reverts commit 507359c509389602b4060b2c5e203c99911c3578.
    
    devel/glib20 was touched without desktop@ approval and properly passed exp-run which caused
    a massive build failures for critical parts of portstree such as *webkit*, grstreamer* and
    many others due to incompatible changes in the new glib API.
    
    Revert, bump PORTEPOCH and freeze at 2.66.* branch till all consumers will be adopted to new API.
    
    With hat:       ports-secteam, desktop
    Pointy hat to:  nc@
---
 devel/glib20/Makefile                           |  7 ++++---
 devel/glib20/distinfo                           |  6 +++---
 devel/glib20/files/patch-glib_meson.build       | 10 +++++-----
 devel/glib20/files/patch-glib_tests_gdatetime.c | 20 ++++++++++----------
 devel/glib20/pkg-plist                          |  1 -
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index cdea3554f3a1..918d9d6d2061 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,8 +1,9 @@
 # Created by: Vanilla I. Shu <vanilla at FreeBSD.org>
 
 PORTNAME=	glib
-DISTVERSION=	2.68.2
-PORTEPOCH=	1
+DISTVERSION=	2.66.7
+PORTREVISION=	0
+PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -31,7 +32,7 @@ MESON_ARGS=	-Db_lundef=false \
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 PORTSCOUT=	limitw:1,even
 
-_LIBVERSION=	0.6800.2
+_LIBVERSION=	0.6600.7
 PLIST_SUB=	LIBVERSION=${_LIBVERSION}
 
 OPTIONS_DEFINE=	DEBUG FAM_ALTBACKEND MANPAGES NLS
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 2aa909ffa58a..5363bd9180e3 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1622082621
-SHA256 (gnome/glib-2.68.2.tar.xz) = ecc7798a9cc034eabdfd7f246e6dd461cdbf1175fcc2e9867cc7da7b7309e0fb
-SIZE (gnome/glib-2.68.2.tar.xz) = 4944192
+TIMESTAMP = 1613215761
+SHA256 (gnome/glib-2.66.7.tar.xz) = 09f158769f6f26b31074e15b1ac80ec39b13b53102dfae66cfe826fb2cc65502
+SIZE (gnome/glib-2.66.7.tar.xz) = 4844892
diff --git a/devel/glib20/files/patch-glib_meson.build b/devel/glib20/files/patch-glib_meson.build
index 6be437f22882..e42c509110d2 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-05-26 19:31:21.839171000 -0700
-+++ glib/meson.build	2021-05-26 19:31:36.723873000 -0700
-@@ -377,7 +377,7 @@
+--- glib/meson.build.orig	2021-02-18 15:31:48.638470000 -0800
++++ glib/meson.build	2021-02-18 15:32:08.983695000 -0800
+@@ -376,7 +376,7 @@
    # 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_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + gnulib_libm_dependency + [libsysprof_capture_dep],
++  dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + gnulib_libm_dependency + [libsysprof_capture_dep] + libutil,
    c_args : glib_c_args,
    objc_args : glib_c_args,
  )
diff --git a/devel/glib20/files/patch-glib_tests_gdatetime.c b/devel/glib20/files/patch-glib_tests_gdatetime.c
index c02b8ea5c481..3904e106a0ca 100644
--- a/devel/glib20/files/patch-glib_tests_gdatetime.c
+++ b/devel/glib20/files/patch-glib_tests_gdatetime.c
@@ -1,20 +1,20 @@
---- glib/tests/gdatetime.c.orig	2021-05-26 19:32:37.257501000 -0700
-+++ glib/tests/gdatetime.c	2021-05-26 19:32:53.078466000 -0700
-@@ -2377,7 +2377,7 @@
+--- glib/tests/gdatetime.c.orig	2014-03-09 10:29:13.925231275 +0000
++++ glib/tests/gdatetime.c	2014-03-09 10:30:18.235227107 +0000
+@@ -1322,7 +1322,7 @@
    gint i1, i2;
  
  #ifdef G_OS_UNIX
--  tz = g_time_zone_new_identifier ("America/Toronto");
-+  tz = g_time_zone_new_identifier ("America/Toronto Eastern");
+-  tz = g_time_zone_new ("America/Toronto");
++  tz = g_time_zone_new ("America/Toronto Eastern");
  #elif defined G_OS_WIN32
-   tz = g_time_zone_new_identifier ("Eastern Standard Time");
+   tz = g_time_zone_new ("Eastern Standard Time");
  #endif
-@@ -2411,7 +2411,7 @@
+@@ -1355,7 +1355,7 @@
    gint i1, i2;
  
  #ifdef G_OS_UNIX
--  tz = g_time_zone_new_identifier ("America/Toronto");
-+  tz = g_time_zone_new_identifier ("America/Toronto Eastern");
+-  tz = g_time_zone_new ("America/Toronto");
++  tz = g_time_zone_new ("America/Toronto Eastern");
  #elif defined G_OS_WIN32
-   tz = g_time_zone_new_identifier ("Eastern Standard Time");
+   tz = g_time_zone_new ("Eastern Standard Time");
  #endif
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index a292150ea817..275cfdac0119 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -242,7 +242,6 @@ include/glib-2.0/glib/gstdio.h
 include/glib-2.0/glib/gstrfuncs.h
 include/glib-2.0/glib/gstring.h
 include/glib-2.0/glib/gstringchunk.h
-include/glib-2.0/glib/gstrvbuilder.h
 include/glib-2.0/glib/gtestutils.h
 include/glib-2.0/glib/gthread.h
 include/glib-2.0/glib/gthreadpool.h