[SCM] eclipse - Powerful IDE written in java - Debian package. branch, master, updated. debian/3.8.0_rc4-1-2-g1411777

[Jakub Adam]

The following commit has been merged in the master branch:
commit 14117775508b4fe1573c20cc13c8b34e39e720f9
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Jun 30 21:49:45 2012 +0200

    Fix libgnomeproxy compilation with glib >= 2.32

diff --git a/debian/changelog b/debian/changelog
index 4732dfd..9b21849 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 eclipse (3.8.0~rc4-2) UNRELEASED; urgency=low
 
   * Update extended description of eclipse-platform-data (Closes: #679423).
+  * Fix libgnomeproxy compilation with glib >= 2.32 (Closes: #679328).
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Sat, 30 Jun 2012 21:07:01 +0200
 
diff --git a/debian/patches/gnomeproxy-glib-2.32-compat.patch b/debian/patches/gnomeproxy-glib-2.32-compat.patch
new file mode 100644
index 0000000..ff9131d
--- /dev/null
+++ b/debian/patches/gnomeproxy-glib-2.32-compat.patch
@@ -0,0 +1,20 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Sat, 30 Jun 2012 21:46:44 +0200
+Subject: gnomeproxy-glib-2.32-compat
+
+---
+ eclipse/plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/eclipse/plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c b/eclipse/plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c
+index 870e0be..ccdc186 100644
+--- a/eclipse/plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c
++++ b/eclipse/plugins/org.eclipse.core.net/natives/unix/gnomeproxy.c
+@@ -13,7 +13,6 @@
+ #include <jni.h>
+ 
+ #include <glib.h>
+-#include <glib/gslist.h>
+ #include <gconf/gconf-value.h>
+ #include <gconf/gconf-client.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2cd540c..6d7972d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,3 +38,4 @@ install-libgnomeproxy-to-jni-directory.patch
 eclipse-help-fix-jsp-precompilation.patch
 use-deb-build-compiler-flags.patch
 fix-gnu-kfreebsd-build.patch
+gnomeproxy-glib-2.32-compat.patch

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