From eff2a561396867717e49b0f16fd7ee7160455ed8 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Fri, 26 Jul 2024 17:45:24 +0000 Subject: Adding metadata --- ...tringtemplate-4.3.4-Java21+-TestRenderers.patch | 41 ++++++++++++++++++++++ ...stringtemplate-4.3.4-Java21-TestRenderers.patch | 41 ---------------------- .../stringtemplate/stringtemplate-4.3.4.ebuild | 9 +++-- 3 files changed, 45 insertions(+), 46 deletions(-) create mode 100644 dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch delete mode 100644 dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch (limited to 'dev-java/stringtemplate') diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch new file mode 100644 index 000000000000..22b271671b8d --- /dev/null +++ b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21+-TestRenderers.patch @@ -0,0 +1,41 @@ +there are different space characters used in java 21 (narrow space) + +--- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java ++++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java +@@ -77,6 +77,8 @@ public class TestRenderers extends BaseTest { + String expecting = "datetime: 7/5/05, 12:00 AM"; + if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { + expecting = "datetime: 7/5/05 12:00 AM"; ++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { ++ expecting = "datetime: 7/5/05, 12:00 AM"; + } + String result = st.render(); + assertEquals(expecting, result); +@@ -106,6 +108,8 @@ public class TestRenderers extends BaseTest { + String expecting = " datetime: 7/5/05, 12:00 AM "; + if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { + expecting = " datetime: 7/5/05 12:00 AM "; ++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { ++ expecting = " datetime: 7/5/05, 12:00 AM "; + } + String result = st.render(); + assertEquals(expecting, result); +@@ -126,6 +130,8 @@ public class TestRenderers extends BaseTest { + String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time "; + if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { + expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT "; ++ } else if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { ++ expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time "; + } + String result = st.render(); + assertEquals(expecting, result); +@@ -160,6 +166,9 @@ public class TestRenderers extends BaseTest { + ST st = group.getInstanceOf("dateThing"); + st.add("created", new GregorianCalendar(2005, 7 - 1, 5)); + String expecting = " time: 12:00:00 AM "; ++ if ( Integer.valueOf(javaVersion.replaceAll("^(\\d+).*", "$1")) >= 21 ) { ++ expecting = " time: 12:00:00 AM "; ++ } + String result = st.render(); + assertEquals(expecting, result); + } diff --git a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch b/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch deleted file mode 100644 index 127f5e0a4b61..000000000000 --- a/dev-java/stringtemplate/files/stringtemplate-4.3.4-Java21-TestRenderers.patch +++ /dev/null @@ -1,41 +0,0 @@ -there are different space characters used in java 21 (narrow space) - ---- a/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java -+++ b/stringtemplate4-ST4-4.3.4/test/org/stringtemplate/v4/test/TestRenderers.java -@@ -77,6 +77,8 @@ public class TestRenderers extends BaseTest { - String expecting = "datetime: 7/5/05, 12:00 AM"; - if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { - expecting = "datetime: 7/5/05 12:00 AM"; -+ } else if ( javaVersion.startsWith("21") ) { -+ expecting = "datetime: 7/5/05, 12:00 AM"; - } - String result = st.render(); - assertEquals(expecting, result); -@@ -106,6 +108,8 @@ public class TestRenderers extends BaseTest { - String expecting = " datetime: 7/5/05, 12:00 AM "; - if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { - expecting = " datetime: 7/5/05 12:00 AM "; -+ } else if ( javaVersion.startsWith("21") ) { -+ expecting = " datetime: 7/5/05, 12:00 AM "; - } - String result = st.render(); - assertEquals(expecting, result); -@@ -126,6 +130,8 @@ public class TestRenderers extends BaseTest { - String expecting = " datetime: Tuesday, July 5, 2005 at 12:00:00 AM Pacific Daylight Time "; - if ( javaVersion.startsWith("1.6") || javaVersion.startsWith("1.7") || javaVersion.startsWith("1.8") ) { - expecting = " datetime: Tuesday, July 5, 2005 12:00:00 AM PDT "; -+ } else if ( javaVersion.startsWith("21") ) { -+ expecting = " datetime: Tuesday, July 5, 2005, 12:00:00 AM Pacific Daylight Time "; - } - String result = st.render(); - assertEquals(expecting, result); -@@ -160,6 +166,9 @@ public class TestRenderers extends BaseTest { - ST st = group.getInstanceOf("dateThing"); - st.add("created", new GregorianCalendar(2005, 7 - 1, 5)); - String expecting = " time: 12:00:00 AM "; -+ if ( javaVersion.startsWith("21") ) { -+ expecting = " time: 12:00:00 AM "; -+ } - String result = st.render(); - assertEquals(expecting, result); - } diff --git a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild index dd01fef37fd3..0ed931834169 100644 --- a/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild +++ b/dev-java/stringtemplate/stringtemplate-4.3.4.ebuild @@ -53,7 +53,10 @@ JAVA_TEST_SRC_DIR="${TARBALL_S}/test" JAVA_TEST_RESOURCE_DIRS=( "${TARBALL_S}/test/resources" ) DOCS=( "${TARBALL_S}/"{CHANGES.txt,README.md} ) -PATCHES=( "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" ) +PATCHES=( + "${FILESDIR}/stringtemplate-4.3.4-BaseTest-javac-source-target.patch" + "${FILESDIR}/stringtemplate-4.3.4-Java21+-TestRenderers.patch" +) src_prepare() { default #780585 @@ -65,10 +68,6 @@ src_prepare() { } src_test() { - local vm_version="$(java-config -g PROVIDES_VERSION)" - if ver_test "${vm_version}" -ge 21; then - eapply "${FILESDIR}/stringtemplate-4.3.4-Java21-TestRenderers.patch" - fi # Make sure no older versions of this slot are present in the classpath # https://bugs.gentoo.org/834138#c4 local old_ver_cp="$(nonfatal java-pkg_getjars "${PN}-${SLOT}")" -- cgit v1.3.1