Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch
diff options
context:
space:
mode:
Diffstat (limited to 'net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch')
-rw-r--r--net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch608
1 files changed, 608 insertions, 0 deletions
diff --git a/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch b/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch
new file mode 100644
index 000000000000..034c466578a0
--- /dev/null
+++ b/net-mail/evolution/files/evolution-1.4.5-gtk-2.4.patch
@@ -0,0 +1,608 @@
+diff -uNr evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.am evolution-1.4.5/addressbook/backend/ebook/Makefile.am
+--- evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/backend/ebook/Makefile.am 2004-04-28 13:14:03.000000000 +0000
+@@ -45,8 +45,6 @@
+ -I$(top_builddir)/addressbook/ename \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/shell \
+- -DG_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ privlib_LTLIBRARIES = libebook.la libebook-static.la
+diff -uNr evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.in evolution-1.4.5/addressbook/backend/ebook/Makefile.in
+--- evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/backend/ebook/Makefile.in 2004-04-28 13:13:57.000000000 +0000
+@@ -263,8 +263,6 @@
+ -I$(top_builddir)/addressbook/ename \
+ -I$(top_builddir)/shell \
+ -I$(top_srcdir)/shell \
+- -DG_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/backend/pas/Makefile.am evolution-1.4.5/addressbook/backend/pas/Makefile.am
+--- evolution-1.4.5.orig/addressbook/backend/pas/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/backend/pas/Makefile.am 2004-04-28 13:14:10.000000000 +0000
+@@ -23,8 +23,6 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ LDAP_SCHEMA = \
+diff -uNr evolution-1.4.5.orig/addressbook/backend/pas/Makefile.in evolution-1.4.5/addressbook/backend/pas/Makefile.in
+--- evolution-1.4.5.orig/addressbook/backend/pas/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/backend/pas/Makefile.in 2004-04-28 13:14:15.000000000 +0000
+@@ -239,8 +239,6 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/component/Makefile.am evolution-1.4.5/addressbook/gui/component/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/component/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/component/Makefile.am 2004-04-28 13:16:39.000000000 +0000
+@@ -21,10 +21,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+ $(LDAP_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ component_LTLIBRARIES = libevolution-addressbook.la
+diff -uNr evolution-1.4.5.orig/addressbook/gui/component/Makefile.in evolution-1.4.5/addressbook/gui/component/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/component/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/component/Makefile.in 2004-04-28 13:16:44.000000000 +0000
+@@ -241,10 +241,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+ $(LDAP_CFLAGS) \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.am evolution-1.4.5/addressbook/gui/component/select-names/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/component/select-names/Makefile.am 2004-04-28 13:16:22.000000000 +0000
+@@ -43,10 +43,6 @@
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = libeselectnames.la
+diff -uNr evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.in evolution-1.4.5/addressbook/gui/component/select-names/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/component/select-names/Makefile.in 2004-04-28 13:16:28.000000000 +0000
+@@ -258,10 +258,6 @@
+ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.am evolution-1.4.5/addressbook/gui/contact-editor/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/contact-editor/Makefile.am 2004-04-28 13:16:07.000000000 +0000
+@@ -12,10 +12,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DG_LOG_DOMAIN=\"contact-editor\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.in evolution-1.4.5/addressbook/gui/contact-editor/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/contact-editor/Makefile.in 2004-04-28 13:16:01.000000000 +0000
+@@ -232,10 +232,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DG_LOG_DOMAIN=\"contact-editor\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.am evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.am 2004-04-28 13:15:40.000000000 +0000
+@@ -13,10 +13,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DG_LOG_DOMAIN=\"contact-list-editor\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.in evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/contact-list-editor/Makefile.in 2004-04-28 13:15:34.000000000 +0000
+@@ -233,10 +233,6 @@
+ -DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DG_LOG_DOMAIN=\"contact-list-editor\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/merging/Makefile.am evolution-1.4.5/addressbook/gui/merging/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/merging/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/merging/Makefile.am 2004-04-28 13:15:19.000000000 +0000
+@@ -4,10 +4,6 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/merging/Makefile.in evolution-1.4.5/addressbook/gui/merging/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/merging/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/merging/Makefile.in 2004-04-28 13:15:13.000000000 +0000
+@@ -224,10 +224,6 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/search/Makefile.am evolution-1.4.5/addressbook/gui/search/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/search/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/search/Makefile.am 2004-04-28 13:14:59.000000000 +0000
+@@ -13,10 +13,6 @@
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+ -DSEARCH_RULE_DIR=\"$(ruledir)\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/search/Makefile.in evolution-1.4.5/addressbook/gui/search/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/search/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/search/Makefile.in 2004-04-28 13:15:04.000000000 +0000
+@@ -233,10 +233,6 @@
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+ -DSEARCH_RULE_DIR=\"$(ruledir)\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.am evolution-1.4.5/addressbook/gui/widgets/Makefile.am
+--- evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/widgets/Makefile.am 2004-04-28 13:14:41.000000000 +0000
+@@ -11,10 +11,6 @@
+ -I$(top_srcdir)/addressbook/gui/component \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+ CORBA_COMPOSER_SOURCE_H = \
+diff -uNr evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.in evolution-1.4.5/addressbook/gui/widgets/Makefile.in
+--- evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/gui/widgets/Makefile.in 2004-04-28 13:14:48.000000000 +0000
+@@ -231,10 +231,6 @@
+ -I$(top_srcdir)/addressbook/gui/component \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_builddir)/shell \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+- -DLIBGNOME_DISABLE_DEPRECATED \
+- -DLIBGNOMEUI_DISABLE_DEPRECATED \
+ $(EVOLUTION_ADDRESSBOOK_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/addressbook/tools/Makefile.am evolution-1.4.5/addressbook/tools/Makefile.am
+--- evolution-1.4.5.orig/addressbook/tools/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/tools/Makefile.am 2004-04-28 13:13:21.000000000 +0000
+@@ -13,7 +13,6 @@
+ -I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+ evolution_addressbook_export_SOURCES = \
+diff -uNr evolution-1.4.5.orig/addressbook/tools/Makefile.in evolution-1.4.5/addressbook/tools/Makefile.in
+--- evolution-1.4.5.orig/addressbook/tools/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/addressbook/tools/Makefile.in 2004-04-28 13:13:25.000000000 +0000
+@@ -234,7 +234,6 @@
+ -I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/camel/Makefile.am evolution-1.4.5/camel/Makefile.am
+--- evolution-1.4.5.orig/camel/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/Makefile.am 2004-04-28 13:12:56.000000000 +0000
+@@ -16,7 +16,6 @@
+ -DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DG_LOG_DOMAIN=\"camel\" \
+- -DG_DISABLE_DEPRECATED \
+ $(CAMEL_CFLAGS)
+
+ libcamel_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/Makefile.in evolution-1.4.5/camel/Makefile.in
+--- evolution-1.4.5.orig/camel/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/Makefile.in 2004-04-28 13:12:50.000000000 +0000
+@@ -235,7 +235,6 @@
+ -DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DG_LOG_DOMAIN=\"camel\" \
+- -DG_DISABLE_DEPRECATED \
+ $(CAMEL_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/camel/providers/imap/Makefile.am evolution-1.4.5/camel/providers/imap/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/imap/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/imap/Makefile.am 2004-04-28 13:11:20.000000000 +0000
+@@ -14,8 +14,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-imap-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-imap-provider\"
+
+ libcamelimap_la_SOURCES = \
+ camel-imap-command.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/imap/Makefile.in evolution-1.4.5/camel/providers/imap/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/imap/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/imap/Makefile.in 2004-04-28 13:11:14.000000000 +0000
+@@ -233,8 +233,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-imap-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-imap-provider\"
+
+
+ libcamelimap_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/local/Makefile.am evolution-1.4.5/camel/providers/local/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/local/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/local/Makefile.am 2004-04-28 13:10:32.000000000 +0000
+@@ -14,8 +14,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-local-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-local-provider\"
+
+ libcamellocal_la_SOURCES = \
+ camel-local-folder.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/local/Makefile.in evolution-1.4.5/camel/providers/local/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/local/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/local/Makefile.in 2004-04-28 13:10:40.000000000 +0000
+@@ -233,8 +233,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-local-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-local-provider\"
+
+
+ libcamellocal_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/nntp/Makefile.am evolution-1.4.5/camel/providers/nntp/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/nntp/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/nntp/Makefile.am 2004-04-28 13:10:55.000000000 +0000
+@@ -13,8 +13,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-nntp-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-nntp-provider\"
+
+ libcamelnntp_la_SOURCES = \
+ camel-nntp-provider.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/nntp/Makefile.in evolution-1.4.5/camel/providers/nntp/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/nntp/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/nntp/Makefile.in 2004-04-28 13:11:01.000000000 +0000
+@@ -232,8 +232,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-nntp-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-nntp-provider\"
+
+
+ libcamelnntp_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/pop3/Makefile.am evolution-1.4.5/camel/providers/pop3/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/pop3/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/pop3/Makefile.am 2004-04-28 13:12:30.000000000 +0000
+@@ -15,8 +15,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-pop3-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-pop3-provider\"
+
+ libcamelpop3_la_SOURCES = \
+ camel-pop3-engine.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/pop3/Makefile.in evolution-1.4.5/camel/providers/pop3/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/pop3/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/pop3/Makefile.in 2004-04-28 13:12:37.000000000 +0000
+@@ -234,8 +234,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-pop3-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-pop3-provider\"
+
+
+ libcamelpop3_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/sendmail/Makefile.am evolution-1.4.5/camel/providers/sendmail/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/sendmail/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/sendmail/Makefile.am 2004-04-28 13:12:07.000000000 +0000
+@@ -14,8 +14,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-sendmail-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-sendmail-provider\"
+
+ libcamelsendmail_la_SOURCES = \
+ camel-sendmail-provider.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/sendmail/Makefile.in evolution-1.4.5/camel/providers/sendmail/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/sendmail/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/sendmail/Makefile.in 2004-04-28 13:11:57.000000000 +0000
+@@ -233,8 +233,7 @@
+ $(CAMEL_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ $(GTK_INCLUDEDIR) \
+- -DG_LOG_DOMAIN=\"camel-sendmail-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-sendmail-provider\"
+
+
+ libcamelsendmail_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/camel/providers/smtp/Makefile.am evolution-1.4.5/camel/providers/smtp/Makefile.am
+--- evolution-1.4.5.orig/camel/providers/smtp/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/smtp/Makefile.am 2004-04-28 13:11:44.000000000 +0000
+@@ -18,8 +18,7 @@
+ $(NSPR_CFLAGS) \
+ $(NSS_CFLAGS) \
+ $(OPENSSL_CFLAGS) \
+- -DG_LOG_DOMAIN=\"camel-smtp-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-smtp-provider\"
+
+ libcamelsmtp_la_SOURCES = \
+ camel-smtp-provider.c \
+diff -uNr evolution-1.4.5.orig/camel/providers/smtp/Makefile.in evolution-1.4.5/camel/providers/smtp/Makefile.in
+--- evolution-1.4.5.orig/camel/providers/smtp/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/camel/providers/smtp/Makefile.in 2004-04-28 13:11:37.000000000 +0000
+@@ -237,8 +237,7 @@
+ $(NSPR_CFLAGS) \
+ $(NSS_CFLAGS) \
+ $(OPENSSL_CFLAGS) \
+- -DG_LOG_DOMAIN=\"camel-smtp-provider\" \
+- -DG_DISABLE_DEPRECATED
++ -DG_LOG_DOMAIN=\"camel-smtp-provider\"
+
+
+ libcamelsmtp_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/composer/Makefile.am evolution-1.4.5/composer/Makefile.am
+--- evolution-1.4.5.orig/composer/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/composer/Makefile.am 2004-04-28 13:10:08.000000000 +0000
+@@ -54,8 +54,6 @@
+ -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \
+ -DPREFIX=\"$(prefix)\" \
+ -DG_LOG_DOMAIN=\"composer\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(EVOLUTION_MAIL_CFLAGS)
+
+ libcomposer_la_SOURCES = \
+diff -uNr evolution-1.4.5.orig/composer/Makefile.in evolution-1.4.5/composer/Makefile.in
+--- evolution-1.4.5.orig/composer/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/composer/Makefile.in 2004-04-28 13:10:00.000000000 +0000
+@@ -266,8 +266,6 @@
+ -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \
+ -DPREFIX=\"$(prefix)\" \
+ -DG_LOG_DOMAIN=\"composer\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(EVOLUTION_MAIL_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/e-util/Makefile.am evolution-1.4.5/e-util/Makefile.am
+--- evolution-1.4.5.orig/e-util/Makefile.am 2004-04-28 12:35:54.000000000 +0000
++++ evolution-1.4.5/e-util/Makefile.am 2004-04-28 13:09:47.000000000 +0000
+@@ -9,8 +9,6 @@
+ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \
+ -DG_LOG_DOMAIN=\"e-utils\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(DB3_CFLAGS) \
+ $(GNOME_PILOT_CFLAGS) \
+ $(E_UTIL_CFLAGS)
+diff -uNr evolution-1.4.5.orig/e-util/Makefile.in evolution-1.4.5/e-util/Makefile.in
+--- evolution-1.4.5.orig/e-util/Makefile.in 2004-04-28 12:35:54.000000000 +0000
++++ evolution-1.4.5/e-util/Makefile.in 2004-04-28 13:09:42.000000000 +0000
+@@ -229,8 +229,6 @@
+ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \
+ -DG_LOG_DOMAIN=\"e-utils\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(DB3_CFLAGS) \
+ $(GNOME_PILOT_CFLAGS) \
+ $(E_UTIL_CFLAGS)
+diff -uNr evolution-1.4.5.orig/filter/Makefile.am evolution-1.4.5/filter/Makefile.am
+--- evolution-1.4.5.orig/filter/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/filter/Makefile.am 2004-04-28 13:09:28.000000000 +0000
+@@ -8,8 +8,6 @@
+ -I $(top_srcdir)/shell \
+ -DFILTER_GLADEDIR=\"$(gladedir)\" \
+ -DG_LOG_DOMAIN=\"filter\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(LIBFILTER_CFLAGS)
+
+ noinst_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/filter/Makefile.in evolution-1.4.5/filter/Makefile.in
+--- evolution-1.4.5.orig/filter/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/filter/Makefile.in 2004-04-28 13:09:23.000000000 +0000
+@@ -228,8 +228,6 @@
+ -I $(top_srcdir)/shell \
+ -DFILTER_GLADEDIR=\"$(gladedir)\" \
+ -DG_LOG_DOMAIN=\"filter\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ $(LIBFILTER_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/mail/Makefile.am evolution-1.4.5/mail/Makefile.am
+--- evolution-1.4.5.orig/mail/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/mail/Makefile.am 2004-04-28 13:08:59.000000000 +0000
+@@ -34,8 +34,6 @@
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ -DG_LOG_DOMAIN=\"evolution-mail\"
+
+ component_LTLIBRARIES = libevolution-mail.la
+diff -uNr evolution-1.4.5.orig/mail/Makefile.in evolution-1.4.5/mail/Makefile.in
+--- evolution-1.4.5.orig/mail/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/mail/Makefile.in 2004-04-28 13:08:54.000000000 +0000
+@@ -254,8 +254,6 @@
+ -DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
+ -DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
+ -DPREFIX=\""$(prefix)"\" \
+- -DG_DISABLE_DEPRECATED \
+- -DGTK_DISABLE_DEPRECATED \
+ -DG_LOG_DOMAIN=\"evolution-mail\"
+
+
+diff -uNr evolution-1.4.5.orig/shell/Makefile.am evolution-1.4.5/shell/Makefile.am
+--- evolution-1.4.5.orig/shell/Makefile.am 2004-04-28 12:35:54.000000000 +0000
++++ evolution-1.4.5/shell/Makefile.am 2004-04-28 13:08:36.000000000 +0000
+@@ -1,8 +1,6 @@
+ SUBDIRS = glade importer
+
+ INCLUDES = \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+- -DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir)/libical/src/libical \
+diff -uNr evolution-1.4.5.orig/shell/Makefile.in evolution-1.4.5/shell/Makefile.in
+--- evolution-1.4.5.orig/shell/Makefile.in 2004-04-28 12:35:54.000000000 +0000
++++ evolution-1.4.5/shell/Makefile.in 2004-04-28 13:08:32.000000000 +0000
+@@ -221,8 +221,6 @@
+ SUBDIRS = glade importer
+
+ INCLUDES = \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+- -DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
+ -I$(top_srcdir)/widgets \
+ -I$(top_srcdir)/widgets/misc \
+ -I$(top_srcdir)/libical/src/libical \
+diff -uNr evolution-1.4.5.orig/tools/Makefile.am evolution-1.4.5/tools/Makefile.am
+--- evolution-1.4.5.orig/tools/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/tools/Makefile.am 2004-04-28 13:08:11.000000000 +0000
+@@ -21,7 +21,6 @@
+ -I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+ EXTRA_DIST = $(privlibexec_SCRIPTS) verify-evolution-install.sh \
+diff -uNr evolution-1.4.5.orig/tools/Makefile.in evolution-1.4.5/tools/Makefile.in
+--- evolution-1.4.5.orig/tools/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/tools/Makefile.in 2004-04-28 13:08:17.000000000 +0000
+@@ -242,7 +242,6 @@
+ -I$(top_srcdir)/addressbook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
+- -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+
+diff -uNr evolution-1.4.5.orig/widgets/misc/Makefile.am evolution-1.4.5/widgets/misc/Makefile.am
+--- evolution-1.4.5.orig/widgets/misc/Makefile.am 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/widgets/misc/Makefile.am 2004-04-28 13:07:48.000000000 +0000
+@@ -6,7 +6,6 @@
+ -I$(top_srcdir)/widgets/shortcut-bar \
+ -DMAP_DIR=\""$(imagesdir)"\" \
+ -DG_LOG_DOMAIN=__FILE__ \
+- -DG_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+ privlib_LTLIBRARIES = \
+diff -uNr evolution-1.4.5.orig/widgets/misc/Makefile.in evolution-1.4.5/widgets/misc/Makefile.in
+--- evolution-1.4.5.orig/widgets/misc/Makefile.in 2004-04-28 12:35:55.000000000 +0000
++++ evolution-1.4.5/widgets/misc/Makefile.in 2004-04-28 13:07:58.000000000 +0000
+@@ -227,7 +227,6 @@
+ -I$(top_srcdir)/widgets/shortcut-bar \
+ -DMAP_DIR=\""$(imagesdir)"\" \
+ -DG_LOG_DOMAIN=__FILE__ \
+- -DG_DISABLE_DEPRECATED \
+ $(GNOME_FULL_CFLAGS)
+
+