The following commit has been merged in the master branch:
commit 0c33b0e9288abfc0cdcad52ea17dbbebd98fb102
Author: Jakub Adam <[email protected]>
Date: Sat Jan 14 23:53:37 2012 +0100
Use SWT from swt-gtk package instead of bundled version
diff --git a/debian/changelog b/debian/changelog
index dd57095..be00ba8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+eclipse (3.7.1-2) UNRELEASED; urgency=low
+
+ * Use SWT from swt-gtk package instead of the bundled version.
+
+ -- Jakub Adam <[email protected]> Sat, 14 Jan 2012 19:32:00 +0100
+
eclipse (3.7.1-1) unstable; urgency=low
* New upstream release (Closes: #652839).
diff --git a/debian/control b/debian/control
index 57d3ffd..b9bbe85 100644
--- a/debian/control
+++ b/debian/control
@@ -15,14 +15,10 @@ Build-Depends: ant (>= 1.8.2),
junit (>= 3.8.2-4),
junit4 (>= 4.7-3),
libasm3-java (>= 3.3),
- libatk1.0-dev,
- libcairo2-dev,
libcommons-codec-java (>= 1.4-2),
libcommons-el-java (>= 1.0-5),
libcommons-httpclient-java (>= 3.1-9),
libcommons-logging-java (>= 1.1.1-6),
- libgl1-mesa-dev | libgl-dev,
- libglu1-mesa-dev | libglu-dev,
libgnome-vfsmm-2.6-dev,
libgnomeui-dev,
libgtk2.0-dev,
@@ -33,11 +29,8 @@ Build-Depends: ant (>= 1.8.2),
libjsch-java (>= 0.1.37-3),
liblucene2-java (>= 2.9.4+ds1-3~),
liblucene2-java (<< 2.9.5),
- libpango1.0-dev,
libservlet2.5-java (>= 6.0.20-8),
- libwebkit-dev,
- libxt-dev,
- libxtst-dev,
+ libswt-gtk-3-java (>= 3.7.1-2),
lsb-release,
maven-ant-helper,
maven-repo-helper,
@@ -205,9 +198,14 @@ Architecture: any
Depends: default-jre | java5-runtime | java6-runtime,
libequinox-osgi-java (= ${source:Version}),
libicu4j-4.4-java (>= 4.4.2),
+ libswt-gtk-3-java (>= 3.7.1-2),
+ libswt-cairo-gtk-3-jni,
+ libswt-webkit-gtk-3-jni,
${misc:Depends},
${shlibs:Depends}
-Recommends: ${shlibs:Recommends}
+Recommends: libswt-glx-gtk-3-jni,
+ libswt-gnome-gtk-3-jni,
+ ${shlibs:Recommends}
Suggests: eclipse
Replaces: eclipse-rcp-gcj,
libswt-gtk-3.4-java,
diff --git a/debian/eclipse-build-additionalArchs.tar.bz2
b/debian/eclipse-build-additionalArchs.tar.bz2
index 553fd2c..77d7e87 100644
Binary files a/debian/eclipse-build-additionalArchs.tar.bz2 and
b/debian/eclipse-build-additionalArchs.tar.bz2 differ
diff --git a/debian/eclipse-rcp.install b/debian/eclipse-rcp.install
index d30e6d7..a1704df 100644
--- a/debian/eclipse-rcp.install
+++ b/debian/eclipse-rcp.install
@@ -1,6 +1,5 @@
eclipse/plugins/org.eclipse.swt/about_files/IJG_README
usr/lib/eclipse/about_files
usr/*/eclipse/features/org.eclipse.rcp_*
-usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/*/.cp/*.so
usr/lib/eclipse/configuration/org.eclipse.osgi/bundles/*/*/.cp/os/*/*/*.so
usr/lib/eclipse/plugins/com.ibm.icu_*.jar
usr/lib/eclipse/plugins/org.eclipse.core.commands_*.jar
@@ -25,7 +24,6 @@ usr/lib/eclipse/plugins/org.eclipse.equinox.util_*.jar
usr/lib/eclipse/plugins/org.eclipse.jface.databinding_*.jar
usr/lib/eclipse/plugins/org.eclipse.jface_*.jar
usr/lib/eclipse/plugins/org.eclipse.rcp_*.jar
-usr/lib/eclipse/plugins/org.eclipse.swt.gtk.linux.*.jar
usr/lib/eclipse/plugins/org.eclipse.swt_*.jar
usr/lib/eclipse/plugins/org.eclipse.ui.workbench_*.jar
usr/lib/eclipse/plugins/org.eclipse.ui_*.jar
diff --git a/debian/patches/debian-load-internal-swt.patch
b/debian/patches/debian-load-internal-swt.patch
deleted file mode 100644
index 9974417..0000000
--- a/debian/patches/debian-load-internal-swt.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Make eclipse load the internal SWT from a special location.
- This together with the removal of .so files from the bundle prevents eclipse
- from extracting SWT to the users HOME directory.
- .
- This patch is Debian specific; Fedora does not seem to suffer from this
problem.
-Author: Niels Thykier <[email protected]>
-
---- a/eclipse/plugins/org.eclipse.swt/Eclipse SWT
PI/common_j2se/org/eclipse/swt/internal/Library.java
-+++ b/eclipse/plugins/org.eclipse.swt/Eclipse SWT
PI/common_j2se/org/eclipse/swt/internal/Library.java
-@@ -255,6 +255,9 @@ public static void loadLibrary (String name, boolean
mapName) {
- /* Try loading library from java library path */
- if (load (libName1, message)) return;
- if (mapName && load (libName2, message)) return;
-+ /* Try the Debian location /usr/lib/eclipse/debian-swt/ */
-+ if (load ("/usr/lib/eclipse/debian-swt" + SEPARATOR + mappedName1,
message)) return;
-+ if (mapName && load ("/usr/lib/eclipse/debian-swt" + SEPARATOR +
mappedName2, message)) return;
-
- /* Try loading library from the tmp directory if swt library path is
not specified */
- String fileName1 = mappedName1;
diff --git a/debian/patches/fix-org-eclipse-swt-gtk-linux.patch
b/debian/patches/fix-org-eclipse-swt-gtk-linux.patch
deleted file mode 100644
index abd1022..0000000
--- a/debian/patches/fix-org-eclipse-swt-gtk-linux.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Jakub Adam <[email protected]>
-Date: Wed, 28 Dec 2011 01:25:24 +0100
-Subject: fix-org-eclipse-swt-gtk-linux
-
-${buildDirectory} is not defined in build.xml, hardcode correct path.
-
-swtfix
----
- .../org.eclipse.swt.gtk.linux.x86/build.xml | 2 +-
- .../org.eclipse.swt.gtk.linux.x86_64/build.xml | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
-index 04021c8..cc931bd 100644
---- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
-+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86/build.xml
-@@ -9,7 +9,7 @@
- <!-- These properties are used by eclipse when exporting as Deployable
plugin and fragments -->
- <property name="version.suffix" value="3.7.1" />
-
-- <condition property="plugindir"
value="../../../eclipse.platform.swt/bundles/org.eclipse.swt"
else="${buildDirectory}/plugins/org.eclipse.swt">
-+ <condition property="plugindir"
value="../../../eclipse.platform.swt/bundles/org.eclipse.swt"
else="../org.eclipse.swt">
- <available
file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/>
- </condition>
- <import file="${plugindir}/buildFragment.xml"/>
-diff --git a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
-index a9f0885..f96e424 100644
---- a/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
-+++ b/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64/build.xml
-@@ -9,7 +9,7 @@
- <!-- These properties are used by eclipse when exporting as Deployable
plugin and fragments -->
- <property name="version.suffix" value="3.7.1" />
-
-- <condition property="plugindir"
value="../../../eclipse.platform.swt/bundles/org.eclipse.swt"
else="${buildDirectory}/plugins/org.eclipse.swt">
-+ <condition property="plugindir"
value="../../../eclipse.platform.swt/bundles/org.eclipse.swt"
else="../org.eclipse.swt">
- <available
file="../../../eclipse.platform.swt/bundles/org.eclipse.swt" type="dir"/>
- </condition>
- <import file="${plugindir}/buildFragment.xml"/>
---
diff --git a/debian/patches/series b/debian/patches/series
index 5d8bce9..4be4db4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,12 +12,11 @@ strip-destDir.patch
clean-source.patch
osgi-services.patch
eclipse-build-generatedScripts.patch
-debian-load-internal-swt.patch
gnomeproxy-makefile.patch
find-newer-servlet-api.patch
eclipse-build-additionalArchs.patch
-fix-org-eclipse-swt-gtk-linux.patch
remove-org-apache-lucene.patch
relabel-to-3-7-1.patch
fix-com-ibm-icu-search-path.patch
set-shared-config-dir.patch
+use-distribution-swt.patch
diff --git a/debian/patches/use-distribution-swt.patch
b/debian/patches/use-distribution-swt.patch
new file mode 100644
index 0000000..2ce9824
--- /dev/null
+++ b/debian/patches/use-distribution-swt.patch
@@ -0,0 +1,191 @@
+From: Jakub Adam <[email protected]>
+Date: Sat, 14 Jan 2012 21:02:09 +0100
+Subject: use-distribution-swt
+
+---
+ build.xml | 8 ++-
+ dependencies.properties | 1 +
+ .../org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF | 21 ++++++++
+ eclipse/features/org.eclipse.rcp/feature.xml | 55 --------------------
+ pdebuild.xml | 7 +--
+ 5 files changed, 30 insertions(+), 62 deletions(-)
+ create mode 100644
dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF
+
+diff --git a/build.xml b/build.xml
+index f5e468f..e5633ea 100644
+--- a/build.xml
++++ b/build.xml
+@@ -171,6 +171,11 @@
+ <arg value="eclipse" />
+ <arg value="${buildDirectory}" />
+ </exec>
++ <delete includeemptydirs="true">
++ <fileset dir="${buildDirectory}/plugins">
++ <include name="**/org.eclipse.swt*/**" />
++ </fileset>
++ </delete>
+ </target>
+
+ <available file="${basedir}/eclipse-build-feature"
property="buildFeaturePresent" value="true" />
+@@ -320,7 +325,7 @@
+ <patch patchfile="${basedir}/patches/eclipse-no-jetty5.patch"
dir="${buildDirectory}" strip="1" />
+ <patch
patchfile="${basedir}/patches/eclipse-nosourcebundlesfordependencies.patch"
dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/osgi-util.patch"
dir="${buildDirectory}" strip="1" />
+- <patch patchfile="${basedir}/patches/eclipse-xpcom-h.patch"
dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT
Mozilla/common/library"/>
++ <!--patch patchfile="${basedir}/patches/eclipse-xpcom-h.patch"
dir="${buildDirectory}/plugins/org.eclipse.swt/Eclipse SWT
Mozilla/common/library"/-->
+ <patch patchfile="${basedir}/patches/osgi-services-build.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" />
+@@ -537,7 +542,6 @@
+ <include name="**/*.so" />
+ </fileset>
+ </delete>
+- <ant antfile="build.xml" target="build.nativeLibraries"
dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
+
+ <property name="launcherlibs"
value="${buildDirectory}/features/org.eclipse.equinox.executable" />
+ <exec dir="${launcherlibs}/library/gtk/" executable="sh"
failonerror="true">
+diff --git a/dependencies.properties b/dependencies.properties
+index 1c0d4e4..09396dd 100644
+--- a/dependencies.properties
++++ b/dependencies.properties
+@@ -9,6 +9,7 @@
org.apache.commons.logging_1.0.4.v201101211617.jar=/usr/share/java/commons-loggi
+
org.apache.jasper_5.5.17.v200903231320.jar=/usr/share/eclipse/plugins/org.apache.jasper_5.5.17.v200706111724.jar:/usr/share/java/jasper-5.5.26.jar:/usr/share/java/jasper-5.5.jar
+
org.apache.lucene.core_2.9.1.v201101211721.jar=/usr/share/java/lucene.jar:/usr/share/java/lucene-core.jar
+
org.apache.lucene.analysis_2.9.1.v201101211721.jar=/usr/share/java/lucene-contrib/lucene-analyzers.jar:/usr/share/java/lucene-analyzers.jar
++org.eclipse.swt_3.7.1.jar=/usr/share/java/swt.jar
+
org.mortbay.jetty.util_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty-util.jar:/usr/share/java/jetty-util.jar
+
org.mortbay.jetty.server_6.1.23.v201004211559.jar=/usr/share/java/jetty/jetty.jar:/usr/share/java/jetty.jar
+
org.sat4j.core_2.3.0.v20110329.jar=/usr/share/java/org.sat4j.core.jar:/usr/share/sat4j/org.sat4j.core.jar
+diff --git
a/dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF
b/dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF
+new file mode 100644
+index 0000000..272d0e7
+--- /dev/null
++++ b/dependencyManifests/org.eclipse.swt_3.7.1.jar/META-INF/MANIFEST.MF
+@@ -0,0 +1,21 @@
++Manifest-Version: 1.0
++Bundle-SymbolicName: org.eclipse.swt; singleton:=true
++Bundle-Vendor: Eclipse.org
++DynamicImport-Package: org.eclipse.swt.accessibility2, org.mozilla.xpcom
++
++Created-By: 0.98
++Bundle-Version: 3.7.1
++Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3
++Bundle-ManifestVersion: 2
++Export-Package: org.eclipse.swt,org.eclipse.swt.accessibility,org.eclips
++ e.swt.awt,org.eclipse.swt.browser,org.eclipse.swt.custom,org.eclipse.swt
++ .dnd,org.eclipse.swt.events,org.eclipse.swt.graphics,org.eclipse.swt.lay
++ out,org.eclipse.swt.opengl,org.eclipse.swt.printing,org.eclipse.swt.prog
++ ram,org.eclipse.swt.widgets,org.eclipse.swt.internal;x-friends:="org.ecl
++ ipse.ui",org.eclipse.swt.internal.image; x-internal:=true,org.eclipse.sw
++ t.internal.theme; x-internal:=true
++Eclipse-ExtensibleAPI: true
++Bundle-Localization: plugin
++Bundle-Name: Standard Widget Toolkit
++
++
+diff --git a/eclipse/features/org.eclipse.rcp/feature.xml
b/eclipse/features/org.eclipse.rcp/feature.xml
+index 2f15286..beaeca1 100644
+--- a/eclipse/features/org.eclipse.rcp/feature.xml
++++ b/eclipse/features/org.eclipse.rcp/feature.xml
+@@ -208,39 +208,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.swt.gtk.linux.x86"
+- os="linux"
+- ws="gtk"
+- arch="x86"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- fragment="true"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.swt.gtk.linux.s390x"
+- os="linux"
+- ws="gtk"
+- arch="s390x"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- fragment="true"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.swt.gtk.linux.s390"
+- os="linux"
+- ws="gtk"
+- arch="s390"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- fragment="true"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.swt.gtk.solaris.sparc"
+ os="solaris"
+ ws="gtk"
+@@ -263,28 +230,6 @@
+ unpack="false"/>
+
+ <plugin
+- id="org.eclipse.swt.gtk.linux.ppc64"
+- os="linux"
+- ws="gtk"
+- arch="ppc64"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- fragment="true"
+- unpack="false"/>
+-
+- <plugin
+- id="org.eclipse.swt.gtk.linux.x86_64"
+- os="linux"
+- ws="gtk"
+- arch="x86_64"
+- download-size="0"
+- install-size="0"
+- version="0.0.0"
+- fragment="true"
+- unpack="false"/>
+-
+- <plugin
+ id="org.eclipse.swt.carbon.macosx"
+ os="macosx"
+ ws="carbon"
+diff --git a/pdebuild.xml b/pdebuild.xml
+index 431eaf6..976af90 100644
+--- a/pdebuild.xml
++++ b/pdebuild.xml
+@@ -87,8 +87,7 @@
+ <filelist id="helpDirs" dir="${sdkSource}/plugins"
files="${helpDirsProperty}"/>
+
+ <property name="depsDirs2Property"
+- value="org.eclipse.swt.gtk.linux.${buildArch}
+- org.eclipse.core.filesystem
++ value="org.eclipse.core.filesystem
+ org.eclipse.core.resources
+ org.eclipse.core.commands
+ org.eclipse.jface
+@@ -111,6 +110,7 @@
+ <include name="org.junit_*/" />
+ <include name="com.ibm.icu_*" />
+ <include name="org.apache.ant_*/**" />
++ <include name="org.eclipse.swt*"/>
+ <include name="org.mortbay.jetty*" />
+ <include name="org.apache.lucene*" />
+ <include name="org.apache.commons*" />
+@@ -307,9 +307,6 @@
+ <copy todir="bootstrap/plugins" flatten="true">
+ <fileset refid="depsZips" />
+ </copy>
+- <copy todir="bootstrap/plugins/org.eclipse.swt">
+- <fileset dir="${sdkSource}/plugins/org.eclipse.swt" />
+- </copy>
+ <unzip dest="bootstrap/plugins">
+ <fileset dir="bootstrap/plugins">
+ <include name="**/*.zip" />
+--
diff --git a/debian/rules b/debian/rules
index e86ce9e..6957cc3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,25 +18,8 @@ override_dh_auto_install:
DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
CFG_OSGI_BUNDLES_PATH =
debian/eclipse-rcp/usr/lib/eclipse/configuration/org.eclipse.osgi/bundles
JNI_SO_PATH := $(CFG_OSGI_BUNDLES_PATH)/*/1/.cp
-SWT_SO_PATH := $(CURDIR)/debian/eclipse-rcp/usr/lib/eclipse/debian-swt
LAUNCHER_LIB =
debian/eclipse-rcp/usr/lib/eclipse/plugins/org.eclipse.equinox.launcher.*/eclipse_*.so
-override_dh_shlibdeps:
- dh_shlibdeps -peclipse-rcp -l$(JAVA_HOME)/jre/lib/$(DEB_HOST_ARCH_CPU) \
- -- -dDepends \
- $(SWT_SO_PATH)/libswt-gtk-*.so \
- $(SWT_SO_PATH)/libswt-atk-gtk-*.so \
- $(SWT_SO_PATH)/libswt-awt-gtk-*.so \
- $(SWT_SO_PATH)/libswt-cairo-gtk-*.so \
- $(SWT_SO_PATH)/libswt-pi-gtk-*.so \
- $(SWT_SO_PATH)/libswt-webkit-gtk-*.so \
- $(shell find $(JNI_SO_PATH) -name '*.so' | grep -v
libswt-) \
- $(LAUNCHER_LIB) \
- -dRecommends \
- $(SWT_SO_PATH)/libswt-gnome-gtk-*.so \
- $(SWT_SO_PATH)/libswt-glx-gtk-*.so
- dh_shlibdeps --remaining-packages
-
# This has to go in an arch package, as some of the version numbers
# depend on which arch it was build one.
COPY_PLATFORM:=/usr/lib/eclipse/buildscripts/copy-platform
@@ -89,8 +72,6 @@ override_dh_install:
dh_install --list-missing
$(if $(wildcard
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar),dh_install
-peclipse-platform
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.core.net.linux.*.jar
/usr/lib/eclipse/plugins)
$(if $(wildcard
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux*.jar),dh_install
-peclipse-platform
debian/tmp/usr/lib/eclipse/plugins/org.eclipse.update.core.linux*.jar
/usr/lib/eclipse/plugins)
- mkdir "$(SWT_SO_PATH)"
- find $(JNI_SO_PATH) -name 'libswt*.so' -exec mv {} "$(SWT_SO_PATH)" \;
find $(CFG_OSGI_BUNDLES_PATH) -depth -type d -a -empty -delete
# Check if we are doing a -B build
[ ! -d debian/eclipse-platform-data ] || debian/rules
override_dh_install_indep
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
