Update tycho to version 1.6.0 / rev 12 via SR 1110990

https://build.opensuse.org/request/show/1110990 by user fstrba + anag+factory more reproducibility stuff
bmwiedemann · Sep 14, 2023 · ce24ff2 · ce24ff2
1 parent 53524f5
commit ce24ff2
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 0 deletions.
diff --git a/packages/t/tycho/.files b/packages/t/tycho/.files
diff --git a/packages/t/tycho/.rev b/packages/t/tycho/.rev
@@ -87,4 +87,12 @@
     <comment>Reproducible builds improvement</comment>
     <requestid>1110002</requestid>
   </revision>
+  <revision rev="12" vrev="9">
+    <srcmd5>28de8df133c946aab9d33cc8b56fa1ed</srcmd5>
+    <version>1.6.0</version>
+    <time>1694701537</time>
+    <user>anag+factory</user>
+    <comment>more reproducibility stuff</comment>
+    <requestid>1110990</requestid>
+  </revision>
 </revisionlist>
diff --git a/packages/t/tycho/tycho-getTimestamp.patch b/packages/t/tycho/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/packages/t/tycho/tycho-plexus-compiler-2.13.patch b/packages/t/tycho/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<Map.Entry<String, String>> argEntries,
+
+     }
+
++    public String getCompilerId() {
++        return "tycho-jdt";
++    }
++
+ }
diff --git a/packages/t/tycho/tycho.changes b/packages/t/tycho/tycho.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Sep 14 04:19:53 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * tycho-getTimestamp.patch
+    + use SOURCE_DATE_EPOCH for timestamp generated by tycho
+
+-------------------------------------------------------------------
+Wed Sep 13 18:53:55 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * tycho-plexus-compiler-2.13.patch
+    + fix build against newer plexus-compiler
+
 -------------------------------------------------------------------
 Sat Sep  9 14:56:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
 

diff --git a/packages/t/tycho/tycho.spec b/packages/t/tycho/tycho.spec
@@ -65,7 +65,9 @@ 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
+Patch11:        tycho-getTimestamp.patch
 Patch100:       fedoraproject-p2-bootstrap-fix.patch
 BuildRequires:  bash
 BuildRequires:  fdupes
@@ -211,7 +213,9 @@ mv fedoraproject-p2-%{fp_p2_git_tag} fedoraproject-p2
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 %patch10 -p1
+%patch11 -p1
 %patch100
 
 # Unneeded for RPM builds