Update of /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo
In directory sc8-pr-cvs17:/tmp/cvs-serv17382/crypto/finkinfo
Modified Files:
Tag: pangocairo-branch
evolution.patch gaim-ssl.info gaim-ssl.patch galeon.info
galeon.patch seamonkey.info
Log Message:
more build fixes
Index: evolution.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/evolution.patch,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- evolution.patch 21 Sep 2007 19:58:14 -0000 1.1.2.4
+++ evolution.patch 26 Sep 2007 00:12:39 -0000 1.1.2.5
@@ -1,6 +1,6 @@
diff -uNr evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c
evolution-2.12.0-new/addressbook/gui/contact-editor/e-contact-editor.c
---- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c
2007-09-16 14:52:39.000000000 -0400
-+++ evolution-2.12.0-new/addressbook/gui/contact-editor/e-contact-editor.c
2007-09-21 15:50:07.000000000 -0400
+--- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c
2007-09-16 13:52:39.000000000 -0500
++++ evolution-2.12.0-new/addressbook/gui/contact-editor/e-contact-editor.c
2007-09-25 09:16:47.000000000 -0500
@@ -48,6 +48,7 @@
#include <libebook/e-address-western.h>
#include <libedataserverui/e-source-option-menu.h>
@@ -9,9 +9,69 @@
#include <camel/camel.h>
#include "addressbook/gui/component/addressbook.h"
+diff -uNr evolution-2.12.0/calendar/conduits/calendar/Makefile.in
evolution-2.12.0-new/calendar/conduits/calendar/Makefile.in
+--- evolution-2.12.0/calendar/conduits/calendar/Makefile.in 2007-09-17
01:41:45.000000000 -0500
++++ evolution-2.12.0-new/calendar/conduits/calendar/Makefile.in
2007-09-25 09:24:47.000000000 -0500
+@@ -452,14 +452,14 @@
+ # Calendar Conduit
+ privconduit_LTLIBRARIES = libecalendar_conduit.la
+ libecalendar_conduit_la_SOURCES = \
+- calendar-conduit.c
++ calendar-conduit.c \
++ $(srcdir)/../libecalendar-common-conduit.c
+
+ libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+ libecalendar_conduit_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/e-util/libeconduit.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+- $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la
\
+ $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+
+ conduitdir = $(datadir)/gnome-pilot/conduits/
+diff -uNr evolution-2.12.0/calendar/conduits/memo/Makefile.in
evolution-2.12.0-new/calendar/conduits/memo/Makefile.in
+--- evolution-2.12.0/calendar/conduits/memo/Makefile.in 2007-09-17
01:41:46.000000000 -0500
++++ evolution-2.12.0-new/calendar/conduits/memo/Makefile.in 2007-09-25
09:27:38.000000000 -0500
+@@ -450,14 +450,14 @@
+ # Memo Conduit
+ privconduit_LTLIBRARIES = libememo_conduit.la
+ libememo_conduit_la_SOURCES = \
+- memo-conduit.c
++ memo-conduit.c \
++ $(srcdir)/../libecalendar-common-conduit.c
+
+ libememo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+ libememo_conduit_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/e-util/libeconduit.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+- $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la
\
+ $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+
+ conduitdir = $(datadir)/gnome-pilot/conduits/
+diff -uNr evolution-2.12.0/calendar/conduits/todo/Makefile.in
evolution-2.12.0-new/calendar/conduits/todo/Makefile.in
+--- evolution-2.12.0/calendar/conduits/todo/Makefile.in 2007-09-17
01:41:46.000000000 -0500
++++ evolution-2.12.0-new/calendar/conduits/todo/Makefile.in 2007-09-25
09:28:11.000000000 -0500
+@@ -450,14 +450,14 @@
+ # ToDo Conduit
+ privconduit_LTLIBRARIES = libetodo_conduit.la
+ libetodo_conduit_la_SOURCES = \
+- todo-conduit.c
++ todo-conduit.c \
++ $(srcdir)/../libecalendar-common-conduit.c
+
+ libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+ libetodo_conduit_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/e-util/libeconduit.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+- $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la
\
+ $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
+
+ conduitdir = $(datadir)/gnome-pilot/conduits/
diff -uNr evolution-2.12.0/composer/e-msg-composer-hdrs.c
evolution-2.12.0-new/composer/e-msg-composer-hdrs.c
---- evolution-2.12.0/composer/e-msg-composer-hdrs.c 2007-09-16
15:18:00.000000000 -0400
-+++ evolution-2.12.0-new/composer/e-msg-composer-hdrs.c 2007-09-21
15:50:14.000000000 -0400
+--- evolution-2.12.0/composer/e-msg-composer-hdrs.c 2007-09-16
14:18:00.000000000 -0500
++++ evolution-2.12.0-new/composer/e-msg-composer-hdrs.c 2007-09-25
09:16:47.000000000 -0500
@@ -58,6 +58,7 @@
#include "e-util/e-error.h"
#include "e-util/e-icon-factory.h"
@@ -21,8 +81,8 @@
#include <camel/camel-store.h>
#include <camel/camel-session.h>
diff -uNr evolution-2.12.0/configure evolution-2.12.0-new/configure
---- evolution-2.12.0/configure 2007-09-17 02:41:38.000000000 -0400
-+++ evolution-2.12.0-new/configure 2007-09-21 15:48:27.000000000 -0400
+--- evolution-2.12.0/configure 2007-09-17 01:41:38.000000000 -0500
++++ evolution-2.12.0-new/configure 2007-09-25 09:16:47.000000000 -0500
@@ -13806,7 +13806,7 @@
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -96,8 +156,8 @@
sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
fi
diff -uNr evolution-2.12.0/mail/em-folder-browser.c
evolution-2.12.0-new/mail/em-folder-browser.c
---- evolution-2.12.0/mail/em-folder-browser.c 2007-09-16 15:17:46.000000000
-0400
-+++ evolution-2.12.0-new/mail/em-folder-browser.c 2007-09-21
15:48:27.000000000 -0400
+--- evolution-2.12.0/mail/em-folder-browser.c 2007-09-16 14:17:46.000000000
-0500
++++ evolution-2.12.0-new/mail/em-folder-browser.c 2007-09-25
09:16:47.000000000 -0500
@@ -99,7 +99,7 @@
#include "evolution-shell-component-utils.h" /* Pixmap stuff, sigh */
@@ -108,8 +168,8 @@
#define d(x)
diff -uNr evolution-2.12.0/mail/mail-session.c
evolution-2.12.0-new/mail/mail-session.c
---- evolution-2.12.0/mail/mail-session.c 2007-09-16 15:17:46.000000000
-0400
-+++ evolution-2.12.0-new/mail/mail-session.c 2007-09-21 15:50:59.000000000
-0400
+--- evolution-2.12.0/mail/mail-session.c 2007-09-16 14:17:46.000000000
-0500
++++ evolution-2.12.0-new/mail/mail-session.c 2007-09-25 09:16:47.000000000
-0500
@@ -37,6 +37,7 @@
#include <libedataserverui/e-passwords.h>
#include <libedataserver/e-msgport.h>
@@ -119,8 +179,8 @@
#include <camel/camel-filter-driver.h>
#include <camel/camel-i18n.h>
diff -uNr evolution-2.12.0/plugins/calendar-weather/Makefile.in
evolution-2.12.0-new/plugins/calendar-weather/Makefile.in
---- evolution-2.12.0/plugins/calendar-weather/Makefile.in 2007-09-17
02:41:58.000000000 -0400
-+++ evolution-2.12.0-new/plugins/calendar-weather/Makefile.in 2007-09-21
15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/calendar-weather/Makefile.in 2007-09-17
01:41:58.000000000 -0500
++++ evolution-2.12.0-new/plugins/calendar-weather/Makefile.in 2007-09-25
09:16:47.000000000 -0500
@@ -59,7 +59,7 @@
LTLIBRARIES = $(plugin_LTLIBRARIES)
am__DEPENDENCIES_1 =
@@ -140,8 +200,8 @@
EXTRA_DIST = \
diff -uNr evolution-2.12.0/plugins/exchange-operations/Makefile.in
evolution-2.12.0-new/plugins/exchange-operations/Makefile.in
---- evolution-2.12.0/plugins/exchange-operations/Makefile.in 2007-09-17
02:41:59.000000000 -0400
-+++ evolution-2.12.0-new/plugins/exchange-operations/Makefile.in
2007-09-21 15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/exchange-operations/Makefile.in 2007-09-17
01:41:59.000000000 -0500
++++ evolution-2.12.0-new/plugins/exchange-operations/Makefile.in
2007-09-25 09:16:47.000000000 -0500
@@ -61,8 +61,7 @@
liborg_gnome_exchange_operations_la_DEPENDENCIES = \
$(top_builddir)/e-util/libeutil.la \
@@ -162,9 +222,21 @@
$(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
$(CAMEL_EXCHANGE_LIBS)
+diff -uNr evolution-2.12.0/plugins/face/Makefile.in
evolution-2.12.0-new/plugins/face/Makefile.in
+--- evolution-2.12.0/plugins/face/Makefile.in 2007-09-17 01:41:59.000000000
-0500
++++ evolution-2.12.0-new/plugins/face/Makefile.in 2007-09-25
09:49:30.000000000 -0500
+@@ -460,7 +460,7 @@
+ liborg_gnome_face_la_LIBADD = \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/widgets/misc/libemiscwidgets.la \
+- $(top_builddir)/mail/libevolution-mail.la \
++ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \
+ $(EVOLUTION_MAIL_LIBS) \
+ $(NO_UNDEFINED_REQUIRED_LIBS)
+
diff -uNr evolution-2.12.0/plugins/groupwise-features/Makefile.in
evolution-2.12.0-new/plugins/groupwise-features/Makefile.in
---- evolution-2.12.0/plugins/groupwise-features/Makefile.in 2007-09-17
02:42:00.000000000 -0400
-+++ evolution-2.12.0-new/plugins/groupwise-features/Makefile.in
2007-09-21 15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/groupwise-features/Makefile.in 2007-09-17
01:42:00.000000000 -0500
++++ evolution-2.12.0-new/plugins/groupwise-features/Makefile.in
2007-09-25 09:16:47.000000000 -0500
@@ -62,7 +62,7 @@
am__DEPENDENCIES_2 =
liborg_gnome_groupwise_features_la_DEPENDENCIES = \
@@ -184,8 +256,8 @@
$(top_builddir)/filter/libfilter.la \
$(NO_UNDEFINED_REQUIRED_LIBS) \
diff -uNr evolution-2.12.0/plugins/import-ics-attachments/Makefile.in
evolution-2.12.0-new/plugins/import-ics-attachments/Makefile.in
---- evolution-2.12.0/plugins/import-ics-attachments/Makefile.in
2007-09-17 02:42:00.000000000 -0400
-+++ evolution-2.12.0-new/plugins/import-ics-attachments/Makefile.in
2007-09-21 15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/import-ics-attachments/Makefile.in
2007-09-17 01:42:00.000000000 -0500
++++ evolution-2.12.0-new/plugins/import-ics-attachments/Makefile.in
2007-09-25 09:16:47.000000000 -0500
@@ -59,7 +59,6 @@
am__DEPENDENCIES_1 =
liborg_gnome_evolution_mail_attachments_import_ics_la_DEPENDENCIES = \
@@ -203,8 +275,8 @@
EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml
diff -uNr evolution-2.12.0/plugins/itip-formatter/Makefile.in
evolution-2.12.0-new/plugins/itip-formatter/Makefile.in
---- evolution-2.12.0/plugins/itip-formatter/Makefile.in 2007-09-17
02:42:01.000000000 -0400
-+++ evolution-2.12.0-new/plugins/itip-formatter/Makefile.in 2007-09-21
15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/itip-formatter/Makefile.in 2007-09-17
01:42:01.000000000 -0500
++++ evolution-2.12.0-new/plugins/itip-formatter/Makefile.in 2007-09-25
09:16:47.000000000 -0500
@@ -60,8 +60,7 @@
am__DEPENDENCIES_1 =
liborg_gnome_itip_formatter_la_DEPENDENCIES = \
@@ -226,8 +298,8 @@
$(EVOLUTION_CALENDAR_LIBS)
diff -uNr evolution-2.12.0/plugins/mail-account-disable/Makefile.in
evolution-2.12.0-new/plugins/mail-account-disable/Makefile.in
---- evolution-2.12.0/plugins/mail-account-disable/Makefile.in 2007-09-17
02:42:01.000000000 -0400
-+++ evolution-2.12.0-new/plugins/mail-account-disable/Makefile.in
2007-09-21 15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/mail-account-disable/Makefile.in 2007-09-17
01:42:01.000000000 -0500
++++ evolution-2.12.0-new/plugins/mail-account-disable/Makefile.in
2007-09-25 09:16:47.000000000 -0500
@@ -59,7 +59,6 @@
am__DEPENDENCIES_1 =
libmail_account_disable_la_DEPENDENCIES = \
@@ -245,8 +317,8 @@
EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml
diff -uNr evolution-2.12.0/plugins/mark-all-read/Makefile.in
evolution-2.12.0-new/plugins/mark-all-read/Makefile.in
---- evolution-2.12.0/plugins/mark-all-read/Makefile.in 2007-09-17
02:42:03.000000000 -0400
-+++ evolution-2.12.0-new/plugins/mark-all-read/Makefile.in 2007-09-21
15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/mark-all-read/Makefile.in 2007-09-17
01:42:03.000000000 -0500
++++ evolution-2.12.0-new/plugins/mark-all-read/Makefile.in 2007-09-25
09:16:47.000000000 -0500
@@ -59,7 +59,6 @@
am__DEPENDENCIES_1 =
liborg_gnome_mark_all_read_la_DEPENDENCIES = \
@@ -264,8 +336,8 @@
EXTRA_DIST = org-gnome-mark-all-read.eplug.xml
diff -uNr evolution-2.12.0/plugins/print-message/Makefile.in
evolution-2.12.0-new/plugins/print-message/Makefile.in
---- evolution-2.12.0/plugins/print-message/Makefile.in 2007-09-17
02:42:04.000000000 -0400
-+++ evolution-2.12.0-new/plugins/print-message/Makefile.in 2007-09-21
15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/print-message/Makefile.in 2007-09-17
01:42:04.000000000 -0500
++++ evolution-2.12.0-new/plugins/print-message/Makefile.in 2007-09-25
09:16:47.000000000 -0500
@@ -59,7 +59,6 @@
am__DEPENDENCIES_1 =
liborg_gnome_print_message_la_DEPENDENCIES = \
@@ -283,8 +355,8 @@
EXTRA_DIST = \
diff -uNr evolution-2.12.0/plugins/publish-calendar/Makefile.in
evolution-2.12.0-new/plugins/publish-calendar/Makefile.in
---- evolution-2.12.0/plugins/publish-calendar/Makefile.in 2007-09-17
02:42:04.000000000 -0400
-+++ evolution-2.12.0-new/plugins/publish-calendar/Makefile.in 2007-09-21
15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/publish-calendar/Makefile.in 2007-09-17
01:42:04.000000000 -0500
++++ evolution-2.12.0-new/plugins/publish-calendar/Makefile.in 2007-09-25
09:16:47.000000000 -0500
@@ -60,7 +60,7 @@
am__DEPENDENCIES_1 =
liborg_gnome_publish_calendar_la_DEPENDENCIES = \
@@ -304,8 +376,8 @@
EXTRA_DIST = \
diff -uNr evolution-2.12.0/plugins/startup-wizard/Makefile.in
evolution-2.12.0-new/plugins/startup-wizard/Makefile.in
---- evolution-2.12.0/plugins/startup-wizard/Makefile.in 2007-09-17
02:42:06.000000000 -0400
-+++ evolution-2.12.0-new/plugins/startup-wizard/Makefile.in 2007-09-21
15:48:27.000000000 -0400
+--- evolution-2.12.0/plugins/startup-wizard/Makefile.in 2007-09-17
01:42:06.000000000 -0500
++++ evolution-2.12.0-new/plugins/startup-wizard/Makefile.in 2007-09-25
09:16:47.000000000 -0500
@@ -61,8 +61,7 @@
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \
@@ -327,8 +399,8 @@
$(EVOLUTION_MAIL_LIBS)
diff -uNr evolution-2.12.0/widgets/misc/e-attachment.c
evolution-2.12.0-new/widgets/misc/e-attachment.c
---- evolution-2.12.0/widgets/misc/e-attachment.c 2007-09-16
15:33:23.000000000 -0400
-+++ evolution-2.12.0-new/widgets/misc/e-attachment.c 2007-09-21
15:51:16.000000000 -0400
+--- evolution-2.12.0/widgets/misc/e-attachment.c 2007-09-16
14:33:23.000000000 -0500
++++ evolution-2.12.0-new/widgets/misc/e-attachment.c 2007-09-25
09:16:47.000000000 -0500
@@ -45,6 +45,7 @@
#include <string.h>
#include <errno.h>
Index: gaim-ssl.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/gaim-ssl.info,v
retrieving revision 1.7.2.20
retrieving revision 1.7.2.21
diff -u -d -r1.7.2.20 -r1.7.2.21
--- gaim-ssl.info 18 Sep 2007 14:42:30 -0000 1.7.2.20
+++ gaim-ssl.info 26 Sep 2007 00:12:39 -0000 1.7.2.21
@@ -66,7 +66,7 @@
Source: mirror:sourceforge:gaim/gaim-%v.tar.bz2
Source-MD5: 9205321ac11fad271c90f2f0d7c5e7ce
PatchFile: %n.patch
-PatchFile-MD5: 2bbff3c5515ecaa04fb6dfe4cb41bac6
+PatchFile-MD5: 2859e592a0f8d4fa4cd7a8d83f8e3c23
ConfigureParams: <<
--mandir=%p/share/man \
--disable-perl \
Index: galeon.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/galeon.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- galeon.patch 4 Feb 2006 05:15:08 -0000 1.1
+++ galeon.patch 26 Sep 2007 00:12:39 -0000 1.1.2.1
@@ -1,6 +1,19 @@
-diff -Naur galeon-1.3.21-orig/utils/gul-x11.c galeon-1.3.21/utils/gul-x11.c
---- galeon-1.3.21-orig/utils/gul-x11.c 2005-02-10 19:56:17.000000000 +0100
-+++ galeon-1.3.21/utils/gul-x11.c 2006-01-12 08:54:11.000000000 +0100
+diff -uNr galeon-2.0.3/mozilla/mozilla-embed-shell.cpp
galeon-2.0.3-new/mozilla/mozilla-embed-shell.cpp
+--- galeon-2.0.3/mozilla/mozilla-embed-shell.cpp 2006-07-01
16:55:18.000000000 -0400
++++ galeon-2.0.3-new/mozilla/mozilla-embed-shell.cpp 2007-09-25
14:59:03.000000000 -0400
+@@ -236,6 +236,9 @@
+
+ g_setenv ("MOZ_PLUGIN_PATH", new_path->str, TRUE);
+
++ /* Work-around Flash Player crash */
++ g_setenv ("XLIB_SKIP_ARGB_VISUALS", "1", FALSE);
++
+ g_string_free (new_path, TRUE);
+ }
+
+diff -uNr galeon-2.0.3/utils/gul-x11.c galeon-2.0.3-new/utils/gul-x11.c
+--- galeon-2.0.3/utils/gul-x11.c 2005-02-10 13:56:17.000000000 -0500
++++ galeon-2.0.3-new/utils/gul-x11.c 2007-09-25 14:57:35.000000000 -0400
@@ -52,7 +52,7 @@
XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID
(root_win),
Index: seamonkey.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/seamonkey.info,v
retrieving revision 1.6.2.31
retrieving revision 1.6.2.32
diff -u -d -r1.6.2.31 -r1.6.2.32
--- seamonkey.info 21 Sep 2007 00:24:32 -0000 1.6.2.31
+++ seamonkey.info 26 Sep 2007 00:12:39 -0000 1.6.2.32
@@ -142,6 +142,8 @@
SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib
-L%p/lib/fontconfig2/lib
SetLIBS: -L%p/lib
SetCFLAGS: -Os -pipe
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
CompileScript: <<
#!/bin/sh -ev
Index: galeon.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/galeon.info,v
retrieving revision 1.4.2.34
retrieving revision 1.4.2.35
diff -u -d -r1.4.2.34 -r1.4.2.35
--- galeon.info 21 Sep 2007 00:24:32 -0000 1.4.2.34
+++ galeon.info 26 Sep 2007 00:12:39 -0000 1.4.2.35
@@ -68,7 +68,7 @@
InstallScript: make -j1 install DESTDIR="%d"
PostInstScript: <<
- if [ configure = "$1" ]; then
+ if [ configure = "$1" ] || [ upgrade = "$1" ]; then
scrollkeeper-update
%p/bin/galeon-config-tool --fix-gconf-permissions
%p/bin/galeon-config-tool --pkg-install-schemas
Index: gaim-ssl.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/crypto/finkinfo/gaim-ssl.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- gaim-ssl.patch 18 Sep 2007 00:27:25 -0000 1.1.2.1
+++ gaim-ssl.patch 26 Sep 2007 00:12:39 -0000 1.1.2.2
@@ -1,7 +1,7 @@
-diff -ru gaim-0.81/ltmain.sh gaim-0.81-patched/ltmain.sh
---- gaim-0.81/ltmain.sh 2004-08-06 05:24:54.000000000 +0200
-+++ gaim-0.81-patched/ltmain.sh 2004-08-15 13:17:32.000000000 +0200
-@@ -2276,7 +2276,7 @@
+diff -uNr gaim-1.5.0/ltmain.sh gaim-1.5.0-new/ltmain.sh
+--- gaim-1.5.0/ltmain.sh 2005-07-21 10:41:30.000000000 -0500
++++ gaim-1.5.0-new/ltmain.sh 2007-09-25 11:24:23.000000000 -0500
+@@ -2446,7 +2446,7 @@
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
if test "$installed" = no; then
notinst_deplibs="$notinst_deplibs $lib"
@@ -10,9 +10,21 @@
fi
# This is a shared library
-diff -ruN gaim-1.5.0/src/account.c gaim-1.5.0-patched/src/account.c
---- gaim-1.5.0/src/account.c 2005-06-17 06:08:51.000000000 -0700
-+++ gaim-1.5.0-patched/src/account.c 2007-09-11 12:27:06.000000000 -0700
+diff -uNr gaim-1.5.0/plugins/gevolution/gevolution.c
gaim-1.5.0-new/plugins/gevolution/gevolution.c
+--- gaim-1.5.0/plugins/gevolution/gevolution.c 2005-04-16 11:52:52.000000000
-0500
++++ gaim-1.5.0-new/plugins/gevolution/gevolution.c 2007-09-25
11:24:42.000000000 -0500
+@@ -37,7 +37,7 @@
+
+ #include <libedata-book/Evolution-DataServer-Addressbook.h>
+
+-#include <libebook/e-book-listener.h>
++#include <libebook/e-book.h>
+ #include <libedata-book/e-data-book-factory.h>
+ #include <bonobo/bonobo-main.h>
+
+diff -uNr gaim-1.5.0/src/account.c gaim-1.5.0-new/src/account.c
+--- gaim-1.5.0/src/account.c 2005-06-17 08:08:51.000000000 -0500
++++ gaim-1.5.0-new/src/account.c 2007-09-25 11:24:23.000000000 -0500
@@ -61,7 +61,7 @@
{
int integer;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
