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 56090ec366a036107bfa9fa6e2c3b66270059c7e (commit)
from 6dbeae36768aaaa102fdd79d681423ee7a98b74d (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 56090ec366a036107bfa9fa6e2c3b66270059c7e
Author: Niels Thykier <[email protected]>
Date: Tue Oct 13 01:32:44 2009 +0200
Update gnomeproxy patch and add a new one.
-----------------------------------------------------------------------
Summary of changes:
debian/patches/gnomemakefile-patch.patch | 17 +++++++++++++++++
debian/patches/libgnomeproxy.patch | 29 +++++++++++++++++------------
debian/patches/series | 1 +
3 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/debian/patches/gnomemakefile-patch.patch
b/debian/patches/gnomemakefile-patch.patch
new file mode 100644
index 0000000..4fd23ba
--- /dev/null
+++ b/debian/patches/gnomemakefile-patch.patch
@@ -0,0 +1,17 @@
+diff --git a/patches/gnomeproxy-makefile.patch
b/patches/gnomeproxy-makefile.patch
+index e69de29..885993e 100644
+--- a/patches/gnomeproxy-makefile.patch
++++ b/patches/gnomeproxy-makefile.patch
+@@ -0,0 +1,12 @@
++---
a/build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.core.net/natives/unix/linux/makefile
2009-10-12 22:36:19.965754808 +0200
+++++
b/build/eclipse-R3_5_1-fetched-src/plugins/org.eclipse.core.net/natives/unix/linux/makefile
2009-10-12 23:01:39.375006881 +0200
++@@ -18,7 +18,8 @@
++ LIB_NAME = gnomeproxy.so
++ LIB_NAME_FULL = libgnomeproxy-1.0.0.so
++
++-INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/
-I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/
+++INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/
-I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/ \
+++ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
++ COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32
++
++ LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0
diff --git a/debian/patches/libgnomeproxy.patch
b/debian/patches/libgnomeproxy.patch
index c8da9d3..d6ab4cd 100644
--- a/debian/patches/libgnomeproxy.patch
+++ b/debian/patches/libgnomeproxy.patch
@@ -1,9 +1,7 @@
-Description: Patch to only rebuild libgnomeproxy on supported archs (to be
send upstream).
-Author: Niels Thykier <[email protected]>
-
-diff -pruN a/build.xml b/build.xml
---- a/build.xml 2009-10-12 18:11:01.279223000 +0200
-+++ b/build.xml 2009-10-12 21:46:39.598436279 +0200
+Index: build.xml
+===================================================================
+--- build.xml (revision 23418)
++++ build.xml (working copy)
@@ -50,6 +50,9 @@
</or>
</and>
@@ -14,7 +12,15 @@ diff -pruN a/build.xml b/build.xml
<target name="setLib64Dir" if="setLib64">
<property name="libDir" value="lib64" />
-@@ -291,8 +294,14 @@
+@@ -207,6 +210,7 @@
+ <patch
patchfile="${basedir}/patches/donotstorebuildlogsinfiles.patch"
dir="${buildDirectory}" strip="3" />
+ <patch
patchfile="${basedir}/patches/donotsetjavahomeandoptimizeliblocalfile.patch"
dir="${buildDirectory}" strip="3" />
+ <patch
patchfile="${basedir}/patches/eclipse-pde.build-add-package-build.patch"
dir="${buildDirectory}/plugins/org.eclipse.pde.build" strip="0" />
++ <patch patchfile="${basedir}/patches/gnomeproxy-makefile.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" />
+ <!-- end eclipse-build-only patches -->
+ <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=290064-->
+@@ -291,8 +295,14 @@
<echo file="testsbuild-stamp" />
</target>
@@ -30,7 +36,7 @@ diff -pruN a/build.xml b/build.xml
<delete verbose="true">
<fileset
dir="${buildDirectory}/features/org.eclipse.equinox.executable">
<include name="eclipse" />
-@@ -300,7 +309,7 @@
+@@ -300,7 +310,7 @@
<fileset dir="${buildDirectory}">
<include name="**/*.so" />
</fileset>
@@ -39,7 +45,7 @@ diff -pruN a/build.xml b/build.xml
<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,14 +330,7 @@
+@@ -321,13 +331,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>
@@ -50,8 +56,7 @@ diff -pruN a/build.xml b/build.xml
- </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>-->
-- <!-- build libupdate -->
-+ <antcall target="compile.libgnomeproxy" />
++ <antcall target="compile.libgnomeproxy" />
+ <!-- build libupdate -->
<ant
dir="${buildDirectory}/plugins/org.eclipse.update.core.linux/src"
antfile="build.xml" />
- <echo file="compilelibs-stamp" />
diff --git a/debian/patches/series b/debian/patches/series
index 83c007e..2cfde95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
eclipse-build.patch
libgnomeproxy.patch
+gnomemakefile-patch.patch
fix-perm.patch
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
