rpms/evolution-exchange/devel evolution-exchange-2.21.91-no-gnuc-pretty-function.patch, NONE, 1.1 evolution-exchange.spec, 1.22, 1.23
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Wed Feb 13 01:56:24 UTC 2008
- Previous message (by thread): rpms/xchat-gnome/F-8 xchat-gnome-fix_away_command.patch, 1.1, 1.2 xchat-gnome.spec, 1.46, 1.47
- Next message (by thread): rpms/wipe/devel wipe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22948
Modified Files:
evolution-exchange.spec
Added Files:
evolution-exchange-2.21.91-no-gnuc-pretty-function.patch
Log Message:
* Mon Feb 11 2008 Matthew Barnes <mbarnes at redhat.com> - 2.21.91-1.fc9
- Update to 2.21.91
evolution-exchange-2.21.91-no-gnuc-pretty-function.patch:
--- NEW FILE evolution-exchange-2.21.91-no-gnuc-pretty-function.patch ---
diff -up evolution-exchange-2.21.91/addressbook/e-book-backend-gal.c.no-gnuc-pretty-function evolution-exchange-2.21.91/addressbook/e-book-backend-gal.c
--- evolution-exchange-2.21.91/addressbook/e-book-backend-gal.c.no-gnuc-pretty-function 2008-01-12 04:28:17.000000000 -0500
+++ evolution-exchange-2.21.91/addressbook/e-book-backend-gal.c 2008-02-12 20:48:24.000000000 -0500
@@ -1575,9 +1575,9 @@ ldap_search_handler (LDAPOp *op, LDAPMes
int msg_type;
d(printf ("ldap_search_handler (%p)\n", view));
- printf("%s(%d):%s: search handler \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: search handler \n", G_STRLOC, G_STRFUNC);
if (!ldap) {
- printf("%s(%d):%s: other error\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: other error\n", G_STRLOC, G_STRFUNC);
e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_OtherError);
ldap_op_finished (op);
return;
@@ -1615,7 +1615,7 @@ ldap_search_handler (LDAPOp *op, LDAPMes
NULL, &ldap_error_msg, NULL, NULL, 0);
g_mutex_unlock (bl->priv->ldap_lock);
if (ldap_error != LDAP_SUCCESS) {
- printf("%s(%d):%s: error result\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: error result\n", G_STRLOC, G_STRFUNC);
g_warning ("ldap_search_handler: %02X (%s), additional info: %s",
ldap_error,
ldap_err2string (ldap_error), ldap_error_msg);
@@ -1630,7 +1630,7 @@ ldap_search_handler (LDAPOp *op, LDAPMes
e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_Success);
else
e_data_book_view_notify_complete (view, GNOME_Evolution_Addressbook_OtherError);
- printf("%s(%d):%s: o/p %d %d\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION, ldap_error, LDAP_SUCCESS);
+ printf("%s:%s: o/p %d %d\n", G_STRLOC, G_STRFUNC, ldap_error, LDAP_SUCCESS);
ldap_op_finished (op);
}
else {
@@ -1770,7 +1770,7 @@ start_book_view (EBookBackend *backend,
printf("Not marked for offline or cache not there\n");
if (!bl->priv->ldap) {
if (!gal_reconnect (bl, view, 0)) {
- printf("%s(%d):%s: no ldap :(\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: no ldap :(\n", G_STRLOC, G_STRFUNC);
e_data_book_view_notify_complete (view,
GNOME_Evolution_Addressbook_InvalidQuery);
return;
@@ -1790,12 +1790,12 @@ start_book_view (EBookBackend *backend,
status = build_query (bl, e_data_book_view_get_card_query (view),
&ldap_query);
- printf("%s(%d):%s: %s\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION, ldap_query);
+ printf("%s:%s: %s\n", G_STRLOC, G_STRFUNC, ldap_query);
if (status != GNOME_Evolution_Addressbook_Success || !ldap_query) {
e_data_book_view_notify_complete (view, status);
if (ldap_query)
g_free (ldap_query);
- printf("%s(%d):%s: failure \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: failure \n", G_STRLOC, G_STRFUNC);
return;
}
@@ -1804,7 +1804,7 @@ start_book_view (EBookBackend *backend,
book_view_notify_status (view, _("Searching..."));
g_mutex_lock (bl->priv->ldap_lock);
- printf("%s(%d):%s: starting \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: starting \n", G_STRLOC, G_STRFUNC);
ldap_err = ldap_search_ext (bl->priv->ldap, LDAP_ROOT_DSE,
LDAP_SCOPE_SUBTREE,
ldap_query,
@@ -1815,7 +1815,7 @@ start_book_view (EBookBackend *backend,
view_limit,
&search_msgid);
g_mutex_unlock (bl->priv->ldap_lock);
- printf("%s(%d):%s: %d\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION, ldap_err);
+ printf("%s:%s: %d\n", G_STRLOC, G_STRFUNC, ldap_err);
} else
bl->priv->connected = FALSE;
} while (gal_reconnect (bl, view, ldap_err));
@@ -1823,12 +1823,12 @@ start_book_view (EBookBackend *backend,
g_free (ldap_query);
if (ldap_err != LDAP_SUCCESS) {
- printf("%s(%d):%s: error\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: error\n", G_STRLOC, G_STRFUNC);
book_view_notify_status (view, ldap_err2string(ldap_err));
return;
}
else if (search_msgid == -1) {
- printf("%s(%d):%s: error\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: error\n", G_STRLOC, G_STRFUNC);
book_view_notify_status (view,
_("Error performing search"));
return;
@@ -1837,7 +1837,7 @@ start_book_view (EBookBackend *backend,
LDAPSearchOp *op = g_new0 (LDAPSearchOp, 1);
d(printf ("adding search_op (%p, %d)\n", view, search_msgid));
- printf("%s(%d):%s: adding search \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: adding search \n", G_STRLOC, G_STRFUNC);
op->view = view;
op->aborted = FALSE;
@@ -2208,7 +2208,7 @@ authenticate_user (EBookBackend *backend
if (!exchange_account_get_context (account)) {
exchange_account_set_online (account);
if(!exchange_account_connect (account, password, &result)) {
- printf("%s(%d):%s: failed\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: failed\n", G_STRLOC, G_STRFUNC);
e_data_book_respond_authenticate_user (book, opid, GNOME_Evolution_Addressbook_AuthenticationFailed);
return;
}
@@ -2378,7 +2378,7 @@ get_supported_auth_methods (EBookBackend
guint32 opid)
{
- printf("%s(%d):%s: NONE\n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION);
+ printf("%s:%s: NONE\n", G_STRLOC, G_STRFUNC);
e_data_book_respond_get_supported_auth_methods (book,
opid,
GNOME_Evolution_Addressbook_Success,
diff -up evolution-exchange-2.21.91/camel/camel-exchange-summary.c.no-gnuc-pretty-function evolution-exchange-2.21.91/camel/camel-exchange-summary.c
--- evolution-exchange-2.21.91/camel/camel-exchange-summary.c.no-gnuc-pretty-function 2007-12-01 03:57:32.000000000 -0500
+++ evolution-exchange-2.21.91/camel/camel-exchange-summary.c 2008-02-12 20:48:24.000000000 -0500
@@ -161,7 +161,7 @@ header_load (CamelFolderSummary *summary
exchange->version = version;
- d(g_print ("%s:%s:%d: high_article_num = [%d]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, high_article_num));
+ d(g_print ("%s:%s: high_article_num = [%d]\n", G_STRLOC, G_STRFUNC, high_article_num));
return 0;
}
@@ -183,7 +183,7 @@ header_save (CamelFolderSummary *summary
if (camel_file_util_encode_uint32 (out, exchange->high_article_num) == -1)
return -1;
- d(g_print ("%s:%s:%d: high_article_num = [%d]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, exchange->high_article_num));
+ d(g_print ("%s:%s: high_article_num = [%d]\n", G_STRLOC, G_STRFUNC, exchange->high_article_num));
return 0;
}
@@ -216,7 +216,7 @@ message_info_load (CamelFolderSummary *s
}
einfo->href = href;
- d(g_print ("%s:%s:%d: einfo->href = [%s]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, einfo->href));
+ d(g_print ("%s:%s: einfo->href = [%s]\n", G_STRLOC, G_STRFUNC, einfo->href));
}
return info;
@@ -239,7 +239,7 @@ message_info_save (CamelFolderSummary *s
if (camel_file_util_encode_string (out, einfo->href ? einfo->href : "") == -1)
return -1;
- d(g_print ("%s:%s:%d: einfo->href = [%s]\n", __FILE__, G_GNUC_PRETTY_FUNCTION, __LINE__, einfo->href));
+ d(g_print ("%s:%s: einfo->href = [%s]\n", G_STRLOC, G_STRFUNC, einfo->href));
return 0;
}
Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- evolution-exchange.spec 11 Feb 2008 17:20:57 -0000 1.22
+++ evolution-exchange.spec 13 Feb 2008 01:55:50 -0000 1.23
@@ -44,6 +44,9 @@
# GNOME bug #443022
Patch13: evolution-exchange-2.11.2-fix-library-order.patch
+# G_GNUC_PRETTY_FUNCTION is deprecated
+Patch14: evolution-exchange-2.21.91-no-gnuc-pretty-function.patch
+
### Dependencies ###
Requires: gnutls
@@ -75,6 +78,7 @@
%patch11 -p1 -b .fix-64bit-acinclude.m4
%patch12 -p1 -b .no_gnome_common
%patch13 -p1 -b .fix-library-order
+%patch14 -p1 -b .no-gnuc-pretty-function
%build
export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
- Previous message (by thread): rpms/xchat-gnome/F-8 xchat-gnome-fix_away_command.patch, 1.1, 1.2 xchat-gnome.spec, 1.46, 1.47
- Next message (by thread): rpms/wipe/devel wipe.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list