rpms/evolution-connector/devel evolution-exchange-2.11.3.1-fix-warnings.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 evolution-connector.spec, 1.103, 1.104 sources, 1.48, 1.49 evolution-exchange-2.11.2-deprecated-eds.patch, 1.1, NONE
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Tue Jun 5 16:06:45 UTC 2007
Author: mbarnes
Update of /cvs/pkgs/rpms/evolution-connector/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14762
Modified Files:
.cvsignore evolution-connector.spec sources
Added Files:
evolution-exchange-2.11.3.1-fix-warnings.patch
Removed Files:
evolution-exchange-2.11.2-deprecated-eds.patch
Log Message:
* Mon Jun 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.3.1-1.fc8
- Update to 2.11.3.1
- Add patch for GNOME bug #444101 (new compiler warnings).
- Remove patch for GNOME bug #439579 (fixed upstream).
evolution-exchange-2.11.3.1-fix-warnings.patch:
--- NEW FILE evolution-exchange-2.11.3.1-fix-warnings.patch ---
--- evolution-exchange-2.11.3.1/mail/mail-stub-exchange.c.fix-warnings 2007-06-04 08:51:14.000000000 -0400
+++ evolution-exchange-2.11.3.1/mail/mail-stub-exchange.c 2007-06-05 11:44:00.000000000 -0400
@@ -135,7 +135,7 @@ static void folder_update_linestatus (gp
static void free_folder (gpointer value);
static gboolean get_folder_online (MailStubExchangeFolder *mfld, gboolean background);
-static GStaticMutex g_changed_msgs_mutex = G_STATIC_MUTEX_INIT;
+static GStaticRecMutex g_changed_msgs_mutex = G_STATIC_REC_MUTEX_INIT;
static void
class_init (GObjectClass *object_class)
@@ -2373,7 +2373,7 @@ get_folder_info (MailStub *stub, const c
path[toplen + 1] != '\0')
continue;
}
-return_data:
+
type = e_folder_get_type_string (folder);
name = e_folder_get_name (folder);
uri = e_folder_get_physical_uri (folder);
--- evolution-exchange-2.11.3.1/storage/ximian-connector-setup.c.fix-warnings 2007-06-05 11:48:35.000000000 -0400
+++ evolution-exchange-2.11.3.1/storage/ximian-connector-setup.c 2007-06-05 11:48:42.000000000 -0400
@@ -45,6 +45,5 @@ main (int argc, char **argv)
NULL);
exchange_autoconfig_druid_run ();
- e_passwords_shutdown ();
return 0;
}
--- evolution-exchange-2.11.3.1/storage/main.c.fix-warnings 2007-06-05 11:48:58.000000000 -0400
+++ evolution-exchange-2.11.3.1/storage/main.c 2007-06-05 11:49:04.000000000 -0400
@@ -237,7 +237,6 @@ main (int argc, char **argv)
bonobo_main ();
- e_passwords_shutdown ();
return 0;
failed:
--- evolution-exchange-2.11.3.1/storage/exchange-autoconfig-wizard.c.fix-warnings 2007-04-18 06:19:14.000000000 -0400
+++ evolution-exchange-2.11.3.1/storage/exchange-autoconfig-wizard.c 2007-06-05 11:44:00.000000000 -0400
@@ -37,9 +37,9 @@
#include <gconf/gconf-client.h>
#include <glade/glade-xml.h>
#include <gtk/gtkentry.h>
+#include <gtk/gtklinkbutton.h>
#include <libgnomeui/gnome-druid.h>
#include <libgnomeui/gnome-druid-page-standard.h>
-#include <libgnomeui/gnome-href.h>
typedef struct {
GnomeDruid *druid;
@@ -262,7 +262,7 @@ owa_page_next (ExchangeAutoconfigGUI *gu
if (gui->failure_href)
gtk_widget_destroy (gui->failure_href);
- gui->failure_href = gnome_href_new ("http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html", "http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html");
+ gui->failure_href = gtk_link_button_new ("http://support.novell.com/cgi-bin/search/searchtid.cgi?/ximian/ximian328.html");
gtk_box_pack_start (gui->failure_vbox, gui->failure_href, FALSE, FALSE, 0);
gtk_widget_show (gui->failure_href);
--- evolution-exchange-2.11.3.1/addressbook/e-book-backend-gal.c.fix-warnings 2007-06-04 02:08:24.000000000 -0400
+++ evolution-exchange-2.11.3.1/addressbook/e-book-backend-gal.c 2007-06-05 11:44:00.000000000 -0400
@@ -151,7 +151,7 @@ static EContact *build_contact_from_entr
static void manager_populate (EContact *contact, char **values, EBookBackendGAL *bl, E2kOperation *op);
-static void member_populate (EContact *contact, char **values);
+static void member_populate (EContact *contact, char **values, EBookBackendGAL *bl, E2kOperation *op);
static void last_mod_time_populate (EContact *contact, char **values, EBookBackendGAL *bl, E2kOperation *op);
@@ -1235,7 +1235,7 @@ manager_populate(EContact *contact, char
str += len;
static void
-member_populate (EContact *contact, char **values)
+member_populate (EContact *contact, char **values, EBookBackendGAL *bl, E2kOperation *op)
{
int i;
gchar **member_info;
@@ -1326,7 +1326,7 @@ build_contact_from_entry (EBookBackendGA
EContact *contact = e_contact_new ();
char *dn;
char *attr;
- BerElement *ber = NULL, *tber = NULL;;
+ BerElement *ber = NULL, *tber = NULL;
gboolean is_group = FALSE;
dn = ldap_get_dn(ldap, e);
@@ -1722,7 +1722,7 @@ start_book_view (EBookBackend *backend,
#if ENABLE_CACHE
printf("Mode:Remote\n");
if (bl->priv->marked_for_offline && bl->priv->file_db) {
- char *query = e_data_book_view_get_card_query (view);
+ const char *query = e_data_book_view_get_card_query (view);
GPtrArray *ids = NULL;
printf("Marked for offline and cache present\n");
@@ -2182,11 +2182,11 @@ authenticate_user (EBookBackend *backend
#if ENABLE_CACHE
if (be->priv->marked_for_offline) {
if (e_book_backend_db_cache_is_populated (be->priv->file_db) ) {
- printf("Cache is populated, check if refresh is required \n");
time_t t1, t2;
int diff;
char *t = e_book_backend_db_cache_get_time (be->priv->file_db);
+ printf("Cache is populated, check if refresh is required \n");
if (t && *t)
t1 = atoi (t);
else
@@ -2471,7 +2471,7 @@ load_source (EBookBackend *backend,
int rv;
/* the database didn't exist, so we create the directory then the .db */
- rv= e_util_mkdir_hier (dirname, 0777);
+ rv= g_mkdir_with_parents (dirname, 0777);
if (rv == -1 && errno != EEXIST) {
g_warning ("failed to make directory %s: %s", dirname, strerror (errno));
g_free (dirname);
--- evolution-exchange-2.11.3.1/addressbook/e-book-backend-db-cache.c.fix-warnings 2007-06-04 02:22:11.000000000 -0400
+++ evolution-exchange-2.11.3.1/addressbook/e-book-backend-db-cache.c 2007-06-05 11:44:00.000000000 -0400
@@ -211,9 +211,14 @@ e_book_backend_db_cache_add_contact (DB
uid = e_contact_get_const (contact, E_CONTACT_UID);
if (!uid) {
+ const gchar *name;
+ const gchar *email;
+
+ name = e_contact_get (contact, E_CONTACT_GIVEN_NAME);
+ email = e_contact_get (contact, E_CONTACT_EMAIL_1);
printf ("no uid\n");
- printf("name:%s, email:%s\n", e_contact_get (contact, E_CONTACT_GIVEN_NAME), e_contact_get (contact, E_CONTACT_EMAIL_1));
- return NULL;
+ printf("name:%s, email:%s\n", name, email);
+ return FALSE;
}
string_to_dbt (uid, &uid_dbt);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-connector/devel/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore 19 May 2007 01:29:51 -0000 1.48
+++ .cvsignore 5 Jun 2007 16:06:05 -0000 1.49
@@ -1 +1 @@
-evolution-exchange-2.11.2.tar.bz2
+evolution-exchange-2.11.3.1.tar.bz2
Index: evolution-connector.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- evolution-connector.spec 1 Jun 2007 17:45:18 -0000 1.103
+++ evolution-connector.spec 5 Jun 2007 16:06:05 -0000 1.104
@@ -15,7 +15,7 @@
# The error is caused by the -R ${plibdir} substitution below; -R requires
# an argument and libtool does not complain until late in the game. Seems
# like it could be smarter about this.
-%define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
+%define plibdir %(pkg-config evolution-shell --variable=privlibdir 2>/dev/null)
# Use stricter build settings than required by upstream.
%define strict_build_settings 1
@@ -23,8 +23,8 @@
### Abstract ###
Name: evolution-connector
-Version: 2.11.2
-Release: 2%{?dist}
+Version: 2.11.3.1
+Release: 1%{?dist}
License: GPL
Group: Applications/Productivity
Summary: Evolution plugin to interact with MS Exchange Server
@@ -41,11 +41,11 @@
# We do not ship gnome-common (or at least we're not supposed to).
Patch13: evolution-exchange-2.7.2-no_gnome_common.patch
-# GNOME bug #439579
-Patch14: evolution-exchange-2.11.2-deprecated-eds.patch
+# GNOME bug #443022
+Patch14: evolution-exchange-2.11.2-fix-library-order.patch
-# List libraries in the correct order.
-Patch15: evolution-exchange-2.11.2-fix-library-order.patch
+# GNOME bug #444101
+Patch15: evolution-exchange-2.11.3.1-fix-warnings.patch
### Dependencies ###
@@ -84,8 +84,8 @@
%patch11 -p1 -b .fix-64bit-acinclude.m4
#%patch12 -p1 -b .fix-marshaller
%patch13 -p1 -b .no_gnome_common
-%patch14 -p1 -b .deprecated-eds
-%patch15 -p1 -b .fix-library-order
+%patch14 -p1 -b .fix-library-order
+%patch15 -p1 -b .fix-warnings
%build
export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
@@ -160,6 +160,11 @@
%{_sysconfdir}/gconf/schemas/apps_exchange_addressbook-%{evo_major}.schemas
%changelog
+* Mon Jun 04 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.3.1-1.fc8
+- Update to 2.11.3.1
+- Add patch for GNOME bug #444101 (new compiler warnings).
+- Remove patch for GNOME bug #439579 (fixed upstream).
+
* Fri Jun 01 2007 Matthew Barnes <mbarnes at redhat.com> - 2.11.2-2.fc8
- List static ldap libraries in the proper order.
- Compile with -Werror.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-connector/devel/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources 19 May 2007 01:29:51 -0000 1.48
+++ sources 5 Jun 2007 16:06:05 -0000 1.49
@@ -1 +1 @@
-f7941421e7141caa28c24039c0450d93 evolution-exchange-2.11.2.tar.bz2
+a9143bad7ce8e94d141d0454aec50143 evolution-exchange-2.11.3.1.tar.bz2
--- evolution-exchange-2.11.2-deprecated-eds.patch DELETED ---
More information about the fedora-extras-commits
mailing list