rpms/evolution-connector/devel evolution-exchange-2.8.0-deprecated-glib.patch, NONE, 1.1 evolution-connector.spec, 1.77, 1.78

[fedora-cvs-commits at redhat.com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution-connector/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv15346

Modified Files:
	evolution-connector.spec 
Added Files:
	evolution-exchange-2.8.0-deprecated-glib.patch 
Log Message:

* Mon Sep 25 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.0-2.fc6
- Add patch for Gnome.org bug #357660.


evolution-exchange-2.8.0-deprecated-glib.patch:
 e-cal-backend-exchange-calendar.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE evolution-exchange-2.8.0-deprecated-glib.patch ---
--- evolution-exchange-2.8.0/calendar/e-cal-backend-exchange-calendar.c.deprecated-glib	2006-09-25 14:23:22.000000000 -0400
+++ evolution-exchange-2.8.0/calendar/e-cal-backend-exchange-calendar.c	2006-09-25 14:27:17.000000000 -0400
@@ -664,10 +664,10 @@
 
 		attendee = icalvalue_get_string (value);
 
-		if (!g_strncasecmp (attendee, "mailto:", 7))
+		if (!g_ascii_strncasecmp (attendee, "mailto:", 7))
 			attendee += 7;
 		text = g_strstrip (g_strdup (attendee));
-		if (!g_strcasecmp (address, text)) {
+		if (!g_ascii_strcasecmp (address, text)) {
 			g_free (text);
 			return prop;
 		}


Index: evolution-connector.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-connector/devel/evolution-connector.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- evolution-connector.spec	5 Sep 2006 11:51:29 -0000	1.77
+++ evolution-connector.spec	25 Sep 2006 18:48:02 -0000	1.78
@@ -15,6 +15,9 @@
 # like it could be smarter about this.
 %define plibdir %(pkg-config evolution-shell-%{evo_major} --variable=privlibdir 2>/dev/null)
 
+# Use stricter build settings than required by upstream.
+%define strict_build_settings 1
+
 ### Abstract ###
 
 Name: evolution-connector
@@ -36,6 +39,9 @@
 # We do not ship gnome-common (or at least we're not supposed to).
 Patch102: evolution-exchange-2.7.2-no_gnome_common.patch
 
+# Gnome.org bug #357660
+Patch103: evolution-exchange-2.8.0-deprecated-glib.patch
+
 ### Dependencies ###
 
 Requires: evolution >= %{evo_version}
@@ -69,9 +75,10 @@
 %patch100 -p1 -b .64bit-fix-acinclude.m4
 %patch101 -p1 -b .fix-marshaller
 %patch102 -p1 -b .no_gnome_common
+%patch103 -p1 -b .deprecated-glib
 
 %build
-CFLAGS="$RPM_OPT_FLAGS -Werror-implicit-function-declaration -DLDAP_DEPRECATED"; export CFLAGS
+export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"
 # Set LIBS so that configure will be able to link with static LDAP libraries,
 # which depend on Cyrus SASL and OpenSSL.
 if pkg-config openssl ; then
@@ -81,6 +88,21 @@
 fi
 export LIBS
 
+# Add stricter build settings here as the source code gets cleaned up.
+# We want to make sure things like compiler warnings and avoiding deprecated
+# functions in the GNOME/GTK+ libraries stay fixed.
+#
+# Please file a bug report at bugzilla.gnome.org if these settings break
+# compilation, and encourage the upstream developers to use them.
+
+%if %{strict_build_settings}
+CFLAGS="$CFLAGS \
+        -DG_DISABLE_DEPRECATED=1 \
+        -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \
+        -DGDK_DISABLE_DEPRECATED=1 \
+        -Werror-implicit-function-declaration"
+%endif
+
 # Rerun the GNU Autotools since we patched some of the input files.
 aclocal
 autoheader
@@ -122,6 +144,9 @@
 %{_datadir}/evolution-exchange/%{evo_major}/ui/ximian-connector.xml
 
 %changelog
+* Mon Sep 25 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.0-2.fc6
+- Add patch for Gnome.org bug #357660.
+
 * Mon Sep  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.0-1.fc6
 - Update to 2.8.0
 - Remove patch for Gnome.org bug #349949 (fixed upstream).