[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master-3.8, updated. debian/3.8.0_rc3-2-10-g2df2095

[Jakub Adam]

The following commit has been merged in the master-3.8 branch:
commit 2df2095a880890e5bbb3b599a07dca31b9e6d64f
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sun Jun 17 21:27:03 2012 +0200

    Fix some build errors on GNU/kFreeBSD
    
    Doesn't fix the whole build, but at least lets progress it further.

diff --git a/debian/patches/fix-gnu-kfreebsd-build.patch b/debian/patches/fix-gnu-kfreebsd-build.patch
new file mode 100644
index 0000000..e5a35ec
--- /dev/null
+++ b/debian/patches/fix-gnu-kfreebsd-build.patch
@@ -0,0 +1,43 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sun, 17 Jun 2012 21:23:14 +0200
+Subject: fix-gnu-kfreebsd-build
+
+---
+ build.xml                                                    |   10 +++++++---
+ .../org.eclipse.equinox.executable/library/gtk/build.sh      |    2 +-
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/build.xml b/build.xml
+index 1d65b7b..cf74f62 100644
+--- a/build.xml
++++ b/build.xml
+@@ -8,9 +8,13 @@
+ 	<property environment="env"/>
+ 	<property name="jhome" value="${env.JAVA_HOME}"/>
+ 	<condition property="javaHomeExists">
+-		<resourceexists>
+-			<file file="${jhome}"/>
+-		</resourceexists>
++		<or>
++			<resourceexists>
++				<file file="${jhome}"/>
++			</resourceexists>
++			<!-- env.JAVA_HOME doesn't work on kFreeBSD -->
++			<os name="GNU/kFreeBSD"/>
++		</or>
+ 	</condition>
+ 	<fail unless="javaHomeExists" message="JAVA_HOME is not set properly"/>
+ 
+diff --git a/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh b/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
+index 894ce4a..0d63039 100755
+--- a/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
++++ b/eclipse/features/org.eclipse.equinox.executable/library/gtk/build.sh
+@@ -51,7 +51,7 @@ if [ "${CC}" = "" ]; then
+ fi
+ 
+ case $OS in
+-	"Linux")
++	"Linux"|"GNU/kFreeBSD")
+ 		makefile="make_linux.mak"
+ 		defaultOS="linux"
+ 		case $MODEL in
diff --git a/debian/patches/series b/debian/patches/series
index 6044264..2cd540c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,3 +37,4 @@ eclipse-add-archs-net.patch
 install-libgnomeproxy-to-jni-directory.patch
 eclipse-help-fix-jsp-precompilation.patch
 use-deb-build-compiler-flags.patch
+fix-gnu-kfreebsd-build.patch

-- 
eclipse - Powerful IDE written in java - Debian package.