[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. 4f0fc9f465637a0544efe8041b8c8e02faae1eef

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "eclipse - Powerful IDE written in java - Debian package.".

The branch, master has been updated
       via  4f0fc9f465637a0544efe8041b8c8e02faae1eef (commit)
      from  18549f34cccc5d7cfdfc44bbb88eb0e3e0b93750 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4f0fc9f465637a0544efe8041b8c8e02faae1eef
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Oct 12 17:23:11 2009 +0200

    Rewrote patch with different approach.

-----------------------------------------------------------------------

Summary of changes:
 debian/patches/libgnomeproxy.patch |   51 ++++++++++++++++++++++--------------
 1 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/debian/patches/libgnomeproxy.patch b/debian/patches/libgnomeproxy.patch
index a294a35..877c890 100644
--- a/debian/patches/libgnomeproxy.patch
+++ b/debian/patches/libgnomeproxy.patch
@@ -1,43 +1,54 @@
-Description: Patch to only rebuild libgnomeproxy on supported archs (to be send upstream).
-Author: Niels Thykier <niels at thykier.net>
-
--- a/build.xml	2009-10-12 16:36:57.277758180 +0200
-+++ b/build.xml	2009-10-12 16:39:14.291675886 +0200
-@@ -286,7 +286,6 @@
+Index: build.xml
+===================================================================
+--- a/build.xml	(revision 23415)
++++ b/build.xml	(working copy)
+@@ -50,6 +50,9 @@
+ 			</or>
+ 		</and>
+ 	</condition>
++        <condition property="build.libgnomeproxy">
++                <equals arg1="${buildArch}" arg2="x86" />
++        </condition>
+ 
+ 	<target name="setLib64Dir" if="setLib64">
+ 		<property name="libDir" value="lib64" />
+@@ -291,8 +294,14 @@
+ 		<echo file="testsbuild-stamp" />
  	</target>
  
++        <target name="compile.libgnomeproxy" if="build.libgnomeproxy">
++		<!-- build libgnomeproxy -->
++		<exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
++		<copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" />
++		<move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/" />
++        </target>
++
  	<target name="compilelibs" unless="compilelibs.complete">
 -		<!-- TODO: Reenable when libgnomeproxy build is fixed.
  		<delete verbose="true">
  			<fileset dir="${buildDirectory}/features/org.eclipse.equinox.executable">
  				<include name="eclipse" />
-@@ -294,7 +293,7 @@
+@@ -300,7 +309,7 @@
  			<fileset dir="${buildDirectory}">
  				<include name="**/*.so" />
  			</fileset>
 -		</delete>-->
 +		</delete>
- 		<ant antfile="build.xml"
- 		     target="build.nativeLibraries"
- 		     dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.${buildArch}" />
-@@ -318,12 +317,14 @@
+ 		<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" />
+@@ -321,13 +330,7 @@
+ 		<exec dir="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux" executable="make" failonerror="true" />
  		<move file="${buildDirectory}/plugins/org.eclipse.core.filesystem/natives/unix/linux/liblocalfile_1_0_0.so" todir="${buildDirectory}/plugins/org.eclipse.core.filesystem.linux.${buildArch}/os/linux/${buildArch}">
  		</move>
- 		<!-- build libgnomeproxy -->
+-		<!-- build libgnomeproxy -->
 -		<!-- TODO: Reenable when libgnomeproxy build is fixed.
 -		<exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
 -		<copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/">
 -		</copy>
 -		<move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/">
 -		</move>-->
-+		<if>
-+		  <equals arg1="${buildArch}" arg2="x86" />
-+		  <then>
-+		    <exec dir="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux" executable="make" failonerror="true" />
-+		    <copy file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net.linux.${buildArch}/" />
-+		    <move file="${buildDirectory}/plugins/org.eclipse.core.net/natives/unix/linux/libgnomeproxy-1.0.0.so" todir="${buildDirectory}/plugins/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.${buildArch}/" />
-+		  </then>
-+		</if>
++		<antcall target="compile.libgnomeproxy" />
  		<!-- build libupdate -->
  		<ant dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src" antfile="build.xml" />
  


hooks/post-receive
-- 
eclipse - Powerful IDE written in java - Debian package.