1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
Description: Updates o.e.osgi.util's build properties so it builds from source.
Author: Niels Thykier <niels@thykier.net>
Bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=305244
Applied-Upstream: no
--- /dev/null
+++ b/patches/osgi-util.patch
@@ -0,0 +1,20 @@
+diff --git a/eclipse/plugins/org.eclipse.osgi.util/build.properties b/eclipse/plugins/org.eclipse.osgi.util/build.properties
+index 2a015f5..270afcd 100644
+--- a/plugins/org.eclipse.osgi.util/build.properties
++++ b/plugins/org.eclipse.osgi.util/build.properties
+@@ -12,10 +12,10 @@ bin.includes = plugin.properties,\
+ org/,\
+ about.html,\
+ META-INF/,\
++ about_files/,\
++ .
++src.includes = about.html,\
+ about_files/
+-src.includes = src.zip,\
+- about.html,\
+- about_files/
+-source.. = .
++source.. = src/
+ output.. = .
+-customBuildCallbacks=customBuildCallbacks.xml
++#customBuildCallbacks=customBuildCallbacks.xml
--- a/build.xml
+++ b/build.xml
@@ -257,6 +257,7 @@
<patch patchfile="${basedir}/patches/eclipse-use-newer-commons-codec.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/addEcfQualifiers.patch" dir="${buildDirectory}" strip="0" />
<patch patchfile="${basedir}/patches/droppluginversions.patch" dir="${buildDirectory}" strip="0" />
+ <patch patchfile="${basedir}/patches/osgi-util.patch" dir="${buildDirectory}" strip="1" />
<replace file="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build/build.properties" token="/usr/share/eclipse" value="/usr/${libDir}/eclipse" />
<chmod dir="${buildDirectory}/plugins/org.eclipse.pde.build/templates/package-build" includes="*.sh" perm="a+x" />
<!-- end eclipse-build-only patches -->
|
