From 13762f85b67a7d7cfd88686480d7434a47f321ce Mon Sep 17 00:00:00 2001 From: "John N. Laliberte" Date: Fri, 22 Jul 2005 02:21:56 +0000 Subject: fix linking problems as reported in #85013 and #92682. Package-Manager: portage-2.0.51.22-r2 --- mail-client/evolution/ChangeLog | 9 +- mail-client/evolution/Manifest | 33 ++-- mail-client/evolution/evolution-2.2.3-r1.ebuild | 183 -------------------- mail-client/evolution/evolution-2.2.3-r2.ebuild | 186 +++++++++++++++++++++ .../evolution/files/digest-evolution-2.2.3-r1 | 1 - .../evolution/files/digest-evolution-2.2.3-r2 | 1 + .../files/evolution-2.2.3-linking-fix.patch | 35 ++++ 7 files changed, 247 insertions(+), 201 deletions(-) delete mode 100644 mail-client/evolution/evolution-2.2.3-r1.ebuild create mode 100644 mail-client/evolution/evolution-2.2.3-r2.ebuild delete mode 100644 mail-client/evolution/files/digest-evolution-2.2.3-r1 create mode 100644 mail-client/evolution/files/digest-evolution-2.2.3-r2 create mode 100644 mail-client/evolution/files/evolution-2.2.3-linking-fix.patch (limited to 'mail-client/evolution') diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog index ccbf5f9f8c08..4f8705d38e80 100644 --- a/mail-client/evolution/ChangeLog +++ b/mail-client/evolution/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-client/evolution # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.79 2005/07/18 05:07:16 leonardop Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.80 2005/07/22 02:21:55 allanonjl Exp $ + +*evolution-2.2.3-r2 (21 Jul 2005) + + 21 Jul 2005; John N. Laliberte + +files/evolution-2.2.3-linking-fix.patch, -evolution-2.2.3-r1.ebuild, + +evolution-2.2.3-r2.ebuild: + fix linking problems as reported in #85013 and #92682. *evolution-2.2.3-r1 (17 Jul 2005) diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest index f4b692da0554..2198f216595a 100644 --- a/mail-client/evolution/Manifest +++ b/mail-client/evolution/Manifest @@ -1,23 +1,24 @@ -MD5 9a733bae3866a45558a21cc34dad50fa ChangeLog 27674 +MD5 2a8ad9a4f1ef4a19c4188cfd749805b1 evolution-2.2.1.1.ebuild 4485 MD5 3318548ad5a620ebd3b5405ef77100fd evolution-1.2.4.ebuild 6254 -MD5 6863c6f78e61559a49ad1fcaffaf9caf evolution-2.2.3-r1.ebuild 5848 +MD5 adad3a1145fdfc65e0d250f24eb8d2d0 evolution-2.2.3-r2.ebuild 5982 +MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093 MD5 b2bf22eca079cbb39f39c374cb306715 evolution-2.0.3-r2.ebuild 4206 +MD5 6e096910f5a93141405bc204f82c560c ChangeLog 27925 MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272 -MD5 249e276509b42a3954b5935626218dab evolution-2.0.4.ebuild 4093 -MD5 2a8ad9a4f1ef4a19c4188cfd749805b1 evolution-2.2.1.1.ebuild 4485 -MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131 -MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570 +MD5 231c671de5ffec656f15c352abe8dcc4 files/evolution-2.2-mark-as.patch 2283 +MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662 +MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467 MD5 37b21b99689c8ad1b67df7ed2425e6cc files/evolution-2.2.3-credits.patch 1838 -MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r1 70 -MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70 MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689 -MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370 -MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470 -MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733 -MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467 -MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662 -MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737 -MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70 -MD5 231c671de5ffec656f15c352abe8dcc4 files/evolution-2.2-mark-as.patch 2283 MD5 5c653e85cdd60291967915b55df80e82 files/digest-evolution-2.2.1.1 72 +MD5 2381d584d4a3104a6c491b21ecc0bc47 files/evolution_mail-account-gui_authtype.diff 737 +MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470 MD5 80037ae3781636f2ddad3a09bf628ebc files/evolution-2.2-pilot.patch 998 +MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70 +MD5 5a8c8a5e4d082901feeb677b0e68cb2c files/digest-evolution-2.2.3-r2 70 +MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131 +MD5 75a9be02c12e91b5ddedbdfd11c07e03 files/digest-evolution-2.0.4 70 +MD5 aa077f2d45a8f2def9094b367f1eb60e files/evolution-2.2.3-mail_notify.patch 570 +MD5 a71bb4ab71d2e4cc5e02649d87f36e12 files/evolution-2.2.3-configure_plugins.patch 2733 +MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370 +MD5 388d698898d1346cb7007da471abed11 files/evolution-2.2.3-linking-fix.patch 1491 diff --git a/mail-client/evolution/evolution-2.2.3-r1.ebuild b/mail-client/evolution/evolution-2.2.3-r1.ebuild deleted file mode 100644 index abd12105a60f..000000000000 --- a/mail-client/evolution/evolution-2.2.3-r1.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.3-r1.ebuild,v 1.1 2005/07/18 05:07:16 leonardop Exp $ - -inherit eutils flag-o-matic alternatives gnome2 - -DESCRIPTION="Integrated mail, addressbook and calendaring functionality" -HOMEPAGE="http://www.gnome.org/projects/evolution/" - -LICENSE="GPL-2 FDL-1.1" -SLOT="2.0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda spell ssl static" - -# Top stanza are ximian deps -# Pango dependency required to avoid font rendering problems -RDEPEND=">=gnome-extra/libgtkhtml-3.6.2 - >=gnome-extra/gal-2.4.2 - >=gnome-extra/evolution-data-server-1.2.2 - >=net-libs/libsoup-2.2 - >=dev-libs/glib-2 - >=dev-libs/libxml2-2 - >=x11-libs/pango-1.8.1 - >=gnome-base/gconf-2 - >=gnome-base/libglade-2 - >=gnome-base/gnome-vfs-2.4 - >=gnome-base/libbonoboui-2.4.2 - >=gnome-base/libgnomecanvas-2 - >=gnome-base/libgnome-2 - >=gnome-base/libgnomeui-2 - >=gnome-base/libgnomeprint-2.2 - >=gnome-base/libgnomeprintui-2.2 - >=x11-themes/gnome-icon-theme-1.2 - dev-libs/atk - >=gnome-base/orbit-2.9.8 - mail-filter/spamassassin - pda? ( >=app-pda/gnome-pilot-2 - >=app-pda/gnome-pilot-conduits-2 ) - spell? ( >=app-text/gnome-spell-1.0.5 ) - crypt? ( >=app-crypt/gnupg-1.2.2 ) - ssl? ( mozilla? ( www-client/mozilla ) - !mozilla? ( >=dev-libs/nspr-4.4.1 - >=dev-libs/nss-3.9.2 ) ) - ldap? ( >=net-nds/openldap-2 ) - kerberos? ( virtual/krb5 ) - krb4? ( virtual/krb5 ) - gstreamer? ( =media-libs/gstreamer-0.8* - =media-libs/gst-plugins-0.8* ) - dbus? ( =dev-lang/mono-1 )" - -DEPEND="${RDEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.30 - sys-devel/gettext - sys-devel/bison - app-text/scrollkeeper - doc? ( >=dev-util/gtk-doc-0.6 )" - -USE_DESTDIR="1" -DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" -ELTCONF="--reverse-deps" - -src_unpack() { - unpack ${A} - cd ${S} - - # Fix potential crash in the DBUS notification plugin. See bug #95917. - epatch ${FILESDIR}/${P}-mail_notify.patch - # Fix display of credits. See bug #98491. - epatch ${FILESDIR}/${P}-credits.patch - # Accept the list of plugins separated by commas instead of spaces. - epatch ${FILESDIR}/${P}-configure_plugins.patch - - einfo "Running autoconf" - autoconf || die "Autoconf failed" -} - -src_compile() { - local myconf="--disable-default-binary --without-kde-applnk-path \ - $(use_enable static) $(use_enable ssl nss) $(use_enable ssl smime) \ - $(use_enable ipv6) $(use_enable mono) $(use_enable nntp) \ - $(use_enable pda pilot-conduits) $(use_with ldap openldap) \ - $(use_with kerberos krb5 /usr)" - - use ldap && myconf="${myconf} $(use_with static static-ldap)" - - if use krb4 && ! built_with_use virtual/krb5 krb4; then - ewarn - ewarn "In order to add kerberos 4 support, you have to emerge" - ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well." - ewarn - ewarn "Skipping for now." - ewarn - myconf="${myconf} --without-krb4" - else - myconf="${myconf} $(use_with krb4 krb4 /usr)" - fi - - # problems with -O3 on gcc-3.3.1 - replace-flags -O3 -O2 - - if [ "${ARCH}" = "hppa" ]; then - append-flags "-fPIC -ffunction-sections" - export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000" - fi - - # Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE - # Use standalone NSS/NSPR if only 'ssl' in USE - # Openssl support doesn't work and has been disabled in cvs - # SSL support has almost entirely moved to e-d-s, - # keep an eye on it in rev-bumps (HAVE_SSL) - # - - if use ssl ; then - if use mozilla ; then - NSS_LIB=/usr/$(get_libdir)/mozilla - NSPR_LIB=/usr/$(get_libdir)/mozilla - NSS_INC=/usr/$(get_libdir)/mozilla/include/nss - NSPR_INC=/usr/$(get_libdir)/mozilla/include/nspr - else - NSS_LIB=/usr/$(get_libdir)/nss - NSPR_LIB=/usr/$(get_libdir)/nspr - NSS_INC=/usr/include/nss - NSPR_INC=/usr/include/nspr - fi - - myconf="${myconf} --enable-nss=yes \ - --with-nspr-includes=${NSPR_INC} \ - --with-nspr-libs=${NSPR_LIB} \ - --with-nss-includes=${NSS_INC} \ - --with-nss-libs=${NSS_LIB}" - else - myconf="${myconf} --without-nspr-libs --without-nspr-includes \ - --without-nss-libs --without-nss-includes" - fi - - # Plug-ins to install. Normally we would want something similar to - # --enable-plugins=all (plugins_base + plugins_standard), except for some - # special cases. - local plugins="calendar-file calendar-http calendar-weather \ - groupwise-account-setup itip-formatter plugin-manager send-options \ - shared-folder groupwise-send-options exchange-account-setup \ - groupwise-status-tracking default-source addressbook-file \ - addressbook-groupwise startup-wizard bbdb subject-thread save-attachments \ - prefer-plain save-calendar select-one-source copy-tool mail-to-task \ - folder-unsubscribe mark-calendar-offline mailing-list-actions" - - # The special cases - use gstreamer && plugins="${plugins} audio-inline" - use dbus && plugins="${plugins} new-mail-notify" - - local pluginlist="" - for p in $plugins; do - [ "x$pluginlist" != "x" ] && pluginlist="${pluginlist}," - pluginlist="${pluginlist}${p}" - done - - myconf="${myconf} --enable-plugins=${pluginlist}" - - G2CONF="${G2CONF} ${myconf}" - - gnome2_src_compile -} - -src_install() { - - # work around #92920 FIXME - gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/ - -} - -pkg_postinst() { - - alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]" - gnome2_gconf_install ${GCONFFILEPATH} - einfo "To change the default browser if you are not using GNOME, do:" - einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'" - einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'" - einfo "" - einfo "Replace 'mozilla %s' with which ever browser you use." - -} diff --git a/mail-client/evolution/evolution-2.2.3-r2.ebuild b/mail-client/evolution/evolution-2.2.3-r2.ebuild new file mode 100644 index 000000000000..7b1407a314b0 --- /dev/null +++ b/mail-client/evolution/evolution-2.2.3-r2.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.2.3-r2.ebuild,v 1.1 2005/07/22 02:21:56 allanonjl Exp $ + +inherit eutils flag-o-matic alternatives gnome2 + +DESCRIPTION="Integrated mail, addressbook and calendaring functionality" +HOMEPAGE="http://www.gnome.org/projects/evolution/" + +LICENSE="GPL-2 FDL-1.1" +SLOT="2.0" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="crypt dbus debug doc gstreamer ipv6 kerberos krb4 ldap mono mozilla nntp pda spell ssl static" + +# Top stanza are ximian deps +# Pango dependency required to avoid font rendering problems +RDEPEND=">=gnome-extra/libgtkhtml-3.6.2 + >=gnome-extra/gal-2.4.2 + >=gnome-extra/evolution-data-server-1.2.2 + >=net-libs/libsoup-2.2 + >=dev-libs/glib-2 + >=dev-libs/libxml2-2 + >=x11-libs/pango-1.8.1 + >=gnome-base/gconf-2 + >=gnome-base/libglade-2 + >=gnome-base/gnome-vfs-2.4 + >=gnome-base/libbonoboui-2.4.2 + >=gnome-base/libgnomecanvas-2 + >=gnome-base/libgnome-2 + >=gnome-base/libgnomeui-2 + >=gnome-base/libgnomeprint-2.2 + >=gnome-base/libgnomeprintui-2.2 + >=x11-themes/gnome-icon-theme-1.2 + dev-libs/atk + >=gnome-base/orbit-2.9.8 + mail-filter/spamassassin + pda? ( >=app-pda/gnome-pilot-2 + >=app-pda/gnome-pilot-conduits-2 ) + spell? ( >=app-text/gnome-spell-1.0.5 ) + crypt? ( >=app-crypt/gnupg-1.2.2 ) + ssl? ( mozilla? ( www-client/mozilla ) + !mozilla? ( >=dev-libs/nspr-4.4.1 + >=dev-libs/nss-3.9.2 ) ) + ldap? ( >=net-nds/openldap-2 ) + kerberos? ( virtual/krb5 ) + krb4? ( virtual/krb5 ) + gstreamer? ( =media-libs/gstreamer-0.8* + =media-libs/gst-plugins-0.8* ) + dbus? ( =dev-lang/mono-1 )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.30 + sys-devel/gettext + sys-devel/bison + app-text/scrollkeeper + doc? ( >=dev-util/gtk-doc-0.6 )" + +USE_DESTDIR="1" +DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README" +ELTCONF="--reverse-deps" + +src_unpack() { + unpack ${A} + cd ${S} + + # Fix potential crash in the DBUS notification plugin. See bug #95917. + epatch ${FILESDIR}/${P}-mail_notify.patch + # Fix display of credits. See bug #98491. + epatch ${FILESDIR}/${P}-credits.patch + # Accept the list of plugins separated by commas instead of spaces. + epatch ${FILESDIR}/${P}-configure_plugins.patch + # Fix for linking problems, #85013 and #92682 + epatch ${FILESDIR}/${P}-linking-fix.patch + + einfo "Running automake/autoconf" + automake || die "Automake failed" + autoconf || die "Autoconf failed" +} + +src_compile() { + local myconf="--disable-default-binary --without-kde-applnk-path \ + $(use_enable static) $(use_enable ssl nss) $(use_enable ssl smime) \ + $(use_enable ipv6) $(use_enable mono) $(use_enable nntp) \ + $(use_enable pda pilot-conduits) $(use_with ldap openldap) \ + $(use_with kerberos krb5 /usr)" + + use ldap && myconf="${myconf} $(use_with static static-ldap)" + + if use krb4 && ! built_with_use virtual/krb5 krb4; then + ewarn + ewarn "In order to add kerberos 4 support, you have to emerge" + ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well." + ewarn + ewarn "Skipping for now." + ewarn + myconf="${myconf} --without-krb4" + else + myconf="${myconf} $(use_with krb4 krb4 /usr)" + fi + + # problems with -O3 on gcc-3.3.1 + replace-flags -O3 -O2 + + if [ "${ARCH}" = "hppa" ]; then + append-flags "-fPIC -ffunction-sections" + export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000" + fi + + # Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE + # Use standalone NSS/NSPR if only 'ssl' in USE + # Openssl support doesn't work and has been disabled in cvs + # SSL support has almost entirely moved to e-d-s, + # keep an eye on it in rev-bumps (HAVE_SSL) + # + + if use ssl ; then + if use mozilla ; then + NSS_LIB=/usr/$(get_libdir)/mozilla + NSPR_LIB=/usr/$(get_libdir)/mozilla + NSS_INC=/usr/$(get_libdir)/mozilla/include/nss + NSPR_INC=/usr/$(get_libdir)/mozilla/include/nspr + else + NSS_LIB=/usr/$(get_libdir)/nss + NSPR_LIB=/usr/$(get_libdir)/nspr + NSS_INC=/usr/include/nss + NSPR_INC=/usr/include/nspr + fi + + myconf="${myconf} --enable-nss=yes \ + --with-nspr-includes=${NSPR_INC} \ + --with-nspr-libs=${NSPR_LIB} \ + --with-nss-includes=${NSS_INC} \ + --with-nss-libs=${NSS_LIB}" + else + myconf="${myconf} --without-nspr-libs --without-nspr-includes \ + --without-nss-libs --without-nss-includes" + fi + + # Plug-ins to install. Normally we would want something similar to + # --enable-plugins=all (plugins_base + plugins_standard), except for some + # special cases. + local plugins="calendar-file calendar-http calendar-weather \ + groupwise-account-setup itip-formatter plugin-manager send-options \ + shared-folder groupwise-send-options exchange-account-setup \ + groupwise-status-tracking default-source addressbook-file \ + addressbook-groupwise startup-wizard bbdb subject-thread save-attachments \ + prefer-plain save-calendar select-one-source copy-tool mail-to-task \ + folder-unsubscribe mark-calendar-offline mailing-list-actions" + + # The special cases + use gstreamer && plugins="${plugins} audio-inline" + use dbus && plugins="${plugins} new-mail-notify" + + local pluginlist="" + for p in $plugins; do + [ "x$pluginlist" != "x" ] && pluginlist="${pluginlist}," + pluginlist="${pluginlist}${p}" + done + + myconf="${myconf} --enable-plugins=${pluginlist}" + + G2CONF="${G2CONF} ${myconf}" + + gnome2_src_compile +} + +src_install() { + + # work around #92920 FIXME + gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/ + +} + +pkg_postinst() { + + alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]" + gnome2_gconf_install ${GCONFFILEPATH} + einfo "To change the default browser if you are not using GNOME, do:" + einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'" + einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'" + einfo "" + einfo "Replace 'mozilla %s' with which ever browser you use." + +} diff --git a/mail-client/evolution/files/digest-evolution-2.2.3-r1 b/mail-client/evolution/files/digest-evolution-2.2.3-r1 deleted file mode 100644 index 1991cc8b56f8..000000000000 --- a/mail-client/evolution/files/digest-evolution-2.2.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 1e01511c78b2dd0dcb8cf83521c167af evolution-2.2.3.tar.bz2 10435908 diff --git a/mail-client/evolution/files/digest-evolution-2.2.3-r2 b/mail-client/evolution/files/digest-evolution-2.2.3-r2 new file mode 100644 index 000000000000..1991cc8b56f8 --- /dev/null +++ b/mail-client/evolution/files/digest-evolution-2.2.3-r2 @@ -0,0 +1 @@ +MD5 1e01511c78b2dd0dcb8cf83521c167af evolution-2.2.3.tar.bz2 10435908 diff --git a/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch b/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch new file mode 100644 index 000000000000..c62eacd913c1 --- /dev/null +++ b/mail-client/evolution/files/evolution-2.2.3-linking-fix.patch @@ -0,0 +1,35 @@ +--- evolution-2.2.3/calendar/gui/Makefile.am 2005-01-07 06:38:57.000000000 -0500 ++++ evolution-2.2.3.new/calendar/gui/Makefile.am 2005-07-19 17:30:27.000000000 -0400 +@@ -216,6 +216,7 @@ + libevolution_calendar_la_LIBADD = \ + $(top_builddir)/widgets/menus/libmenus.la \ + $(top_builddir)/shell/libeshell.la \ ++ $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ + $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ + $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ +--- evolution-2.2.3/Makefile.am 2005-02-25 13:02:09.000000000 -0500 ++++ evolution-2.2.3.new/Makefile.am 2005-07-19 18:00:43.000000000 -0400 +@@ -40,10 +40,10 @@ + filter \ + $(SMIME_DIR) \ + addressbook \ +- calendar \ +- art \ + composer \ + mail \ ++ calendar \ ++ art \ + plugins \ + ui \ + views \ +--- evolution-2.2.1.1/mail/Makefile.am 2005-01-24 22:06:54.000000000 -0500 ++++ evolution-2.2.1.1.new/mail/Makefile.am 2005-07-18 21:59:53.000000000 -0400 +@@ -197,6 +197,7 @@ + $(top_builddir)/filter/libfilter.la \ + $(top_builddir)/widgets/menus/libmenus.la \ + $(top_builddir)/addressbook/util/libeabutil.la \ ++ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ + $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ + $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ + $(SMIME_LIB) \ -- cgit v1.2.3-65-gdbad