From 172f6b295660ef83fe6b710d046034843fba4b3e62095c0cf6378293c90ee86e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 13 Sep 2023 18:54:34 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=40 --- tycho-plexus-compiler-2.13.patch | 11 +++++++++++ tycho.changes | 7 +++++++ tycho.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 tycho-plexus-compiler-2.13.patch diff --git a/tycho-plexus-compiler-2.13.patch b/tycho-plexus-compiler-2.13.patch new file mode 100644 index 0000000..0df429a --- /dev/null +++ b/tycho-plexus-compiler-2.13.patch @@ -0,0 +1,11 @@ +--- a/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java ++++ b/tycho-compiler-jdt/src/main/java/org/eclipse/tycho/compiler/jdt/JDTCompiler.java +@@ -617,4 +617,8 @@ private void checkCompilerArgs(Collection> argEntries, + + } + ++ public String getCompilerId() { ++ return "tycho-jdt"; ++ } ++ + } diff --git a/tycho.changes b/tycho.changes index 3ddaf7a..b15cffb 100644 --- a/tycho.changes +++ b/tycho.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Sep 13 18:53:55 UTC 2023 - Fridrich Strba + +- Added patch: + * tycho-plexus-compiler-2.13.patch + + fix build against newer plexus-compiler + ------------------------------------------------------------------- Sat Sep 9 14:56:31 UTC 2023 - Fridrich Strba diff --git a/tycho.spec b/tycho.spec index c522a9a..d8c8d12 100644 --- a/tycho.spec +++ b/tycho.spec @@ -65,6 +65,7 @@ Patch5: 0006-Mockito-does-not-have-test-scope.patch Patch6: 0007-Fix-dependency-problems-when-bootstrapping-with-extr.patch Patch7: 0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch Patch8: plexus-lookup-fix.patch +Patch9: tycho-plexus-compiler-2.13.patch Patch10: tycho-sourcetarget.patch Patch100: fedoraproject-p2-bootstrap-fix.patch BuildRequires: bash @@ -211,6 +212,7 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2 %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 %patch10 -p1 %patch100 From fd90d39f1c022f0c1f6f1ed02ebc21d67949efa66f7213e957a651e911a8f20a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2023 04:19:46 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=41 --- tycho-getTimestamp.patch | 13 +++++++++++++ tycho.spec | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 tycho-getTimestamp.patch diff --git a/tycho-getTimestamp.patch b/tycho-getTimestamp.patch new file mode 100644 index 0000000..42283dd --- /dev/null +++ b/tycho-getTimestamp.patch @@ -0,0 +1,13 @@ +diff -urEbwB org.eclipse.tycho-tycho-1.6.0.orig/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/DefaultBuildTimestampProvider.java org.eclipse.tycho-tycho-1.6.0/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/DefaultBuildTimestampProvider.java +--- org.eclipse.tycho-tycho-1.6.0.orig/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/DefaultBuildTimestampProvider.java 2023-09-05 17:53:07.666513409 +0200 ++++ org.eclipse.tycho-tycho-1.6.0/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/buildversion/DefaultBuildTimestampProvider.java 2023-09-14 06:14:27.034252611 +0200 +@@ -28,6 +28,9 @@ + + @Override + public Date getTimestamp(MavenSession session, MavenProject project, MojoExecution execution) { ++ if (System.getenv("SOURCE_DATE_EPOCH") != null) { ++ return new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")))); ++ } + return session.getStartTime(); + } + } diff --git a/tycho.spec b/tycho.spec index d8c8d12..b2f26cd 100644 --- a/tycho.spec +++ b/tycho.spec @@ -67,6 +67,7 @@ Patch7: 0008-Use-custom-resolver-for-tycho-eclipserun-plugin.patch Patch8: plexus-lookup-fix.patch Patch9: tycho-plexus-compiler-2.13.patch Patch10: tycho-sourcetarget.patch +Patch11: tycho-getTimestamp.patch Patch100: fedoraproject-p2-bootstrap-fix.patch BuildRequires: bash BuildRequires: fdupes @@ -214,6 +215,7 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2 %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch100 # Unneeded for RPM builds From bcb4e32499826001aa9e8d9ee24f9e95571ed50b8c6ba7e6554169cd880775dc Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2023 04:23:46 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=42 --- tycho.changes | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tycho.changes b/tycho.changes index b15cffb..31267e3 100644 --- a/tycho.changes +++ b/tycho.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 14 04:19:53 UTC 2023 - Fridrich Strba + +- Added patch: + * tycho-getTimestamp.patch + + use SOURCE_DATE_EPOCH for timestamp generated by tycho + ------------------------------------------------------------------- Wed Sep 13 18:53:55 UTC 2023 - Fridrich Strba From 6d072e9215ac2cf09b43f987e94055a95d18c6de4db2c08389570e6f8c703bfd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2023 04:25:26 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Java:packages/tycho?expand=0&rev=43 --- tycho-getTimestamp.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tycho-getTimestamp.patch b/tycho-getTimestamp.patch index 42283dd..4bf8a85 100644 --- a/tycho-getTimestamp.patch +++ b/tycho-getTimestamp.patch @@ -6,7 +6,7 @@ diff -urEbwB org.eclipse.tycho-tycho-1.6.0.orig/tycho-packaging-plugin/src/main/ @Override public Date getTimestamp(MavenSession session, MavenProject project, MojoExecution execution) { + if (System.getenv("SOURCE_DATE_EPOCH") != null) { -+ return new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")))); ++ return new Date(1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH"))); + } return session.getStartTime(); }