rpms/evolution
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try again

Browse source
This commit is contained in:
Matthias Clasen 2011-02-11 11:40:42 -05:00
commit cf7b4e0d94
2 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

39
evolution-gtk3.patch Normal file
View file

@ -0,0 +1,39 @@
From cdb1098cc61e4b123bfcecb0a1bcd15b293e8aba Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 11 Feb 2011 09:31:38 +0000
Subject: Fix a build break due to #error pragma
---
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 6a277fc..467523d 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -669,10 +669,21 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
/* now draw our icon if we're expandable */
if (expandable) {
-#if GTK_CHECK_VERSION (3, 0, 0)
- gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
-#error Paint an expander here
-#endif
+ gboolean expanded;
+ GdkRectangle r;
+ gint exp_size = 0;
+
+ gtk_widget_style_get (GTK_WIDGET (gtk_widget_get_parent (GTK_WIDGET (tree_view->canvas))), "expander_size", &exp_size, NULL);
+
+ node = e_cell_tree_get_node (ecell_view->e_table_model, row);
+ expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
+
+ r.x = 0;
+ r.y = 0;
+ r.width = MIN (width, exp_size);
+ r.height = height;
+
+ draw_expander (tree_view, cr, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r);
}
cairo_stroke (cr);
--
cgit v0.8.3.1

3
evolution.spec
View file

@ -49,6 +49,7 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch
Patch13: evolution-2.30.1-help-contents.patch
Patch14: evolution-help-gl.patch
Patch15: evolution-gtk3.patch
## Dependencies ###
@ -206,6 +207,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
%patch10 -p1 -b .ldaphack
%patch13 -p1 -b .help-contents
%patch14 -p1 -b .help-gl
%patch15 -p1 -b .gtk3
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@ -576,6 +578,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Fri Feb 11 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.6.1-4
- Rebuild against newer gtk
- Fix a problem with gl help translations
- Upstream fix for build against gtk3
- Drop %%clean
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.91.6.1-3