commit: a571f4e56872dbb7d0c85e45c6e8b3abe64af5a7 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 20 12:00:06 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 20 13:24:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a571f4e5
kde-frameworks/kholidays: UK holiday change 2022 (Spring bank holiday) Upstream commit f46efdf93ebf02b5e7ac0ac0b11aefbd42ec71b2 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=448305 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...lidays-5.90.0-UK-2022-spring-bank-holiday.patch | 75 ++++++++++++++++++++++ .../kholidays/kholidays-5.90.0-r1.ebuild | 31 +++++++++ 2 files changed, 106 insertions(+) diff --git a/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch b/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch new file mode 100644 index 000000000000..15d630269b40 --- /dev/null +++ b/kde-frameworks/kholidays/files/kholidays-5.90.0-UK-2022-spring-bank-holiday.patch @@ -0,0 +1,75 @@ +From f46efdf93ebf02b5e7ac0ac0b11aefbd42ec71b2 Mon Sep 17 00:00:00 2001 +From: Allen Winter <[email protected]> +Date: Sat, 15 Jan 2022 09:54:39 -0500 +Subject: [PATCH] UK holiday change 2022 (Spring bank holiday) + +applied to all 3 legal regions + +BUG: 448305 +FIXED-IN: 5.91 +--- + holidays/plan2/holiday_gb-eaw_en-gb | 5 ++++- + holidays/plan2/holiday_gb-nir_en-gb | 5 ++++- + holidays/plan2/holiday_gb-sct_en-gb | 5 ++++- + 3 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/holidays/plan2/holiday_gb-eaw_en-gb b/holidays/plan2/holiday_gb-eaw_en-gb +index 64bdee7..4235247 100644 +--- a/holidays/plan2/holiday_gb-eaw_en-gb ++++ b/holidays/plan2/holiday_gb-eaw_en-gb +@@ -27,8 +27,11 @@ description "National holiday file for England and Wales" + "Easter Monday" public on easter plus 1 + "Royal Wedding" public on 29.4.2011 + "Early May Bank Holiday" public on ((year == 2020) ? [may 8] : [first monday in may]) +-"Spring Bank Holiday" public on ((year == 2012) ? [june 4] : [last monday in may]) ++"Spring Bank Holiday" public on ((year == 2012) ? [june 4] : ++ ((year == 2022) ? [june 2] : ++ [last monday in may])) + "Diamond Jubilee Holiday" public on 5.6.2012 ++"Platinum Jubilee Holiday" public on 3.6.2022 + "Summer Bank Holiday" public on last monday in august + "Christmas Day" public religious on december 25 + "Christmas Day Bank Holiday" public on ( (([december 25] == [saturday after ([december 25])]) || ([december 25] == [sunday after ([december 25])])) ? +diff --git a/holidays/plan2/holiday_gb-nir_en-gb b/holidays/plan2/holiday_gb-nir_en-gb +index 677f290..85c2de6 100644 +--- a/holidays/plan2/holiday_gb-nir_en-gb ++++ b/holidays/plan2/holiday_gb-nir_en-gb +@@ -33,8 +33,11 @@ description "National holiday file for Northern Ireland" + "Easter Monday" public on easter plus 1 + "Royal Wedding" public on 29.4.2011 + "Early May Bank Holiday" public on ((year == 2020) ? [may 8] : [first monday in may]) +-"Spring Bank Holiday" public on ((year == 2012) ? [june 4] : [last monday in may]) ++"Spring Bank Holiday" public on ((year == 2012) ? [june 4] : ++ ((year == 2022) ? [june 2] : ++ [last monday in may])) + "Diamond Jubilee Holiday" public on 5.6.2012 ++"Platinum Jubilee Holiday" public on 3.6.2022 + "Battle of the Boyne (Orangemen's Day)" public on july 12 + "Battle of the Boyne Bank Holiday" public on ( (([july 12] == [saturday after ([july 12])]) || + ([july 12] == [sunday after ([july 12])])) ? +diff --git a/holidays/plan2/holiday_gb-sct_en-gb b/holidays/plan2/holiday_gb-sct_en-gb +index 57d90d6..938d639 100644 +--- a/holidays/plan2/holiday_gb-sct_en-gb ++++ b/holidays/plan2/holiday_gb-sct_en-gb +@@ -43,6 +43,7 @@ description "National holiday file for Scotland" + "Royal Wedding" public on 29.4.2011 + "Early May Bank Holiday" public on ((year == 2020) ? [may 8] : [first monday in may]) + "Diamond Jubilee Holiday" public on 5.6.2012 ++"Platinum Jubilee Holiday" public on 3.6.2022 + "Christmas Day" public religious on december 25 + "Christmas Day Substitute Holiday" public on ( (([december 25] == [saturday after ([december 25])]) || + ([december 25] == [sunday after ([december 25])])) ? +@@ -60,7 +61,9 @@ description "National holiday file for Scotland" + + :: Financial + "Good Friday Bank Holiday" religious on easter minus 2 +-"Spring Bank Holiday" civil on ((year == 2012) ? [june 4] : [last monday in may]) ++"Spring Bank Holiday" civil on ((year == 2012) ? [june 4] : ++ ((year == 2022) ? [june 2] : ++ [last monday in may])) + "Summer Bank Holiday" civil on first monday in august + "St Andrew's Day Bank Holiday" civil on ( (([november 30] == [saturday after ([november 30])]) || + ([november 30] == [sunday after ([november 30])])) ? +-- +GitLab + diff --git a/kde-frameworks/kholidays/kholidays-5.90.0-r1.ebuild b/kde-frameworks/kholidays/kholidays-5.90.0-r1.ebuild new file mode 100644 index 000000000000..b18414e9a211 --- /dev/null +++ b/kde-frameworks/kholidays/kholidays-5.90.0-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="false" +ECM_TEST="true" +QTMIN=5.15.2 +inherit ecm kde.org + +DESCRIPTION="Library to determine holidays and other special events for a geographical region" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +IUSE="nls" + +BDEPEND=" + nls? ( >=dev-qt/linguist-tools-${QTMIN}:5 ) +" +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-UK-2022-spring-bank-holiday.patch" ) + +src_test() { + # bug 624214 + mkdir -p "${HOME}/.local/share/kf5/libkholidays" || die + cp -r "${S}/holidays/plan2" "${HOME}/.local/share/kf5/libkholidays/" || die + ecm_src_test +}
