Date: Tue, 17 Jan 2023 23:10:20 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 7cc42f431e10 - 2023Q1 - x11/cde*: Remove call to tzsetall() Message-ID: <202301172310.30HNAKfF061692@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q1 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7cc42f431e1072b2976e3d3c3ca0f0970c9ab83b commit 7cc42f431e1072b2976e3d3c3ca0f0970c9ab83b Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2023-01-16 18:57:19 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2023-01-17 23:09:59 +0000 x11/cde*: Remove call to tzsetall() As of src d5c85ac6526d, the tzcode update removed the tzsetwall() function. Our tzcode upstream removed tzsetwall() in their commit d36f8f5b6983. The reason they did this was that tzsetwall() was "undocumented and ineffective." MFH: 2023Q1 (cherry picked from commit 30387c1f04de9965f4fa56b4f95a6676477ebe72) --- x11/cde-24/Makefile | 1 + x11/cde-24/files/patch-programs_dtcm_libDtCmP_timeops.c | 11 +++++++++++ x11/cde-25/Makefile | 2 +- x11/cde-25/files/patch-programs_dtcm_libDtCmP_timeops.c | 11 +++++++++++ x11/cde-devel/Makefile | 2 +- x11/cde-devel/files/patch-programs_dtcm_libDtCmP_timeops.c | 11 +++++++++++ 6 files changed, 36 insertions(+), 2 deletions(-) diff --git a/x11/cde-24/Makefile b/x11/cde-24/Makefile index 13b965fcba40..b721c769f828 100644 --- a/x11/cde-24/Makefile +++ b/x11/cde-24/Makefile @@ -1,5 +1,6 @@ PORTNAME= cde DISTVERSION= 2.4.0 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF/cdesktopenv/src/ .if !defined(MASTERDIR) diff --git a/x11/cde-24/files/patch-programs_dtcm_libDtCmP_timeops.c b/x11/cde-24/files/patch-programs_dtcm_libDtCmP_timeops.c new file mode 100644 index 000000000000..ee691a8d5b18 --- /dev/null +++ b/x11/cde-24/files/patch-programs_dtcm_libDtCmP_timeops.c @@ -0,0 +1,11 @@ +--- programs/dtcm/libDtCmP/timeops.c.orig 2023-01-16 10:43:01.353775000 -0800 ++++ programs/dtcm/libDtCmP/timeops.c 2023-01-16 10:50:35.918370000 -0800 +@@ -960,7 +960,7 @@ + */ + if (tzname==NULL) system("unset TZ\n"); + #else +- if (tzname==NULL) tzsetwall(); ++ if (tzname==NULL) tzset(); + #endif /* SVR4 */ + + else { diff --git a/x11/cde-25/Makefile b/x11/cde-25/Makefile index 73067122110c..a0100ca8ea14 100644 --- a/x11/cde-25/Makefile +++ b/x11/cde-25/Makefile @@ -1,6 +1,6 @@ PORTNAME= cde DISTVERSION= 2.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= SF/cdesktopenv/src/ .if !defined(MASTERDIR) diff --git a/x11/cde-25/files/patch-programs_dtcm_libDtCmP_timeops.c b/x11/cde-25/files/patch-programs_dtcm_libDtCmP_timeops.c new file mode 100644 index 000000000000..efb412aa000f --- /dev/null +++ b/x11/cde-25/files/patch-programs_dtcm_libDtCmP_timeops.c @@ -0,0 +1,11 @@ +--- programs/dtcm/libDtCmP/timeops.c.orig 2023-01-16 09:58:33.955866000 -0800 ++++ programs/dtcm/libDtCmP/timeops.c 2023-01-16 10:47:36.739851000 -0800 +@@ -963,7 +963,7 @@ + */ + if (tzname==NULL) system("unset TZ\n"); + #else +- if (tzname==NULL) tzsetwall(); ++ if (tzname==NULL) tzset(); + #endif /* SVR4 */ + + else { diff --git a/x11/cde-devel/Makefile b/x11/cde-devel/Makefile index 2774b00592d3..1757e62e1a49 100644 --- a/x11/cde-devel/Makefile +++ b/x11/cde-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= cde PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 .if !defined(MASTERDIR) PKGNAMESUFFIX= -devel diff --git a/x11/cde-devel/files/patch-programs_dtcm_libDtCmP_timeops.c b/x11/cde-devel/files/patch-programs_dtcm_libDtCmP_timeops.c new file mode 100644 index 000000000000..3723b2e4d24d --- /dev/null +++ b/x11/cde-devel/files/patch-programs_dtcm_libDtCmP_timeops.c @@ -0,0 +1,11 @@ +--- programs/dtcm/libDtCmP/timeops.c.orig 2023-01-16 09:59:52.166236000 -0800 ++++ programs/dtcm/libDtCmP/timeops.c 2023-01-16 10:43:55.531953000 -0800 +@@ -963,7 +963,7 @@ + */ + if (tzname==NULL) system("unset TZ\n"); + #else +- if (tzname==NULL) tzsetwall(); ++ if (tzname==NULL) tzset(); + #endif /* SVR4 */ + + else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202301172310.30HNAKfF061692>