Accepting request 34672 from home:dimstar:branches:GNOME:Factory
Copy from home:dimstar:branches:GNOME:Factory/evolution via accept of submit request 34672 revision 3. Request was accepted with message: Reviewed ok OBS-URL: https://build.opensuse.org/request/show/34672 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=73
This commit is contained in:
Git OBS Bridge
parent
ff4e429499
commit
6871fb4164
3
evolution-2.29.92.1.tar.bz2
Normal file
3
evolution-2.29.92.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c2c2708abdbc11ec2558f5262b4fa79777c08c0dc00a6d0865ff56300d6dcb27
|
||||
size 30439108
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a18ffea141281d75d5827f09ffc15d9ecf5faa9bf94f30ec86daaa6c966daf9a
|
||||
size 30447130
|
||||
@ -1,133 +0,0 @@
|
||||
From 56e6bdb414fb251d99ffe43667bbc2a25741091a Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Barnes <mbarnes@redhat.com>
|
||||
Date: Wed, 10 Mar 2010 12:38:32 +0000
|
||||
Subject: Bug 612374 - Build failure due to recent GTK+ deprecations
|
||||
|
||||
---
|
||||
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
|
||||
index ab06db9..12dd47d 100644
|
||||
--- a/calendar/gui/weekday-picker.c
|
||||
+++ b/calendar/gui/weekday-picker.c
|
||||
@@ -92,15 +92,18 @@ colorize_items (WeekdayPicker *wp)
|
||||
GdkColor *outline, *focus_outline;
|
||||
GdkColor *fill, *sel_fill;
|
||||
GdkColor *text_fill, *sel_text_fill;
|
||||
+ GtkStateType state;
|
||||
gint i;
|
||||
|
||||
priv = wp->priv;
|
||||
|
||||
- outline = >K_WIDGET (wp)->style->fg[GTK_WIDGET_STATE (wp)];
|
||||
- focus_outline = >K_WIDGET (wp)->style->bg[GTK_WIDGET_STATE (wp)];
|
||||
+ state = gtk_widget_get_state (GTK_WIDGET (wp));
|
||||
|
||||
- fill = >K_WIDGET (wp)->style->base[GTK_WIDGET_STATE (wp)];
|
||||
- text_fill = >K_WIDGET (wp)->style->fg[GTK_WIDGET_STATE (wp)];
|
||||
+ outline = >K_WIDGET (wp)->style->fg[state];
|
||||
+ focus_outline = >K_WIDGET (wp)->style->bg[state];
|
||||
+
|
||||
+ fill = >K_WIDGET (wp)->style->base[state];
|
||||
+ text_fill = >K_WIDGET (wp)->style->fg[state];
|
||||
|
||||
sel_fill = >K_WIDGET (wp)->style->bg[GTK_STATE_SELECTED];
|
||||
sel_text_fill = >K_WIDGET (wp)->style->fg[GTK_STATE_SELECTED];
|
||||
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
|
||||
index df65c25..70789c0 100644
|
||||
--- a/mail/e-mail-display.c
|
||||
+++ b/mail/e-mail-display.c
|
||||
@@ -98,10 +98,10 @@ mail_display_update_formatter_colors (EMailDisplay *display)
|
||||
EMFormatHTMLColorType type;
|
||||
EMFormatHTML *formatter;
|
||||
GdkColor *color;
|
||||
+ GtkStateType state;
|
||||
GtkStyle *style;
|
||||
- gint state;
|
||||
|
||||
- state = GTK_WIDGET_STATE (display);
|
||||
+ state = gtk_widget_get_state (GTK_WIDGET (display));
|
||||
formatter = display->priv->formatter;
|
||||
|
||||
style = gtk_widget_get_style (GTK_WIDGET (display));
|
||||
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
|
||||
index f38cb39..69f1fe8 100644
|
||||
--- a/widgets/table/e-table-field-chooser-item.c
|
||||
+++ b/widgets/table/e-table-field-chooser-item.c
|
||||
@@ -463,7 +463,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint w
|
||||
rows = e_table_header_count (etfci->combined_header);
|
||||
|
||||
style = GTK_WIDGET (canvas)->style;
|
||||
- state = GTK_WIDGET_STATE (canvas);
|
||||
+ state = gtk_widget_get_state (GTK_WIDGET (canvas));
|
||||
|
||||
y1 = y2 = 0;
|
||||
for (row = 0; row < rows; row++, y1 = y2) {
|
||||
@@ -519,6 +519,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
|
||||
GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
|
||||
GtkTargetList *list;
|
||||
GdkDragContext *context;
|
||||
+ GtkStateType state;
|
||||
ETableCol *ecol;
|
||||
GdkPixmap *pixmap;
|
||||
gint drag_col;
|
||||
@@ -552,8 +553,10 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
|
||||
button_height = e_table_header_compute_height (ecol, widget);
|
||||
pixmap = gdk_pixmap_new (widget->window, etfci->width, button_height, -1);
|
||||
|
||||
+ state = gtk_widget_get_state (widget);
|
||||
+
|
||||
e_table_header_draw_button (pixmap, ecol,
|
||||
- widget->style, GTK_WIDGET_STATE (widget),
|
||||
+ widget->style, state,
|
||||
widget,
|
||||
0, 0,
|
||||
etfci->width, button_height,
|
||||
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
|
||||
index 7c75b58..b2bcb59 100644
|
||||
--- a/widgets/table/e-table-header-item.c
|
||||
+++ b/widgets/table/e-table-header-item.c
|
||||
@@ -1000,6 +1000,7 @@ ethi_draw (GnomeCanvasItem *item,
|
||||
x2 += ethi->group_indent_width;
|
||||
for (col = 0; col < cols; col++, x1 = x2) {
|
||||
ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
|
||||
+ GtkStateType state;
|
||||
gint col_width;
|
||||
|
||||
col_width = ecol->width;
|
||||
@@ -1015,9 +1016,11 @@ ethi_draw (GnomeCanvasItem *item,
|
||||
if (x2 <= x1)
|
||||
continue;
|
||||
|
||||
+ state = gtk_widget_get_state (GTK_WIDGET (canvas));
|
||||
+
|
||||
e_table_header_draw_button (drawable, ecol,
|
||||
GTK_WIDGET (canvas)->style,
|
||||
- GTK_WIDGET_STATE (canvas),
|
||||
+ state,
|
||||
GTK_WIDGET (canvas),
|
||||
x1 - x, -y,
|
||||
width, height,
|
||||
@@ -1154,6 +1157,7 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
|
||||
GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
|
||||
GtkTargetList *list;
|
||||
GdkDragContext *context;
|
||||
+ GtkStateType state;
|
||||
ETableCol *ecol;
|
||||
gint col_width;
|
||||
GdkPixmap *pixmap;
|
||||
@@ -1210,10 +1214,12 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
|
||||
col_width = ecol->width;
|
||||
pixmap = gdk_pixmap_new (widget->window, col_width, ethi->height, -1);
|
||||
|
||||
+ state = gtk_widget_get_state (widget);
|
||||
+
|
||||
e_table_header_draw_button (
|
||||
pixmap, ecol,
|
||||
widget->style,
|
||||
- GTK_WIDGET_STATE (widget),
|
||||
+ state,
|
||||
widget,
|
||||
0, 0,
|
||||
col_width, ethi->height,
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 12 12:11:40 CET 2010 - dimstar@opensuse.org
|
||||
|
||||
- Update to version 2.29.92.1:
|
||||
+ Work around GTK_WIDGET_STATE deprecation so the tarball
|
||||
successfully builds against GTK+ 2.19.7.
|
||||
- Drop evolution-gtk2.19.7.patch.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 8 10:05:45 CET 2010 - dimstar@opensuse.org
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package evolution (Version 2.29.92)
|
||||
# spec file for package evolution (Version 2.29.92.1)
|
||||
#
|
||||
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -60,7 +60,7 @@ License: LGPLv2.0 ; LGPLv3
|
||||
Group: Productivity/Networking/Email/Clients
|
||||
# This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in.
|
||||
%define evolution_base_version 2.30
|
||||
Version: 2.29.92
|
||||
Version: 2.29.92.1
|
||||
Release: 1
|
||||
Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite
|
||||
Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2
|
||||
@ -94,8 +94,6 @@ Patch54: bnc-445996-address-conflict.patch
|
||||
Patch101: sp-process-meetings.diff
|
||||
# PATCH-FIX-UPSTREAM evolution-as-needed.patch bgo#589393 dominique-obs@leuenberger.net -- Fix configure with --as-needed
|
||||
Patch102: evolution-as-needed.patch
|
||||
# PATCH-FIX-UPSTREAM evolution-gtk2.19.7.patch bgo#612374 dimstar@opensuse.org -- Do not use deprecated symbols from gtk 2.19.7, patch from git commit 56e6bd4
|
||||
Patch103: evolution-gtk2.19.7.patch
|
||||
Url: http://gnome.org/projects/evolution/
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Recommends: bogofilter
|
||||
@ -202,7 +200,6 @@ gnome-patch-translation-prepare
|
||||
# NEEDS-REBASE
|
||||
#%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
gnome-patch-translation-update
|
||||
|
||||
%build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user