rpms/evolution/devel .cvsignore, 1.29, 1.30 evo-calendar-print-with-pango-4.patch, 1.1, 1.2 evolution.spec, 1.65, 1.66 sources, 1.29, 1.30
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Apr 12 03:17:27 UTC 2005
Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20050
Modified Files:
.cvsignore evo-calendar-print-with-pango-4.patch
evolution.spec sources
Log Message:
* Mon Apr 11 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.2-1
- 2.2.2
- updated evo-calendar-print-with-pango-4.patch to handle upstream change to print_comp_item
- removed patch for XB73912; now in upstream tarball
- removed patch to new-mail-notify; generalised fix to cope with various DBus API versions is now upstream
- removed patch for XB73844; now in upstream tarball
- Update requirements:
- gtkhtml3 from 3.6.1 to 3.6.2
- libgal2 from 2.4.1 to 2.4.2
- eds from 1.2.1 to 1.2.2
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 18 Mar 2005 17:28:40 -0000 1.29
+++ .cvsignore 12 Apr 2005 03:17:25 -0000 1.30
@@ -1 +1 @@
-evolution-2.2.1.1.tar.bz2
+evolution-2.2.2.tar.bz2
evo-calendar-print-with-pango-4.patch:
print.c | 744 ++++++++++++++++++++++++++++++++--------------------------------
1 files changed, 382 insertions(+), 362 deletions(-)
Index: evo-calendar-print-with-pango-4.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evo-calendar-print-with-pango-4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evo-calendar-print-with-pango-4.patch 2 Mar 2005 00:03:04 -0000 1.1
+++ evo-calendar-print-with-pango-4.patch 12 Apr 2005 03:17:25 -0000 1.2
@@ -1,10 +1,5 @@
-Index: calendar/gui/print.c
-===================================================================
-RCS file: /cvs/gnome/evolution/calendar/gui/print.c,v
-retrieving revision 1.72
-diff -u -p -r1.72 print.c
---- calendar/gui/print.c 4 Feb 2005 04:39:35 -0000 1.72
-+++ calendar/gui/print.c 22 Feb 2005 02:03:59 -0000
+--- evolution-2.2.2/calendar/gui/print.c.calendar-print-with-pango 2005-04-04 13:55:09.000000000 -0400
++++ evolution-2.2.2/calendar/gui/print.c 2005-04-11 20:23:13.000000000 -0400
@@ -59,6 +59,83 @@
#include "gnome-cal.h"
#include "print.h"
@@ -89,7 +84,7 @@
/*
-@@ -251,12 +328,10 @@ build_month (int month, int year, int *d
+@@ -251,12 +328,10 @@
*end = d_week + d_month - 1;
}
@@ -105,7 +100,7 @@
gchar *font_name;
if (weight <= GNOME_FONT_BOOK)
-@@ -267,22 +342,16 @@ get_font_for_size (double h, GnomeFontWe
+@@ -267,22 +342,16 @@
if (italic)
font_name = g_strconcat (font_name, " Italic", NULL);
@@ -135,7 +130,7 @@
}
enum align_box {
-@@ -384,18 +453,25 @@ print_rectangle (GnomePrintContext *pc,
+@@ -384,18 +453,25 @@
gnome_print_grestore (pc);
}
@@ -168,7 +163,7 @@
switch (align & 3) {
case ALIGN_LEFT:
-@@ -413,63 +489,68 @@ print_text(GnomePrintContext *pc, GnomeF
+@@ -413,63 +489,68 @@
/* Make sure we don't go off the left edge. */
x = MAX (l, x);
@@ -268,7 +263,7 @@
linewidth, -1.0);
*l += 2;
-@@ -477,7 +558,7 @@ titled_box (GnomePrintContext *pc, const
+@@ -477,7 +558,7 @@
*b += 2;
}
@@ -277,7 +272,7 @@
*t -= size * 1.4;
}
-@@ -553,14 +634,14 @@ instance_cb (ECalComponent *comp, time_t
+@@ -553,14 +634,14 @@
print out the month small, embolden any days with events.
*/
static void
@@ -294,7 +289,7 @@
time_t now, next;
int x, y;
int days[42];
-@@ -576,14 +657,14 @@ print_month_small (GnomePrintContext *pc
+@@ -576,14 +657,14 @@
/* Print the title, e.g. 'June 2001', in the top 16% of the area. */
format_date (month, titleflags, buf, 100);
header_size = (top - bottom) * 0.16;
@@ -313,7 +308,7 @@
top -= header_size;
-@@ -610,22 +691,22 @@ print_month_small (GnomePrintContext *pc
+@@ -610,22 +691,22 @@
tm = *convert_timet_to_struct_tm (month, zone);
build_month (tm.tm_mon, tm.tm_year + 1900, days, 0, 0);
@@ -341,7 +336,7 @@
left + x * col_width, left + (x + 1) * col_width,
top, top - row_height * 1.4);
weekday = (weekday + 1) % 7;
-@@ -665,12 +746,12 @@ print_month_small (GnomePrintContext *pc
+@@ -665,12 +746,12 @@
next = time_add_day_with_zone (now, 1, zone);
if ((now >= greystart && now < greyend)
|| (greystart >= now && greystart < next)) {
@@ -356,7 +351,7 @@
cell_left, text_right,
cell_top, cell_bottom);
-@@ -678,119 +759,53 @@ print_month_small (GnomePrintContext *pc
+@@ -678,119 +759,53 @@
}
}
}
@@ -507,7 +502,7 @@
double yinc, y;
double width = DAY_VIEW_TIME_COLUMN_WIDTH;
double font_size, max_font_size, hour_font_size, minute_font_size;
-@@ -798,19 +813,20 @@ print_day_background (GnomePrintContext
+@@ -798,19 +813,20 @@
const char *minute;
gboolean use_24_hour;
int i, hour, row;
@@ -535,7 +530,7 @@
/* Calculate the row height. */
yinc = (top - bottom) / (pdi->end_hour - pdi->start_hour);
-@@ -819,19 +835,20 @@ print_day_background (GnomePrintContext
+@@ -819,19 +835,20 @@
font_size = yinc * 0.6;
max_font_size = width * 0.5;
hour_font_size = MIN (font_size, max_font_size);
@@ -559,7 +554,7 @@
if (use_24_hour) {
hour = i;
-@@ -849,30 +866,30 @@ print_day_background (GnomePrintContext
+@@ -849,30 +866,30 @@
/* the hour label/minute */
sprintf (buf, "%d", hour);
@@ -602,7 +597,7 @@
}
-@@ -984,7 +1001,7 @@ free_event_array (GArray *array)
+@@ -984,7 +1001,7 @@
static void
@@ -611,7 +606,7 @@
double left, double right, double top, double bottom,
double row_height, EDayViewEvent *event,
struct pdinfo *pdi, ECalModel *model)
-@@ -1014,7 +1031,7 @@ print_day_long_event (GnomePrintContext
+@@ -1014,7 +1031,7 @@
y2 = y1 - row_height + 4;
red = green = blue = 0.95;
e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
@@ -620,7 +615,7 @@
left_triangle_width,
right_triangle_width);
-@@ -1033,8 +1050,7 @@ print_day_long_event (GnomePrintContext
+@@ -1033,8 +1050,7 @@
buffer, sizeof (buffer));
x1 += 4;
@@ -630,7 +625,7 @@
}
/* If the event ends before the end of the last day being printed,
-@@ -1052,8 +1068,7 @@ print_day_long_event (GnomePrintContext
+@@ -1052,8 +1068,7 @@
buffer, sizeof (buffer));
x2 -= 4;
@@ -640,7 +635,7 @@
}
/* Print the text. */
-@@ -1062,12 +1077,12 @@ print_day_long_event (GnomePrintContext
+@@ -1062,12 +1077,12 @@
x1 += 4;
x2 -= 4;
@@ -655,7 +650,7 @@
double left, double right, double top, double bottom,
EDayViewEvent *event, struct pdinfo *pdi, ECalModel *model)
{
-@@ -1110,7 +1125,7 @@ print_day_event (GnomePrintContext *pc,
+@@ -1110,7 +1125,7 @@
red = green = blue = 0.95;
e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
@@ -664,7 +659,7 @@
summary = icalcomponent_get_summary (event->comp_data->icalcomp);
text = summary ? (char*) summary : "";
-@@ -1140,7 +1155,7 @@ print_day_event (GnomePrintContext *pc,
+@@ -1140,7 +1155,7 @@
free_text = TRUE;
}
@@ -673,7 +668,7 @@
if (free_text)
g_free (text);
-@@ -1148,12 +1163,12 @@ print_day_event (GnomePrintContext *pc,
+@@ -1148,12 +1163,12 @@
static void
@@ -688,7 +683,7 @@
time_t start, end;
struct pdinfo pdi;
gint rows_in_top_display, i;
-@@ -1213,13 +1228,13 @@ print_day_details (GnomePrintContext *pc
+@@ -1213,13 +1228,13 @@
pdi.day_starts, &rows_in_top_display);
/* Print the long events. */
@@ -705,7 +700,7 @@
/* We always leave space for DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY in the
top display, but we may have more rows than that, in which case
-@@ -1228,8 +1243,8 @@ print_day_details (GnomePrintContext *pc
+@@ -1228,8 +1243,8 @@
DAY_VIEW_MIN_ROWS_IN_TOP_DISPLAY);
/* Draw the border around the long events. */
@@ -716,7 +711,7 @@
top, top - rows_in_top_display * DAY_VIEW_ROW_HEIGHT - 4,
1.0, -1.0);
-@@ -1237,7 +1252,7 @@ print_day_details (GnomePrintContext *pc
+@@ -1237,7 +1252,7 @@
top -= rows_in_top_display * DAY_VIEW_ROW_HEIGHT + 4;
/* Draw the borders, lines, and times down the left. */
@@ -725,7 +720,7 @@
left, right, top, bottom);
/* Now adjust to get rid of the time column. */
-@@ -1250,13 +1265,13 @@ print_day_details (GnomePrintContext *pc
+@@ -1250,13 +1265,13 @@
/* Print the short events. */
max_font_size = ((top - bottom) / pdi.rows) - 4;
font_size = MIN (DAY_NORMAL_FONT_SIZE, max_font_size);
@@ -742,7 +737,7 @@
/* Free everything. */
free_event_array (pdi.long_events);
-@@ -1285,7 +1300,7 @@ print_is_one_day_week_event (EWeekViewEv
+@@ -1285,7 +1300,7 @@
static void
@@ -751,7 +746,7 @@
struct psinfo *psi,
double x1, double x2, double y1, double y2,
EWeekViewEvent *event, EWeekViewEventSpan *span,
-@@ -1305,7 +1320,7 @@ print_week_long_event (GnomePrintContext
+@@ -1305,7 +1320,7 @@
if (event->end > psi->day_starts[span->start_day + span->num_days])
right_triangle_width = 4;
@@ -760,7 +755,7 @@
left_triangle_width,
right_triangle_width);
-@@ -1324,8 +1339,7 @@ print_week_long_event (GnomePrintContext
+@@ -1324,8 +1339,7 @@
buffer, sizeof (buffer));
x1 += 4;
@@ -770,7 +765,7 @@
}
/* If the event ends before the end of the last day being printed,
-@@ -1343,18 +1357,17 @@ print_week_long_event (GnomePrintContext
+@@ -1343,18 +1357,17 @@
buffer, sizeof (buffer));
x2 -= 4;
@@ -792,7 +787,7 @@
struct psinfo *psi,
double x1, double x2, double y1, double y2,
EWeekViewEvent *event, EWeekViewEventSpan *span,
-@@ -1374,15 +1387,14 @@ print_week_day_event (GnomePrintContext
+@@ -1374,15 +1387,14 @@
e_time_format_time (&date_tm, psi->use_24_hour_format, FALSE,
buffer, sizeof (buffer));
@@ -812,7 +807,7 @@
struct psinfo *psi,
double left, double top,
double cell_width, double cell_height,
-@@ -1448,11 +1460,11 @@ print_week_event (GnomePrintContext *pc,
+@@ -1448,11 +1460,11 @@
e_cal_model_get_rgb_color_for_component (model, event->comp_data, &red, &green, &blue);
if (print_is_one_day_week_event (event, span,
psi->day_starts)) {
@@ -826,7 +821,7 @@
x1, x2, y1, y2,
event, span, text, red, green, blue);
}
-@@ -1462,7 +1474,7 @@ print_week_event (GnomePrintContext *pc,
+@@ -1462,7 +1474,7 @@
static void
@@ -835,7 +830,7 @@
struct psinfo *psi,
double left, double top,
double cell_width, double cell_height)
-@@ -1473,7 +1485,7 @@ print_week_view_background (GnomePrintCo
+@@ -1473,7 +1485,7 @@
struct tm tm;
char *format_string, buffer[128];
@@ -844,7 +839,7 @@
for (day = 0; day < psi->days_shown; day++) {
e_week_view_layout_get_day_position
-@@ -1494,7 +1506,7 @@ print_week_view_background (GnomePrintCo
+@@ -1494,7 +1506,7 @@
if (psi->multi_week_view && (tm.tm_mon != psi->month))
fillcolor = 0.9;
@@ -853,7 +848,7 @@
if (psi->multi_week_view) {
if (tm.tm_mday == 1)
-@@ -1502,13 +1514,13 @@ print_week_view_background (GnomePrintCo
+@@ -1502,13 +1514,13 @@
else
format_string = "%d";
} else {
@@ -872,7 +867,7 @@
/* strftime format %A = full weekday name, %d = day of
month, %B = full month name. You can change the
-@@ -1519,7 +1531,7 @@ print_week_view_background (GnomePrintCo
+@@ -1519,7 +1531,7 @@
}
e_utf8_strftime (buffer, sizeof (buffer), format_string, &tm);
@@ -881,7 +876,7 @@
x1, x2 - 4, y1 - 2, y1 - 2 - font_size);
}
}
-@@ -1571,7 +1583,7 @@ print_week_summary_cb (ECalComponent *co
+@@ -1571,7 +1583,7 @@
}
static void
@@ -890,7 +885,7 @@
time_t whence, gboolean multi_week_view, int weeks_shown,
int month, double font_size,
double left, double right, double top, double bottom)
-@@ -1582,7 +1594,7 @@ print_week_summary (GnomePrintContext *p
+@@ -1582,7 +1594,7 @@
time_t day_start;
gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7], day, event_num;
GArray *spans;
@@ -899,7 +894,7 @@
double cell_width, cell_height;
ECalModel *model = gnome_calendar_get_calendar_model (gcal);
-@@ -1648,20 +1660,20 @@ print_week_summary (GnomePrintContext *p
+@@ -1648,20 +1660,20 @@
psi.rows_per_compressed_cell = (cell_height - psi.header_row_height)
/ psi.row_height;
@@ -924,7 +919,7 @@
/* Free everything. */
for (event_num = 0; event_num < psi.events->len; event_num++) {
-@@ -1673,7 +1685,7 @@ print_week_summary (GnomePrintContext *p
+@@ -1673,7 +1685,7 @@
static void
@@ -933,7 +928,7 @@
double left, double right, double top, double bottom,
int morerows)
{
-@@ -1707,7 +1719,7 @@ print_year_summary (GnomePrintContext *p
+@@ -1707,7 +1719,7 @@
for (col = 0; col < cols; col++) {
l = left + col_width * col;
r = l + col_width;
@@ -942,7 +937,7 @@
l + 8, r - 8, t - 8, b + 8,
DATE_MONTH, 0, 0, TRUE);
now = time_add_month_with_zone (now, 1, zone);
-@@ -1716,7 +1728,7 @@ print_year_summary (GnomePrintContext *p
+@@ -1716,7 +1728,7 @@
}
static void
@@ -951,7 +946,7 @@
double left, double right, double top, double bottom)
{
icaltimezone *zone = calendar_config_get_icaltimezone ();
-@@ -1724,7 +1736,7 @@ print_month_summary (GnomePrintContext *
+@@ -1724,7 +1736,7 @@
struct tm tm;
struct icaltimetype tt;
char buffer[100];
@@ -960,7 +955,7 @@
gboolean compress_weekend;
int columns, col, weekday, len, month;
double font_size, cell_width, x1, x2, y1, y2;
-@@ -1754,9 +1766,8 @@ print_month_summary (GnomePrintContext *
+@@ -1754,9 +1766,8 @@
tm = *convert_timet_to_struct_tm (date, zone);
tm.tm_mday = (tm.tm_mday % 7) + 7;
@@ -972,7 +967,7 @@
columns = compress_weekend ? 6 : 7;
cell_width = (right - left) / columns;
-@@ -1778,28 +1789,28 @@ print_month_summary (GnomePrintContext *
+@@ -1778,28 +1789,28 @@
x1 = left + cell_width * col;
x2 = x1 + cell_width;
@@ -1007,7 +1002,7 @@
double y, yend, x, xend;
struct icaltimetype *tt;
ECalendarTable *task_pad;
-@@ -1814,12 +1825,12 @@ print_todo_details (GnomePrintContext *p
+@@ -1814,12 +1825,12 @@
model = e_calendar_table_get_model (task_pad);
client = e_cal_model_get_default_client (model);
@@ -1024,7 +1019,7 @@
&left, &right, &top, &bottom, 1.0);
y = top - 3;
-@@ -1853,33 +1864,34 @@ print_todo_details (GnomePrintContext *p
+@@ -1853,33 +1864,34 @@
break;
/* Print the box to put the tick in. */
@@ -1072,7 +1067,7 @@
}
-@@ -1981,7 +1993,7 @@ range_selector_new (GtkWidget *dialog, t
+@@ -1981,7 +1993,7 @@
static void
@@ -1081,7 +1076,7 @@
double left, double right, double top, double bottom)
{
icaltimezone *zone = calendar_config_get_icaltimezone ();
-@@ -1993,29 +2005,29 @@ print_day_view (GnomePrintContext *pc, G
+@@ -1993,29 +2005,29 @@
todo = (right - left) * 0.75 + left;
header = top - HEADER_HEIGHT;
@@ -1117,7 +1112,7 @@
time_add_month_with_zone (date, 1, zone),
l, l + SMALL_MONTH_WIDTH,
top - 4, header + 4,
-@@ -2024,22 +2036,22 @@ print_day_view (GnomePrintContext *pc, G
+@@ -2024,22 +2036,22 @@
/* Print the date, e.g. '8th May, 2001'. */
format_date (date, DATE_DAY | DATE_MONTH | DATE_YEAR,
buf, 100);
@@ -1144,7 +1139,7 @@
double left, double right, double top, double bottom)
{
icaltimezone *zone = calendar_config_get_icaltimezone ();
-@@ -2051,7 +2063,7 @@ print_week_view (GnomePrintContext *pc,
+@@ -2051,7 +2063,7 @@
header = top - HEADER_HEIGHT;
@@ -1153,7 +1148,7 @@
tm = *convert_timet_to_struct_tm (date, zone);
week_start_day = calendar_config_get_week_start_day ();
-@@ -2066,27 +2078,27 @@ print_week_view (GnomePrintContext *pc,
+@@ -2066,27 +2078,27 @@
}
/* Print the main week view. */
@@ -1186,7 +1181,7 @@
time_add_month_with_zone (when, 1, zone),
l, l + SMALL_MONTH_WIDTH,
top - 4, header + 4,
-@@ -2095,21 +2107,21 @@ print_week_view (GnomePrintContext *pc,
+@@ -2095,21 +2107,21 @@
/* Print the start day of the week, e.g. '7th May 2001'. */
format_date (when, DATE_DAY | DATE_MONTH | DATE_YEAR, buf, 100);
@@ -1212,7 +1207,7 @@
double left, double right, double top, double bottom)
{
icaltimezone *zone = calendar_config_get_icaltimezone ();
-@@ -2118,21 +2130,21 @@ print_month_view (GnomePrintContext *pc,
+@@ -2118,21 +2130,21 @@
header = top - HEADER_HEIGHT;
@@ -1239,7 +1234,7 @@
time_add_month_with_zone (date, -1, zone),
left + 8, left + (right - left) / 7 - 2,
top - 4, header,
-@@ -2140,30 +2152,30 @@ print_month_view (GnomePrintContext *pc,
+@@ -2140,30 +2152,30 @@
/* Print the month, e.g. 'May 2001'. */
format_date (date, DATE_MONTH | DATE_YEAR, buf, 100);
@@ -1277,7 +1272,7 @@
}
static void
-@@ -2206,7 +2218,7 @@ get_zone_from_tzid (ECal *client, const
+@@ -2206,7 +2218,7 @@
}
static void
@@ -1286,7 +1281,7 @@
double left, double right, double top, double bottom)
{
icaltimezone *start_zone, *end_zone, *due_zone, *completed_zone;
-@@ -2274,15 +2286,15 @@ print_date_label (GnomePrintContext *pc,
+@@ -2274,15 +2286,15 @@
write_label_piece (due, buffer, 1024, _("Due "), NULL);
}
@@ -1305,7 +1300,7 @@
ECalComponentVType vtype;
ECalComponentText text;
GSList *desc, *l;
-@@ -2301,31 +2313,31 @@ print_comp_item (GnomePrintContext *pc,
+@@ -2301,24 +2313,24 @@
else
return;
@@ -1331,9 +1326,21 @@
- font = get_font_for_size (18, GNOME_FONT_BOLD, FALSE);
+ font = get_font_for_size (pr, 18, GNOME_FONT_BOLD, FALSE);
e_cal_component_get_summary (comp, &text);
-- top = bound_text (pc, font, text.value, left, right,
-+ top = bound_text (pr, font, text.value, left, right,
+ summary_string = g_strdup_printf (("%s %s"), _("Summary:"), text.value);
+- top = bound_text (pc, font, summary_string, left, right,
++ top = bound_text (pr, font, summary_string, left, right,
top - 3, bottom, 0);
+ g_free (summary_string);
+
+@@ -2328,17 +2340,17 @@
+ location_string = g_strdup_printf (("%s %s"),
+ _("Location:"),
+ location);
+- top = bound_text (pc, font, location_string, left, right,
++ top = bound_text (pr, font, location_string, left, right,
+ top - 3, bottom, 0);
+ g_free (location_string);
+ }
- g_object_unref (font);
+ pango_font_description_free (font);
@@ -1347,7 +1354,7 @@
/* For a VTODO we print the Status, Priority, % Complete and URL. */
if (vtype == E_CAL_COMPONENT_TODO) {
-@@ -2358,9 +2370,9 @@ print_comp_item (GnomePrintContext *pc,
+@@ -2371,9 +2383,9 @@
if (status_string) {
char *text = g_strdup_printf (_("Status: %s"),
status_string);
@@ -1359,7 +1366,7 @@
g_free (text);
}
}
-@@ -2374,9 +2386,9 @@ print_comp_item (GnomePrintContext *pc,
+@@ -2387,9 +2399,9 @@
e_cal_component_free_priority (priority);
text = g_strdup_printf (_("Priority: %s"), priority_string);
@@ -1371,7 +1378,7 @@
g_free (text);
}
-@@ -2388,9 +2400,9 @@ print_comp_item (GnomePrintContext *pc,
+@@ -2401,9 +2413,9 @@
percent_string = g_strdup_printf (_("Percent Complete: %i"), *percent);
e_cal_component_free_percent (percent);
@@ -1383,7 +1390,7 @@
}
-@@ -2400,9 +2412,9 @@ print_comp_item (GnomePrintContext *pc,
+@@ -2413,9 +2425,9 @@
char *url_string = g_strdup_printf (_("URL: %s"),
url);
@@ -1395,7 +1402,7 @@
g_free (url_string);
}
-@@ -2413,9 +2425,9 @@ print_comp_item (GnomePrintContext *pc,
+@@ -2426,9 +2438,9 @@
if (categories && categories[0]) {
categories_string = g_strdup_printf (_("Categories: %s"),
categories);
@@ -1407,7 +1414,7 @@
g_free (categories_string);
}
-@@ -2432,9 +2444,9 @@ print_comp_item (GnomePrintContext *pc,
+@@ -2445,9 +2457,9 @@
}
e_cal_component_free_text_list (contact_list);
@@ -1419,7 +1426,7 @@
g_string_free (contacts, TRUE);
}
-@@ -2447,12 +2459,12 @@ print_comp_item (GnomePrintContext *pc,
+@@ -2460,12 +2472,12 @@
ECalComponentText *text = l->data;
if (text->value != NULL)
@@ -1435,7 +1442,7 @@
}
void
-@@ -2461,7 +2473,7 @@ print_calendar (GnomeCalendar *gcal, gbo
+@@ -2474,7 +2486,7 @@
{
GnomePrintConfig *print_config;
GnomePrintJob *gpm;
@@ -1444,7 +1451,7 @@
double l, r, t, b;
char *old_orientation;
-@@ -2521,7 +2533,8 @@ print_calendar (GnomeCalendar *gcal, gbo
+@@ -2534,7 +2546,8 @@
gpm = gnome_print_job_new (print_config);
@@ -1454,7 +1461,7 @@
gnome_print_config_get_page_size (print_config, &r, &t);
/* See top of source for an explanation of this */
-@@ -2542,21 +2555,23 @@ print_calendar (GnomeCalendar *gcal, gbo
+@@ -2555,21 +2568,23 @@
/* depending on the view, do a different output */
switch (default_view) {
case PRINT_VIEW_DAY:
@@ -1482,7 +1489,7 @@
gnome_print_job_close (gpm);
if (preview) {
-@@ -2586,7 +2601,7 @@ print_comp (ECalComponent *comp, ECal *c
+@@ -2599,7 +2614,7 @@
{
GnomePrintConfig *print_config;
GnomePrintJob *gpm;
@@ -1491,7 +1498,7 @@
double l, r, t, b;
g_return_if_fail (comp != NULL);
-@@ -2626,7 +2641,7 @@ print_comp (ECalComponent *comp, ECal *c
+@@ -2639,7 +2654,7 @@
gpm = gnome_print_job_new (print_config);
@@ -1500,7 +1507,7 @@
gnome_print_config_get_page_size (print_config, &r, &t);
/* See top of source for an explanation of this */
-@@ -2644,9 +2659,11 @@ print_comp (ECalComponent *comp, ECal *c
+@@ -2657,9 +2672,11 @@
t *= (1.0 - TEMP_MARGIN);
r *= (1.0 - TEMP_MARGIN);
@@ -1513,7 +1520,7 @@
if (preview) {
GtkWidget *gpmp;
-@@ -2661,25 +2678,26 @@ print_comp (ECalComponent *comp, ECal *c
+@@ -2674,25 +2691,26 @@
}
static void
@@ -1551,7 +1558,7 @@
}
void
-@@ -2687,7 +2705,7 @@ print_table (ETable *etable, const char
+@@ -2700,7 +2718,7 @@
{
EPrintable *printable;
GnomePrintConfig *print_config;
@@ -1560,7 +1567,7 @@
GnomePrintJob *gpm;
double l, r, t, b, page_width, page_height, left_margin, bottom_margin;
-@@ -2731,7 +2749,7 @@ print_table (ETable *etable, const char
+@@ -2744,7 +2762,7 @@
gpm = gnome_print_job_new (print_config);
@@ -1569,7 +1576,7 @@
gnome_print_config_get_page_size (print_config, &r, &t);
-@@ -2757,20 +2775,22 @@ print_table (ETable *etable, const char
+@@ -2770,21 +2788,23 @@
bottom_margin = b;
do {
@@ -1594,8 +1601,9 @@
+ gnome_print_grestore (pr->pc);
+ gnome_print_showpage (pr->pc);
} while (e_printable_data_left (printable));
-+
-+ evo_calendar_print_data_free (pr);
++ evo_calendar_print_data_free (pr);
++
gnome_print_job_close (gpm);
+ if (preview) {
Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- evolution.spec 23 Mar 2005 15:46:17 -0000 1.65
+++ evolution.spec 12 Apr 2005 03:17:25 -0000 1.66
@@ -1,10 +1,10 @@
# no ppc64 mozilla
ExcludeArch: ppc64
-%define gal_version 2:2.4.1
-%define gtkhtml_version 3.6.1
+%define gal_version 2:2.4.2
+%define gtkhtml_version 3.6.2
%define soup_version 2.2.2
-%define eds_version 1.2.1
+%define eds_version 1.2.2
%define use_mozilla_nss 1
%define evo_major 2.2
%define libbonoboui_version 2.4.2
@@ -35,8 +35,8 @@
%define nntp_support 1
Name: evolution
-Version: 2.2.1.1
-Release: 2
+Version: 2.2.2
+Release: 1
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/
@@ -56,15 +56,8 @@
Patch100: evo-addressbook-print-with-pango-2.patch
Patch101: evo-calendar-print-with-pango-4.patch
-# patch from upstream:
-Patch102: evolution-2.2.0-XB73192.patch
-
-
-Patch103: evolution-2.2.0-fix-for-dbus31.patch
Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
-Patch105: evolution-2.2.1.1-XB73844.patch
-
# not accepted, but proposed on a few occasions. fixes problems with
# some cyrus servers
#Patch200: evolution-1.4.5-imap-command-length.patch
@@ -178,19 +171,10 @@
# patches sent upstream
%patch100 -p0 -b .addressbook-print-with-pango
-%patch101 -p0 -b .calendar-print-with-pango
-
-# patch from upstream:
-cd mail
-%patch102 -p0 -b .XB-73912
-cd ..
-
-%patch103 -p1 -b .fix-for-dbus31
+%patch101 -p1 -b .calendar-print-with-pango
%patch104 -p1 -b .port-to-pilot-link-0.12
-%patch105 -p0 -b .XB-73844
-
#patch200 -p1 -b .commandlength
#patch500 -p0 -b .wombatsm
@@ -349,6 +333,17 @@
%{_libdir}/evolution/%{evo_major}/*/*.a
%changelog
+* Mon Apr 11 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.2-1
+- 2.2.2
+- updated evo-calendar-print-with-pango-4.patch to handle upstream change to print_comp_item
+- removed patch for XB73912; now in upstream tarball
+- removed patch to new-mail-notify; generalised fix to cope with various DBus API versions is now upstream
+- removed patch for XB73844; now in upstream tarball
+- Update requirements:
+ - gtkhtml3 from 3.6.1 to 3.6.2
+ - libgal2 from 2.4.1 to 2.4.2
+ - eds from 1.2.1 to 1.2.2
+
* Wed Mar 23 2005 David Malcolm <dmalcolm at redhat.com> - 2.2.1.1-2
- Add patch for upstream bug XB73844 (should now be able to accept meeting requests)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 18 Mar 2005 17:28:40 -0000 1.29
+++ sources 12 Apr 2005 03:17:25 -0000 1.30
@@ -1 +1 @@
-0d41c89ace6485da3ef9c76ece68ae9c evolution-2.2.1.1.tar.bz2
+9b49942c8bdd1dc21f2d28792b12f400 evolution-2.2.2.tar.bz2
More information about the fedora-cvs-commits
mailing list