rpms/evolution/devel evolution-2.9.3-adopt-icons.patch, NONE, 1.1 evolution-2.9.3-dont-assume-default-account.patch, NONE, 1.1 .cvsignore, 1.61, 1.62 evolution-2.8.1-about-dialog.patch, 1.1, 1.2 evolution.spec, 1.207, 1.208 sources, 1.61, 1.62
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Dec 8 00:53:19 UTC 2006
Author: mbarnes
Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6715
Modified Files:
.cvsignore evolution-2.8.1-about-dialog.patch evolution.spec
sources
Added Files:
evolution-2.9.3-adopt-icons.patch
evolution-2.9.3-dont-assume-default-account.patch
Log Message:
* Thu Dec 07 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-1.fc7
- Update to 2.9.3
- Configure with scrollkeeper disabled.
- Ship our own icons from gnome-icon-theme.
- Add patch for RH bug #215695 (crashes w/o mail accounts).
- Add patch for RH bug #216537 (viewing attachments).
- Add patch for GNOME bug #350253 (ship our own icons).
- Add patch for GNOME bug #382431 (implicit function declaration).
- Revise patch for GNOME bug #360946 (improved "about" dialog).
- Remove patch for GNOME bug #357970 (fixed upstream).
evolution-2.9.3-adopt-icons.patch:
art/Makefile.am | 43 ++++++++++++++++++++++++++++++-------------
mail/em-format-html-print.c | 2 +-
mail/em-format-html.c | 27 ++++++++++++++++-----------
mail/em-format-html.h | 4 ++--
4 files changed, 49 insertions(+), 27 deletions(-)
--- NEW FILE evolution-2.9.3-adopt-icons.patch ---
--- evolution-2.9.3/mail/em-format-html-print.c.adopt-icons 2006-12-07 13:28:01.000000000 -0500
+++ evolution-2.9.3/mail/em-format-html-print.c 2006-12-07 13:28:28.000000000 -0500
@@ -56,7 +56,7 @@
efhp->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gtk_container_add((GtkContainer *)efhp->window, html);
gtk_widget_realize(html);
- efhp->formathtml.show_rupert = FALSE;
+ efhp->formathtml.show_icon = FALSE;
}
static void
--- evolution-2.9.3/mail/em-format-html.h.adopt-icons 2006-05-25 00:59:47.000000000 -0400
+++ evolution-2.9.3/mail/em-format-html.h 2006-12-07 13:28:28.000000000 -0500
@@ -162,7 +162,7 @@
* @mark_citations:1:
* @simple_headers:1:
* @hide_headers:1:
- * @show_rupert:1:
+ * @show_icon:1:
*
* Most of these fields are private or read-only.
*
@@ -192,7 +192,7 @@
unsigned int mark_citations:1;
unsigned int simple_headers:1; /* simple header format, no box/table */
unsigned int hide_headers:1; /* no headers at all */
- unsigned int show_rupert:1; /* whether we print rupert or not */
+ unsigned int show_icon:1; /* show an icon when the sender used Evo */
guint32 header_wrap_flags;
};
--- evolution-2.9.3/mail/em-format-html.c.adopt-icons 2006-12-07 13:28:01.000000000 -0500
+++ evolution-2.9.3/mail/em-format-html.c 2006-12-07 13:28:28.000000000 -0500
@@ -32,6 +32,7 @@
#include <ctype.h>
#include <glib.h>
+#include <gtk/gtk.h>
#ifdef G_OS_WIN32
/* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
#define DATADIR crap_DATADIR
@@ -156,7 +157,7 @@
efh->content_colour = 0xffffff;
efh->text_html_flags = CAMEL_MIME_FILTER_TOHTML_CONVERT_NL | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES
| CAMEL_MIME_FILTER_TOHTML_MARK_CITATION;
- efh->show_rupert = TRUE;
+ efh->show_icon = TRUE;
}
static void
@@ -1747,7 +1748,7 @@
const char *charset;
CamelContentType *ct;
struct _camel_header_raw *header;
- int rupert = FALSE;
+ gboolean have_icon = FALSE;
ct = camel_mime_part_get_content_type((CamelMimePart *)part);
charset = camel_content_type_param (ct, "charset");
@@ -1788,7 +1789,7 @@
efh_format_header (emf, stream, part, &xmailer, h->flags, charset);
if (strstr(header->value, "Evolution"))
- rupert = TRUE;
+ have_icon = TRUE;
} else if (!g_ascii_strcasecmp (header->name, h->name)) {
efh_format_header(emf, stream, part, header, h->flags, charset);
}
@@ -1801,19 +1802,23 @@
if (!efh->simple_headers) {
camel_stream_printf(stream, "</table></td>");
- if (rupert && efh->show_rupert) {
+ if (have_icon && efh->show_icon) {
+ GtkIconInfo *icon_info;
char *classid;
- CamelMimePart *iconpart;
- char *pngfile;
+ CamelMimePart *iconpart = NULL;
classid = g_strdup_printf("icon:///em-format-html/%s/icon/header", emf->part_id->str);
camel_stream_printf(stream, "<td align=\"right\" valign=\"top\"><img width=16 height=16 src=\"%s\"></td>", classid);
- pngfile = g_build_filename (EVOLUTION_ICONSDIR,
- "monkey-16.png",
- NULL);
- iconpart = em_format_html_file_part((EMFormatHTML *)emf, "image/png", pngfile);
- g_free (pngfile);
+ icon_info = gtk_icon_theme_lookup_icon (
+ gtk_icon_theme_get_default (),
+ "evolution", 16, GTK_ICON_LOOKUP_NO_SVG);
+ if (icon_info != NULL) {
+ iconpart = em_format_html_file_part (
+ (EMFormatHTML *) emf, "image/png",
+ gtk_icon_info_get_filename (icon_info));
+ gtk_icon_info_free (icon_info);
+ }
if (iconpart) {
em_format_add_puri(emf, sizeof(EMFormatPURI), classid, iconpart, efh_write_image);
--- evolution-2.9.3/art/Makefile.am.adopt-icons 2006-09-25 09:45:10.000000000 -0400
+++ evolution-2.9.3/art/Makefile.am 2006-12-07 13:28:38.000000000 -0500
@@ -1,8 +1,22 @@
+icon16dir = $(datadir)/icons/hicolor/16x16/apps
+icon16_DATA = 16x16/evolution.png
+
+icon22dir = $(datadir)/icons/hicolor/22x22/apps
+icon22_DATA = 22x22/evolution.png
+
+icon24dir = $(datadir)/icons/hicolor/24x24/apps
+icon24_DATA = 24x24/evolution.png
+
+icon32dir = $(datadir)/icons/hicolor/32x32/apps
+icon32_DATA = 32x32/evolution.png
+
+svgicondir = $(datadir)/icons/hicolor/scalable/apps
+svgicon_DATA = scalable/evolution.svg
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
images_DATA = \
- about-box.png \
- bcg.png \
evolution-contacts-mini.png \
- monkey-16.png \
offline.png \
online.png \
world_map-960.png \
@@ -10,15 +24,14 @@
plus.png \
minus.png
-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
- $(INSTALL_DATA) $(srcdir)/evolution.png $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
-if DEFAULT_BINARY
- cd $(DESTDIR)$(datadir)/pixmaps && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
-endif
-
-uninstall-local:
- rm -f $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
+install-data-hook:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
EXTRA_DIST = \
ChangeLog \
@@ -27,6 +40,10 @@
broken-image-16.xpm \
broken-image-24.xpm \
empty.xpm \
- evolution.png \
jump.xpm \
+ $(icon16_DATA) \
+ $(icon22_DATA) \
+ $(icon24_DATA) \
+ $(icon32_DATA) \
+ $(svgicon_DATA) \
$(images_DATA)
evolution-2.9.3-dont-assume-default-account.patch:
itip-utils.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE evolution-2.9.3-dont-assume-default-account.patch ---
--- evolution-2.9.3/calendar/gui/itip-utils.c.dont-assume-default-account 2006-10-25 23:00:41.000000000 -0400
+++ evolution-2.9.3/calendar/gui/itip-utils.c 2006-12-06 10:22:50.000000000 -0500
@@ -255,7 +255,7 @@
account address if the email address is not set in the backend */
/* FIXME do we have a better way ? */
a = itip_addresses_get_default ();
- address = g_strdup (a->id->address);
+ address = g_strdup ((a != NULL) ? a->id->address : "");
e_cal_component_free_attendee_list (attendees);
return address;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- .cvsignore 5 Dec 2006 12:36:29 -0000 1.61
+++ .cvsignore 8 Dec 2006 00:53:17 -0000 1.62
@@ -1 +1,6 @@
evolution-2.9.3.tar.bz2
+evolution16.png
+evolution22.png
+evolution24.png
+evolution32.png
+evolution.svg
evolution-2.8.1-about-dialog.patch:
e-shell-window-commands.c | 88 ++++++++++++++++------------------------------
main.c | 8 ----
2 files changed, 33 insertions(+), 63 deletions(-)
Index: evolution-2.8.1-about-dialog.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.8.1-about-dialog.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- evolution-2.8.1-about-dialog.patch 16 Oct 2006 19:21:38 -0000 1.1
+++ evolution-2.8.1-about-dialog.patch 8 Dec 2006 00:53:17 -0000 1.2
@@ -1,37 +1,5 @@
---- evolution-2.8.1/configure.in.about-dialog 2006-10-09 12:44:16.000000000 -0400
-+++ evolution-2.8.1/configure.in 2006-10-09 12:47:53.000000000 -0400
-@@ -1373,6 +1373,9 @@
- idldir="$datadir/idl/evolution-$BASE_VERSION"
- AC_SUBST(idldir)
-
-+pixmapsdir="$datadir/pixmaps"
-+AC_SUBST(pixmapsdir)
-+
- serverdir="$libdir/bonobo/servers"
- AC_SUBST(serverdir)
-
-@@ -1442,6 +1445,9 @@
- privconduitdir='${libdir}'/evolution/$BASE_VERSION/conduits
- AC_SUBST(privconduitdir)
-
-+logofile="$pixmapsdir/evolution-$BASE_VERSION.png"
-+AC_SUBST(logofile)
-+
- dnl ************************
- dnl IDL/Component Versioning
- dnl ************************
---- evolution-2.8.1/shell/Makefile.am.about-dialog 2005-12-21 21:12:34.000000000 -0500
-+++ evolution-2.8.1/shell/Makefile.am 2006-10-09 12:46:39.000000000 -0400
-@@ -11,6 +11,7 @@
- -DEVOLUTION_HELPDIR=\""$(evolutionhelpdir)"\" \
- -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
- -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \
-+ -DEVOLUTION_LOGO=\""$(logofile)"\" \
- -DPREFIX=\""$(prefix)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
---- evolution-2.8.1/shell/e-shell-window-commands.c.about-dialog 2006-09-04 08:10:54.000000000 -0400
-+++ evolution-2.8.1/shell/e-shell-window-commands.c 2006-10-09 12:44:16.000000000 -0400
+--- evolution-2.9.3/shell/e-shell-window-commands.c.about-dialog 2006-09-04 08:27:19.000000000 -0400
++++ evolution-2.9.3/shell/e-shell-window-commands.c 2006-12-06 06:37:37.000000000 -0500
@@ -24,14 +24,13 @@
#include <string.h>
@@ -61,7 +29,7 @@
/* Utility functions. */
static void
-@@ -547,62 +552,44 @@
+@@ -547,62 +552,33 @@
NULL
};
@@ -110,22 +78,28 @@
+ const char *path)
{
- static GtkWidget *about_box_window = NULL;
-+ GdkPixbuf *logo;
-+ gchar *translator_credits;
-+ GError *error = NULL;
-
+-
- if (about_box_window != NULL) {
- gdk_window_raise (about_box_window->window);
- return;
+- }
++ gchar *translator_credits;
+
+- about_box_window = about_box_new ();
+-
+- g_signal_connect (G_OBJECT (about_box_window), "destroy",
+- G_CALLBACK (gtk_widget_destroyed), &about_box_window);
+-
+- gtk_window_set_transient_for (GTK_WINDOW (about_box_window), GTK_WINDOW (window));
+-
+- gtk_widget_show (about_box_window);
+ /* The translator-credits string is for translators to list
-+ * per-language credits for translation, displayed in the
-+ * about dialog. */
++ * per-language credits for translation, displayed in the
++ * about dialog. */
+ translator_credits = _("translator-credits");
+ if (strcmp (translator_credits, "translator-credits") == 0)
+ translator_credits = NULL;
+
-+ logo = gdk_pixbuf_new_from_file (EVOLUTION_LOGO, &error);
-+
+ gtk_show_about_dialog (
+ GTK_WINDOW (window),
+ "name", "Evolution",
@@ -137,28 +111,12 @@
+ "authors", authors,
+ "documenters", documentors,
+ "translator-credits", translator_credits,
-+ "logo", logo,
++ "logo-icon-name", "evolution",
+ NULL);
-+
-+ if (logo != NULL)
-+ g_object_unref (logo);
-+ else {
-+ g_warning ("%s", error->message);
-+ g_error_free (error);
- }
--
-- about_box_window = about_box_new ();
--
-- g_signal_connect (G_OBJECT (about_box_window), "destroy",
-- G_CALLBACK (gtk_widget_destroyed), &about_box_window);
--
-- gtk_window_set_transient_for (GTK_WINDOW (about_box_window), GTK_WINDOW (window));
--
-- gtk_widget_show (about_box_window);
}
#if 0
-@@ -762,7 +749,7 @@
+@@ -762,7 +738,7 @@
static BonoboUIVerb help_verbs [] = {
BONOBO_UI_VERB ("QuickReference", (BonoboUIVerbFn) command_quick_reference),
BONOBO_UI_VERB ("HelpSubmitBug", (BonoboUIVerbFn) command_submit_bug),
@@ -167,24 +125,27 @@
BONOBO_UI_VERB_END
};
---- evolution-2.8.1/art/Makefile.am.about-dialog 2006-10-09 12:44:30.000000000 -0400
-+++ evolution-2.8.1/art/Makefile.am 2006-10-09 12:58:34.000000000 -0400
-@@ -11,14 +11,14 @@
- minus.png
-
- install-data-local:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps
-- $(INSTALL_DATA) $(srcdir)/evolution.png $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
-+ $(mkinstalldirs) $(DESTDIR)$(pixmapsdir)
-+ $(INSTALL_DATA) $(srcdir)/evolution.png $(DESTDIR)$(logofile)
- if DEFAULT_BINARY
-- cd $(DESTDIR)$(datadir)/pixmaps && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
-+ cd $(DESTDIR)$(pixmapsdir) && rm -f evolution.png && $(LN_S) evolution-$(BASE_VERSION).png evolution.png
- endif
-
- uninstall-local:
-- rm -f $(DESTDIR)$(datadir)/pixmaps/evolution-$(BASE_VERSION).png
-+ rm -f $(DESTDIR)$(logofile)
+--- evolution-2.9.3/shell/main.c.about-dialog 2006-12-06 06:36:51.000000000 -0500
++++ evolution-2.9.3/shell/main.c 2006-12-06 06:37:37.000000000 -0500
+@@ -504,7 +504,6 @@
+ GSList *uri_list;
+ GnomeProgram *program;
+ GOptionContext *context;
+- GList *icon_list;
+ char *filename;
+
+ /* Make ElectricFence work. */
+@@ -568,12 +567,7 @@
+ e_icon_factory_init ();
+ e_passwords_init();
+
+- icon_list = e_icon_factory_get_icon_list ("stock_mail");
+- if (icon_list) {
+- gtk_window_set_default_icon_list (icon_list);
+- g_list_foreach (icon_list, (GFunc) g_object_unref, NULL);
+- g_list_free (icon_list);
+- }
++ gtk_window_set_default_icon_name ("evolution");
- EXTRA_DIST = \
- ChangeLog \
+ if (setup_only)
+ exit (0);
Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- evolution.spec 5 Dec 2006 12:36:29 -0000 1.207
+++ evolution.spec 8 Dec 2006 00:53:17 -0000 1.208
@@ -50,6 +50,11 @@
URL: http://www.gnome.org/projects/evolution/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Source: %{name}-%{version}.tar.bz2
+Source1: evolution16.png
+Source2: evolution22.png
+Source3: evolution24.png
+Source4: evolution32.png
+Source5: evolution.svg
### Patches ###
@@ -143,6 +148,15 @@
# GNOME bug #382431
Patch38: evolution-2.9.3-implicit-function-declaration.patch
+# RH bug #215695 / GNOME bug #383027
+Patch39: evolution-2.9.3-dont-assume-default-account.patch
+
+# RH bug #216537 / GNOME bug #383047
+Patch40: evolution-2.9.3-view-attachment-uri.patch
+
+# GNOME bug #350253
+Patch41: evolution-2.9.3-adopt-icons.patch
+
## Dependencies ###
Requires: ORBit2 >= %{orbit2_version}
@@ -283,11 +297,24 @@
%patch36 -p1 -b .pilot-link-0.12
%patch37 -p1 -b .optional-participant
%patch38 -p1 -b .implicit-function-declaration
+%patch39 -p1 -b .dont-assume-default-account
+%patch40 -p1 -b .view-attachment-uri
+%patch41 -p1 -b .adopt-icons
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
mkdir -p krb5-fakeprefix/%{_lib}
+# GNOME bug #350253
+cd art
+mkdir 16x16; cp %{SOURCE1} 16x16/evolution.png
+mkdir 22x22; cp %{SOURCE2} 22x22/evolution.png
+mkdir 24x24; cp %{SOURCE3} 24x24/evolution.png
+mkdir 32x32; cp %{SOURCE4} 32x32/evolution.png
+mkdir scalable; cp %{SOURCE5} scalable/evolution.svg
+rm about-box.png bcg.png evolution.png monkey-16.png
+cd -
+
%build
# define all of our flags, this is kind of ugly :(
%if %{ldap_support}
@@ -366,6 +393,7 @@
autoconf
%configure \
+ --disable-scrollkeeper \
--enable-gtk-doc \
--enable-ipv6 \
--enable-file-locking=fcntl --enable-dot-locking=no \
@@ -434,11 +462,11 @@
for S in $SCHEMAS; do
gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null
done
-scrollkeeper-update
+scrollkeeper-update -q
%postun
/sbin/ldconfig
-scrollkeeper-update
+scrollkeeper-update -q
%clean
rm -rf $RPM_BUILD_ROOT
@@ -468,6 +496,13 @@
%{_datadir}/gnome/help/evolution
%{_datadir}/omf/evolution
+# Icons:
+%{_datadir}/icons/hicolor/16x16/apps/evolution.png
+%{_datadir}/icons/hicolor/22x22/apps/evolution.png
+%{_datadir}/icons/hicolor/24x24/apps/evolution.png
+%{_datadir}/icons/hicolor/32x32/apps/evolution.png
+%{_datadir}/icons/hicolor/scalable/apps/evolution.svg
+
# IDL files (should this be in devel subpackage?)
%{_datadir}/idl/evolution-%{evo_major}
@@ -476,8 +511,6 @@
%dir %{_datadir}/evolution
%{_datadir}/evolution/%{evo_major}
-%{_datadir}/pixmaps/evolution-%{evo_major}.png
-
# Bonobo components:
%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook_%{evo_major}.server
%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_%{evo_major}.server
@@ -685,9 +718,15 @@
%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
-* Mon Dec 04 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-1.fc7
+* Thu Dec 07 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.3-1.fc7
- Update to 2.9.3
+- Configure with scrollkeeper disabled.
+- Ship our own icons from gnome-icon-theme.
+- Add patch for RH bug #215695 (crashes w/o mail accounts).
+- Add patch for RH bug #216537 (viewing attachments).
+- Add patch for GNOME bug #350253 (ship our own icons).
- Add patch for GNOME bug #382431 (implicit function declaration).
+- Revise patch for GNOME bug #360946 (improved "about" dialog).
- Remove patch for GNOME bug #357970 (fixed upstream).
* Tue Nov 28 2006 Matthew Barnes <mbarnes at redhat.com> - 2.9.2-3.fc7
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- sources 5 Dec 2006 12:36:29 -0000 1.61
+++ sources 8 Dec 2006 00:53:17 -0000 1.62
@@ -1 +1,6 @@
03c29ef09dbd1b04623f736cbd8e14a7 evolution-2.9.3.tar.bz2
+4737f9b111e5e4b2fccc9e9b464c4b01 evolution16.png
+de663fa442d61f53dc058dd20c77da8e evolution22.png
+d33896d33b5db2201e051664e96b1100 evolution24.png
+2fa4ce12c94153aca9af465e1a1819c8 evolution32.png
+e85874e8d480a9c82bc155da396a54e4 evolution.svg
More information about the fedora-cvs-commits
mailing list