[FIXUP] More on fixing the build

Author: HannesWell

binaries/org.eclipse.swt.cocoa.macosx.aarch64/META-INF/MANIFEST.MF

@@ -28,4 +28,3 @@ SWT-WS: cocoa
 SWT-OS: macosx
 SWT-Arch: aarch64
 Automatic-Module-Name: org.eclipse.swt.cocoa.macosx.aarch64
-Provide-Capability: eclipse.swt.native;eclipse.swt.native=native

binaries/org.eclipse.swt.cocoa.macosx.x86_64/META-INF/MANIFEST.MF

@@ -28,4 +28,3 @@ SWT-WS: cocoa
 SWT-OS: macosx
 SWT-Arch: x86_64
 Automatic-Module-Name: org.eclipse.swt.cocoa.macosx.x86_64
-Provide-Capability: eclipse.swt.native;eclipse.swt.native=native

binaries/org.eclipse.swt.gtk.linux.x86_64/META-INF/MANIFEST.MF

@@ -33,4 +33,3 @@ SWT-WS: gtk
 SWT-OS: linux
 SWT-Arch: x86_64
 Automatic-Module-Name: org.eclipse.swt.gtk.linux.x86_64
-Provide-Capability: eclipse.swt.native;eclipse.swt.native=native

binaries/org.eclipse.swt.win32.win32.aarch64/META-INF/MANIFEST.MF

@@ -32,4 +32,3 @@ SWT-WS: win32
 SWT-OS: win32
 SWT-Arch: aarch64
 Automatic-Module-Name: org.eclipse.swt.win32.win32.aarch64
-Provide-Capability: eclipse.swt.native;eclipse.swt.native=native

binaries/org.eclipse.swt.win32.win32.x86_64/META-INF/MANIFEST.MF

@@ -32,4 +32,3 @@ SWT-WS: win32
 SWT-OS: win32
 SWT-Arch: x86_64
 Automatic-Module-Name: org.eclipse.swt.win32.win32.x86_64
-Provide-Capability: eclipse.swt.native;eclipse.swt.native=native

bundles/org.eclipse.swt.svg/.classpath

@@ -3,14 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.win32.win32.x86_64"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.win32.win32.aarch64"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.gtk.linux.x86_64"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.gtk.linux.riscv64"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.gtk.linux.ppc64le"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.gtk.linux.loongarch64"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.gtk.linux.aarch64"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.cocoa.macosx.x86_64"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.swt.cocoa.macosx.aarch64"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

bundles/org.eclipse.swt.svg/META-INF/MANIFEST.MF

@@ -8,7 +8,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
 Fragment-Host: org.eclipse.swt
 Import-Package: com.github.weisj.jsvg;version="[1.7.0,2.0.0)",
  com.github.weisj.jsvg.geometry.size;version="[1.7.0,2.0.0)",
- com.github.weisj.jsvg.parser;version="[1.7.0,2.0.0)",
- org.eclipse.swt.internal.image
+ com.github.weisj.jsvg.parser;version="[1.7.0,2.0.0)"
 Export-Package: org.eclipse.swt.svg
-Require-Capability: eclipse.swt.native;filter:="(eclipse.swt.native=native)"

bundles/org.eclipse.swt.svg/build.properties

@@ -3,3 +3,11 @@ output.. = bin/
 bin.includes = META-INF/,\
                .
 tycho.pomless.parent = ../../local-build/local-build-parent
+jars.extra.classpath = platform:/plugin/org.eclipse.swt.cocoa.macosx.aarch64,\
+                       platform:/plugin/org.eclipse.swt.cocoa.macosx.x86_64,\
+                       platform:/plugin/org.eclipse.swt.gtk.linux.aarch64,\
+                       platform:/plugin/org.eclipse.swt.gtk.linux.ppc64le,\
+                       platform:/plugin/org.eclipse.swt.gtk.linux.riscv64,\
+                       platform:/plugin/org.eclipse.swt.gtk.linux.x86_64,\
+                       platform:/plugin/org.eclipse.swt.win32.win32.aarch64,\
+                       platform:/plugin/org.eclipse.swt.win32.win32.x86_64

bundles/org.eclipse.swt/META-INF/MANIFEST.MF

@@ -15,6 +15,8 @@ Export-Package:
  org.eclipse.swt.dnd,
  org.eclipse.swt.events,
  org.eclipse.swt.graphics,
+ org.eclipse.swt.internal;x-internal:=true,
+ org.eclipse.swt.internal.image;x-internal:=true,
  org.eclipse.swt.layout,
  org.eclipse.swt.opengl,
  org.eclipse.swt.printing,

pom.xml

@@ -28,7 +28,7 @@
 
   <properties>
     <tycho.scmUrl>scm:git:https://github.com/eclipse-platform/eclipse.platform.swt.git</tycho.scmUrl>
-    <tycho.version>4.0.12-SNAPSHOT</tycho.version>
+    <tycho.version>4.0.13-SNAPSHOT</tycho.version>
     <os-jvm-flags></os-jvm-flags>
 
     <!-- for sonarcloud: -->