Add patch for rhbz#1255150
- Use older requires on emf (not emf-runtime) - Always use UTC timestamps
This commit is contained in:
Mat Booth
parent
0225c6f039
commit
d5d3d8a5cc
|
|
@ -0,0 +1,90 @@
|
|||
From a41f152c868984b41b73945f374966ad621c3e13 Mon Sep 17 00:00:00 2001
|
||||
From: Snjezana Peco
|
||||
Date: Thu, 21 May 2015 10:41:39 +0200
|
||||
Subject: Bug 466499 - [GTK3] Path text not drawn in column of commit dialog
|
||||
window
|
||||
|
||||
Change-Id: I508432a354314ca11839e03fbac7b5adc44fff3c
|
||||
Signed-off-by: Snjezana Peco <snjeza.peco@gmail.com>
|
||||
---
|
||||
.../Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java | 3 ++-
|
||||
.../Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java | 17 ++++-------------
|
||||
2 files changed, 6 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
|
||||
index e49865b..9b904ad 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java
|
||||
@@ -2662,7 +2662,8 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
|
||||
}
|
||||
}
|
||||
if (item != null) {
|
||||
- if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
|
||||
+ if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) ||
|
||||
+ ( (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) || OS.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
|
||||
drawFlags = (int)/*64*/flags;
|
||||
drawState = SWT.FOREGROUND;
|
||||
long /*int*/ [] ptr = new long /*int*/ [1];
|
||||
diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
|
||||
index 4d5448a..bc64152 100644
|
||||
--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
|
||||
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java
|
||||
@@ -2675,7 +2675,8 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
|
||||
}
|
||||
}
|
||||
if (item != null) {
|
||||
- if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) || (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
|
||||
+ if (OS.GTK_IS_CELL_RENDERER_TOGGLE (cell) ||
|
||||
+ ( (OS.GTK_IS_CELL_RENDERER_PIXBUF (cell) || OS.GTK_VERSION > OS.VERSION(3, 13, 0)) && (columnIndex != 0 || (style & SWT.CHECK) == 0))) {
|
||||
drawFlags = (int)/*64*/flags;
|
||||
drawState = SWT.FOREGROUND;
|
||||
long /*int*/ [] ptr = new long /*int*/ [1];
|
||||
@@ -2775,9 +2776,6 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
|
||||
sendEvent (SWT.EraseItem, event);
|
||||
drawForeground = null;
|
||||
drawState = event.doit ? event.detail : 0;
|
||||
- if (OS.GTK3 && OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
|
||||
- drawState |= SWT.FOREGROUND;
|
||||
- }
|
||||
drawFlags &= ~(OS.GTK_CELL_RENDERER_FOCUSED | OS.GTK_CELL_RENDERER_SELECTED);
|
||||
if ((drawState & SWT.SELECTED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_SELECTED;
|
||||
if ((drawState & SWT.FOCUSED) != 0) drawFlags |= OS.GTK_CELL_RENDERER_FOCUSED;
|
||||
@@ -2821,10 +2819,8 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
|
||||
if (OS.GTK_IS_CELL_RENDERER_TEXT (cell)) {
|
||||
if (hooks (SWT.PaintItem)) {
|
||||
GdkRectangle rect = new GdkRectangle ();
|
||||
- GdkRectangle clipRect = new GdkRectangle ();
|
||||
long /*int*/ path = OS.gtk_tree_model_get_path (modelHandle, iter);
|
||||
OS.gtk_tree_view_get_cell_area (handle, path, columnHandle, rect);
|
||||
- OS.gtk_tree_view_get_background_area (handle, path, columnHandle, clipRect);
|
||||
OS.gtk_tree_path_free (path);
|
||||
// A workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=459117
|
||||
if (cr != 0 && OS.GTK_VERSION > OS.VERSION(3, 9, 0) && OS.GTK_VERSION <= OS.VERSION(3, 14, 8)) {
|
||||
@@ -2877,12 +2873,9 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
|
||||
gc.setFont (item.getFont (columnIndex));
|
||||
if ((style & SWT.MIRRORED) != 0) {
|
||||
rect.x = getClientWidth () - rect.width - rect.x;
|
||||
- clipRect.x = getClientWidth () - clipRect.width - clipRect.x;
|
||||
}
|
||||
|
||||
- if (!OS.GTK3){
|
||||
- gc.setClipping (clipRect.x, clipRect.y, clipRect.width, clipRect.height);
|
||||
- }
|
||||
+ gc.setClipping (rect.x, rect.y, rect.width, rect.height);
|
||||
|
||||
Event event = new Event ();
|
||||
event.item = item;
|
||||
@@ -2893,9 +2886,7 @@ void rendererRender (long /*int*/ cell, long /*int*/ cr, long /*int*/ window, lo
|
||||
event.width = contentWidth [0];
|
||||
event.height = rect.height;
|
||||
event.detail = drawState;
|
||||
- if (!OS.GTK3 || OS.GTK_VERSION > OS.VERSION(3, 14, 8)) {
|
||||
- sendEvent (SWT.PaintItem, event);
|
||||
- }
|
||||
+ sendEvent(SWT.PaintItem, event);
|
||||
gc.dispose();
|
||||
}
|
||||
}
|
||||
--
|
||||
cgit v0.11.2-4-g4a35
|
||||
|
||||
15
eclipse.spec
15
eclipse.spec
|
|
@ -37,7 +37,7 @@ Epoch: 1
|
|||
Summary: An open, extensible IDE
|
||||
Name: eclipse
|
||||
Version: %{eclipse_version}
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
License: EPL
|
||||
URL: http://www.eclipse.org/
|
||||
|
||||
|
|
@ -119,6 +119,9 @@ Patch22: eclipse-lucene-4.patch
|
|||
|
||||
Patch23: %{pkg_name}-javaxannotation-import.patch
|
||||
|
||||
# For https://bugzilla.redhat.com/show_bug.cgi?id=1255150
|
||||
Patch24: eclipse-bug-466499.patch
|
||||
|
||||
BuildRequires: rsync
|
||||
BuildRequires: make, gcc
|
||||
BuildRequires: glib2-devel
|
||||
|
|
@ -194,7 +197,7 @@ BuildRequires: osgi(osgi.annotation)
|
|||
BuildRequires: eclipse-pde
|
||||
# Build deps needed for contributor tools
|
||||
BuildRequires: eclipse-egit >= 4.0.0
|
||||
BuildRequires: eclipse-emf-runtime
|
||||
BuildRequires: eclipse-emf
|
||||
%endif
|
||||
|
||||
%description
|
||||
|
|
@ -363,6 +366,7 @@ tar --strip-components=1 -xf %{SOURCE1}
|
|||
pushd eclipse.platform.ui
|
||||
%patch23 -p1
|
||||
popd
|
||||
%patch24 -p1
|
||||
|
||||
# Disable as many things as possible to make the build faster. We care only for Eclipse.
|
||||
%pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
|
||||
|
|
@ -569,7 +573,7 @@ ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.bundles/bundles
|
|||
export MAVEN_OPTS="-Xmx1000m -XX:MaxPermSize=256m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState ${MAVEN_OPTS}"
|
||||
export JAVA_HOME=%{java_home}
|
||||
|
||||
%mvn_build -j -f -- -DforceContextQualifier=$(date +v%Y%m%d-%H00) \
|
||||
%mvn_build -j -f -- -DforceContextQualifier=$(date -u +v%Y%m%d-%H00) \
|
||||
%if %{bootstrap}
|
||||
-P !api-generation,!build-docs \
|
||||
%endif
|
||||
|
|
@ -1086,6 +1090,11 @@ fi
|
|||
%{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
|
||||
|
||||
%changelog
|
||||
* Thu Aug 20 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-6
|
||||
- Add patch for rhbz#1255150
|
||||
- Use older requires on emf (not emf-runtime)
|
||||
- Always use UTC timestamps
|
||||
|
||||
* Tue Aug 11 2015 Mat Booth <mat.booth@redhat.com> - 1:4.5.0-5
|
||||
- Non-bootstrap build
|
||||
- Rebuild for new ECF
|
||||
|
|
|
|||
Loading…
Reference in New Issue