Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20522/crypto/finkinfo
Modified Files:
Tag: pangocairo-branch
evolution.patch
Log Message:
still trying to make things work
Index: evolution.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/evolution.patch,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- evolution.patch 23 Dec 2006 18:08:05 -0000 1.1.2.2
+++ evolution.patch 28 Dec 2006 15:45:29 -0000 1.1.2.3
@@ -1,6 +1,6 @@
diff -uNr evolution-2.8.2.1/configure evolution-2.8.2.1-new/configure
--- evolution-2.8.2.1/configure 2006-11-20 22:52:58.000000000 -0500
-+++ evolution-2.8.2.1-new/configure 2006-12-23 12:50:03.000000000 -0500
++++ evolution-2.8.2.1-new/configure 2006-12-26 09:47:18.000000000 -0500
@@ -12174,7 +12174,7 @@
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -73,3 +73,223 @@
else
sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
fi
+diff -uNr evolution-2.8.2.1/mail/em-folder-browser.c
evolution-2.8.2.1-new/mail/em-folder-browser.c
+--- evolution-2.8.2.1/mail/em-folder-browser.c 2006-09-29 03:37:55.000000000
-0400
++++ evolution-2.8.2.1-new/mail/em-folder-browser.c 2006-12-26
09:13:15.000000000 -0500
+@@ -98,7 +98,7 @@
+ #include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */
+
+ extern CamelSession *session;
+-CamelStore *vfolder_store; /* the 1 static vfolder store */
++extern CamelStore *vfolder_store; /* the static vfolder store comes from
mail-vfolder.c */
+
+ #define d(x)
+
+diff -uNr evolution-2.8.2.1/plugins/calendar-weather/Makefile.in
evolution-2.8.2.1-new/plugins/calendar-weather/Makefile.in
+--- evolution-2.8.2.1/plugins/calendar-weather/Makefile.in 2006-11-20
22:53:20.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/calendar-weather/Makefile.in 2006-12-26
09:45:11.000000000 -0500
+@@ -59,7 +59,7 @@
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ liborg_gnome_calendar_weather_la_DEPENDENCIES = \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(am__DEPENDENCIES_1)
+ am_liborg_gnome_calendar_weather_la_OBJECTS = calendar-weather.lo
+ liborg_gnome_calendar_weather_la_OBJECTS = \
+@@ -445,7 +445,7 @@
+ liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c
+ liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version
$(NO_UNDEFINED)
+ liborg_gnome_calendar_weather_la_LIBADD = \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(EVOLUTION_CALENDAR_LIBS)
+
+ EXTRA_DIST = \
+diff -uNr evolution-2.8.2.1/plugins/exchange-operations/Makefile.in
evolution-2.8.2.1-new/plugins/exchange-operations/Makefile.in
+--- evolution-2.8.2.1/plugins/exchange-operations/Makefile.in 2006-11-20
22:53:21.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/exchange-operations/Makefile.in
2006-12-26 09:45:53.000000000 -0500
+@@ -61,8 +61,7 @@
+ liborg_gnome_exchange_operations_la_DEPENDENCIES = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
+- $(top_builddir)/mail/libevolution-mail.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
+ $(am__DEPENDENCIES_1)
+ am_liborg_gnome_exchange_operations_la_OBJECTS = \
+@@ -477,8 +476,7 @@
+ liborg_gnome_exchange_operations_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
+- $(top_builddir)/mail/libevolution-mail.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la
\
+ $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
+ $(CAMEL_EXCHANGE_LIBS)
+
+diff -uNr evolution-2.8.2.1/plugins/groupwise-features/Makefile.in
evolution-2.8.2.1-new/plugins/groupwise-features/Makefile.in
+--- evolution-2.8.2.1/plugins/groupwise-features/Makefile.in 2006-11-20
22:53:22.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/groupwise-features/Makefile.in
2006-12-26 09:45:11.000000000 -0500
+@@ -62,7 +62,7 @@
+ am__DEPENDENCIES_2 =
+ liborg_gnome_groupwise_features_la_DEPENDENCIES = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/filter/libfilter.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+@@ -472,7 +472,7 @@
+
+ liborg_gnome_groupwise_features_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+ $(top_builddir)/filter/libfilter.la \
+ $(NO_UNDEFINED_REQUIRED_LIBS) \
+diff -uNr evolution-2.8.2.1/plugins/import-ics-attachments/Makefile.in
evolution-2.8.2.1-new/plugins/import-ics-attachments/Makefile.in
+--- evolution-2.8.2.1/plugins/import-ics-attachments/Makefile.in
2006-11-20 22:53:22.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/import-ics-attachments/Makefile.in
2006-12-26 09:46:21.000000000 -0500
+@@ -59,7 +59,6 @@
+ am__DEPENDENCIES_1 =
+ liborg_gnome_evolution_mail_attachments_import_ics_la_DEPENDENCIES = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/mail/libevolution-mail.la \
+ $(am__DEPENDENCIES_1)
+ am_liborg_gnome_evolution_mail_attachments_import_ics_la_OBJECTS = \
+ icsimporter.lo
+@@ -442,7 +441,6 @@
+ liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS = -module
-avoid-version $(NO_UNDEFINED)
+ liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/mail/libevolution-mail.la \
+ $(EVOLUTION_MAIL_LIBS)
+
+ EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml
+diff -uNr evolution-2.8.2.1/plugins/itip-formatter/Makefile.in
evolution-2.8.2.1-new/plugins/itip-formatter/Makefile.in
+--- evolution-2.8.2.1/plugins/itip-formatter/Makefile.in 2006-11-20
22:53:23.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/itip-formatter/Makefile.in 2006-12-26
09:46:25.000000000 -0500
+@@ -60,8 +60,7 @@
+ am__DEPENDENCIES_1 =
+ liborg_gnome_itip_formatter_la_DEPENDENCIES = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
+- $(top_builddir)/mail/libevolution-mail.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_liborg_gnome_itip_formatter_la_OBJECTS = itip-formatter.lo \
+ itip-view.lo
+@@ -435,8 +434,7 @@
+ liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version
$(NO_UNDEFINED)
+ liborg_gnome_itip_formatter_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
+- $(top_builddir)/mail/libevolution-mail.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(CAMEL_LIBS) \
+ $(EVOLUTION_CALENDAR_LIBS)
+
+diff -uNr evolution-2.8.2.1/plugins/mail-account-disable/Makefile.in
evolution-2.8.2.1-new/plugins/mail-account-disable/Makefile.in
+--- evolution-2.8.2.1/plugins/mail-account-disable/Makefile.in 2006-11-20
22:53:23.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/mail-account-disable/Makefile.in
2006-12-26 09:46:33.000000000 -0500
+@@ -59,7 +59,6 @@
+ am__DEPENDENCIES_1 =
+ libmail_account_disable_la_DEPENDENCIES = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/mail/libevolution-mail.la \
+ $(am__DEPENDENCIES_1)
+ am_libmail_account_disable_la_OBJECTS = mail-account-disable.lo
+ libmail_account_disable_la_OBJECTS = \
+@@ -431,7 +430,6 @@
+ libmail_account_disable_la_SOURCES = mail-account-disable.c
+ libmail_account_disable_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+ libmail_account_disable_la_LIBADD = $(top_builddir)/e-util/libeutil.la
\
+- $(top_builddir)/mail/libevolution-mail.la \
+ $(EVOLUTION_MAIL_LIBS)
+
+ EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml
+diff -uNr evolution-2.8.2.1/plugins/mark-all-read/Makefile.in
evolution-2.8.2.1-new/plugins/mark-all-read/Makefile.in
+--- evolution-2.8.2.1/plugins/mark-all-read/Makefile.in 2006-11-20
22:53:25.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/mark-all-read/Makefile.in 2006-12-26
09:46:44.000000000 -0500
+@@ -59,7 +59,6 @@
+ am__DEPENDENCIES_1 =
+ liborg_gnome_mark_all_read_la_DEPENDENCIES = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/mail/libevolution-mail.la \
+ $(am__DEPENDENCIES_1)
+ am_liborg_gnome_mark_all_read_la_OBJECTS = mark-all-read.lo
+ liborg_gnome_mark_all_read_la_OBJECTS = \
+@@ -431,7 +430,6 @@
+ liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+ liborg_gnome_mark_all_read_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/mail/libevolution-mail.la \
+ $(EVOLUTION_MAIL_LIBS)
+
+ EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
+diff -uNr evolution-2.8.2.1/plugins/print-message/Makefile.in
evolution-2.8.2.1-new/plugins/print-message/Makefile.in
+--- evolution-2.8.2.1/plugins/print-message/Makefile.in 2006-11-20
22:53:27.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/print-message/Makefile.in 2006-12-26
09:46:51.000000000 -0500
+@@ -59,7 +59,6 @@
+ am__DEPENDENCIES_1 =
+ liborg_gnome_print_message_la_DEPENDENCIES = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/mail/libevolution-mail.la \
+ $(am__DEPENDENCIES_1)
+ am_liborg_gnome_print_message_la_OBJECTS = print-message.lo
+ liborg_gnome_print_message_la_OBJECTS = \
+@@ -431,7 +430,6 @@
+ liborg_gnome_print_message_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+ liborg_gnome_print_message_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/mail/libevolution-mail.la \
+ $(EVOLUTION_MAIL_LIBS)
+
+ EXTRA_DIST = \
+diff -uNr evolution-2.8.2.1/plugins/publish-calendar/Makefile.in
evolution-2.8.2.1-new/plugins/publish-calendar/Makefile.in
+--- evolution-2.8.2.1/plugins/publish-calendar/Makefile.in 2006-11-20
22:53:27.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/publish-calendar/Makefile.in 2006-12-26
09:45:11.000000000 -0500
+@@ -59,7 +59,7 @@
+ am__DEPENDENCIES_1 =
+ liborg_gnome_publish_calendar_la_DEPENDENCIES = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(am__DEPENDENCIES_1)
+ am_liborg_gnome_publish_calendar_la_OBJECTS = publish-calendar.lo \
+ publish-format-fb.lo publish-format-ical.lo \
+@@ -447,7 +447,7 @@
+ liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version
$(NO_UNDEFINED)
+ liborg_gnome_publish_calendar_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(EVOLUTION_CALENDAR_LIBS)
+
+ EXTRA_DIST = \
+diff -uNr evolution-2.8.2.1/plugins/startup-wizard/Makefile.in
evolution-2.8.2.1-new/plugins/startup-wizard/Makefile.in
+--- evolution-2.8.2.1/plugins/startup-wizard/Makefile.in 2006-11-20
22:53:29.000000000 -0500
++++ evolution-2.8.2.1-new/plugins/startup-wizard/Makefile.in 2006-12-26
09:46:56.000000000 -0500
+@@ -61,8 +61,7 @@
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
+- $(top_builddir)/mail/libevolution-mail.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+ am_liborg_gnome_evolution_startup_wizard_la_OBJECTS = \
+ startup-wizard.lo
+@@ -437,8 +436,7 @@
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+- $(top_builddir)/calendar/gui/libevolution-calendar.la \
+- $(top_builddir)/mail/libevolution-mail.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la
\
+ $(EVOLUTION_CALENDAR_LIBS) \
+ $(EVOLUTION_MAIL_LIBS)
+
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
