[SCM] eclipse - Powerful IDE written in java - Debian package. branch, lucid, updated. d5b6069709e0daac250bac87420363645bfe82e7
Niels Thykier
nthykier-guest at alioth.debian.org
Tue Jun 1 16:48:39 UTC 2010
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, lucid has been updated
via d5b6069709e0daac250bac87420363645bfe82e7 (commit)
via 19bff8c9ae979c3fbd3b19b2d3575a043cdbf2c8 (commit)
from bb855b8d9c84065146845c32d8a02b66a9e8fa41 (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 d5b6069709e0daac250bac87420363645bfe82e7
Author: Niels Thykier <niels at thykier.net>
Date: Tue Jun 1 18:47:55 2010 +0200
Snapshot release to eclipse-ppa/lucid.
commit 19bff8c9ae979c3fbd3b19b2d3575a043cdbf2c8
Author: Niels Thykier <niels at thykier.net>
Date: Sun May 30 00:06:42 2010 +0200
Backported fix for poor tooltip colors with certain themes.
LP: #540332
-----------------------------------------------------------------------
Summary of changes:
build.xml | 1 +
debian/changelog | 7 +++
debian/patches/fix-tooltip-color.patch | 67 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
patches/tooltip-color.patch | 47 ++++++++++++++++++++++
5 files changed, 123 insertions(+), 0 deletions(-)
diff --git a/build.xml b/build.xml
index 13c9d83..d3f5c90 100644
--- a/build.xml
+++ b/build.xml
@@ -263,6 +263,7 @@
<patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
<symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
<patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
+ <patch patchfile="${basedir}/patches/tooltip-color.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" />
<!-- end eclipse-build-only patches -->
diff --git a/debian/changelog b/debian/changelog
index f9097ca..22238c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+eclipse (3.5.2-2ubuntu4.2) UNRELEASED; urgency=low
+
+ * Backported fix for poor tooltip colors with certain themes. (LP:
+ #540332)
+
+ -- Niels Thykier <niels at thykier.net> Tue, 01 Jun 2010 18:45:04 +0200
+
eclipse (3.5.2-2ubuntu4.1) lucid-proposed; urgency=low
[ Niels Thykier ]
diff --git a/debian/patches/fix-tooltip-color.patch b/debian/patches/fix-tooltip-color.patch
new file mode 100644
index 0000000..82e9cf6
--- /dev/null
+++ b/debian/patches/fix-tooltip-color.patch
@@ -0,0 +1,67 @@
+Description: Backported fix for LP: #540332, poor tooltip text colors
+ with certain themes.
+Origin: Upstream, https://bugs.eclipse.org/bugs/show_bug.cgi?id=309907
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/light-themes/+bug/540332
+
+diff --git a/build.xml b/build.xml
+index 13c9d83..d3f5c90 100644
+--- a/build.xml
++++ b/build.xml
+@@ -263,6 +263,7 @@
+ <patch patchfile="${basedir}/patches/osgi-services-build.patch" dir="${buildDirectory}" strip="1" />
+ <symlink link="${buildDirectory}/plugins/org.eclipse.osgi.services/src/javax" resource="../../org.eclipse.equinox.io/src/javax/" />
+ <patch patchfile="${basedir}/patches/eclipse-swt-compile-xpt.patch" dir="${buildDirectory}" strip="1" />
++ <patch patchfile="${basedir}/patches/tooltip-color.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" />
+ <!-- end eclipse-build-only patches -->
+--- /dev/null 2010-05-12 21:34:59.208556227 +0200
++++ b/patches/tooltip-color.patch 2010-05-29 18:20:48.358013482 +0200
+@@ -0,0 +1,47 @@
++diff -u -r1.25 ToolTip.java
++--- a/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 2 Dec 2009 15:52:39 -0000
+++++ b/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 13 May 2010 15:59:10 -0000
++@@ -48,6 +48,7 @@
++ TrayItem item;
++ int x, y, timerId;
++ int /*long*/ layoutText = 0, layoutMessage = 0;
+++ Color layoutTextColor, layoutMessageColor;
++ int [] borderPolygon;
++ boolean spikeAbove, autohide;
++
++@@ -498,6 +499,9 @@
++ x += IMAGE_SIZE;
++ }
++ x += INSET;
+++ if (layoutTextColor != null) {
+++ OS.gdk_gc_set_foreground(gdkGC, layoutTextColor.handle);
+++ }
++ OS.gdk_draw_layout (window, gdkGC, x, y, layoutText);
++ int [] w = new int [1], h = new int [1];
++ OS.pango_layout_get_size (layoutText, w, h);
++@@ -505,6 +509,9 @@
++ }
++ if (layoutMessage != 0) {
++ x = BORDER + PADDING + INSET;
+++ if (layoutMessageColor != null) {
+++ OS.gdk_gc_set_foreground(gdkGC, layoutMessageColor.handle);
+++ }
++ OS.gdk_draw_layout (window, gdkGC, x, y, layoutMessage);
++ }
++ OS.g_object_unref (gdkGC);
++@@ -708,6 +715,7 @@
++ if (layoutMessage != 0) OS.g_object_unref (layoutMessage);
++ layoutMessage = 0;
++ if (message.length () != 0) {
+++ layoutMessageColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
++ byte [] buffer = Converter.wcsToMbcs (null, message, true);
++ layoutMessage = OS.gtk_widget_create_pango_layout (handle, buffer);
++ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
++@@ -739,6 +747,7 @@
++ if (layoutText != 0) OS.g_object_unref (layoutText);
++ layoutText = 0;
++ if (text.length () != 0) {
+++ layoutTextColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
++ byte [] buffer = Converter.wcsToMbcs (null, text, true);
++ layoutText = OS.gtk_widget_create_pango_layout (handle, buffer);
++ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
diff --git a/debian/patches/series b/debian/patches/series
index ae54c0d..25d456a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ eclipse-build-generatedScripts.patch
osgi-services-symlink-javax.patch
ecj-gccmain-java.patch
fix-help-contents.patch
+fix-tooltip-color.patch
diff --git a/patches/tooltip-color.patch b/patches/tooltip-color.patch
new file mode 100644
index 0000000..3edcbd4
--- /dev/null
+++ b/patches/tooltip-color.patch
@@ -0,0 +1,47 @@
+diff -u -r1.25 ToolTip.java
+--- a/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 2 Dec 2009 15:52:39 -0000
++++ b/plugins/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java 13 May 2010 15:59:10 -0000
+@@ -48,6 +48,7 @@
+ TrayItem item;
+ int x, y, timerId;
+ int /*long*/ layoutText = 0, layoutMessage = 0;
++ Color layoutTextColor, layoutMessageColor;
+ int [] borderPolygon;
+ boolean spikeAbove, autohide;
+
+@@ -498,6 +499,9 @@
+ x += IMAGE_SIZE;
+ }
+ x += INSET;
++ if (layoutTextColor != null) {
++ OS.gdk_gc_set_foreground(gdkGC, layoutTextColor.handle);
++ }
+ OS.gdk_draw_layout (window, gdkGC, x, y, layoutText);
+ int [] w = new int [1], h = new int [1];
+ OS.pango_layout_get_size (layoutText, w, h);
+@@ -505,6 +509,9 @@
+ }
+ if (layoutMessage != 0) {
+ x = BORDER + PADDING + INSET;
++ if (layoutMessageColor != null) {
++ OS.gdk_gc_set_foreground(gdkGC, layoutMessageColor.handle);
++ }
+ OS.gdk_draw_layout (window, gdkGC, x, y, layoutMessage);
+ }
+ OS.g_object_unref (gdkGC);
+@@ -708,6 +715,7 @@
+ if (layoutMessage != 0) OS.g_object_unref (layoutMessage);
+ layoutMessage = 0;
+ if (message.length () != 0) {
++ layoutMessageColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
+ byte [] buffer = Converter.wcsToMbcs (null, message, true);
+ layoutMessage = OS.gtk_widget_create_pango_layout (handle, buffer);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
+@@ -739,6 +747,7 @@
+ if (layoutText != 0) OS.g_object_unref (layoutText);
+ layoutText = 0;
+ if (text.length () != 0) {
++ layoutTextColor = display.getSystemColor(SWT.COLOR_INFO_FOREGROUND);
+ byte [] buffer = Converter.wcsToMbcs (null, text, true);
+ layoutText = OS.gtk_widget_create_pango_layout (handle, buffer);
+ if (OS.GTK_VERSION >= OS.VERSION (2, 4, 0)) {
hooks/post-receive
--
eclipse - Powerful IDE written in java - Debian package.
More information about the pkg-java-commits
mailing list