File evolution-sharp-newer-evo.patch of Package evolution-sharp

Index: evolution-sharp-0.21.1/configure.in
===================================================================
--- evolution-sharp-0.21.1.orig/configure.in
+++ evolution-sharp-0.21.1/configure.in
@@ -16,8 +16,10 @@ fi
 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_8, evolution-data-server-1.2 >= 1.8 evolution-data-server-1.2 < 1.9, edsver="1.8", AC_MSG_RESULT([no]))
 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_9, evolution-data-server-1.2 >= 1.9 evolution-data-server-1.2 < 1.10, edsver="1.9", AC_MSG_RESULT([no]))
 PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_10, evolution-data-server-1.2 >= 1.10 evolution-data-server-1.2 < 2.23.92, edsver="1.10", AC_MSG_RESULT([no]))
-PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27.4, edsver="2.24", AC_MSG_RESULT([no]))
-PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.27.4, edsver="unsupported", AC_MSG_RESULT([no]))
+PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.33.0, edsver="2.24", AC_MSG_RESULT([no]))
+PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_92, evolution-data-server-1.2 >= 2.91.1 evolution-data-server-1.2 < 3.1.0, edsver="2.92", AC_MSG_RESULT([no]))
+PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_3_4, evolution-data-server-1.2 >= 3.3.0 evolution-data-server-1.2 < 3.5, edsver="3.4", AC_MSG_RESULT([no]))
+PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 3.5.0, edsver="unsupported", AC_MSG_RESULT([no]))
 
 if test "x$edsver" = "x1.8"; then
 	EDS_VERSION=-1.2
@@ -39,6 +41,27 @@ elif test "x$edsver" = "x2.24"; then
 	ECAL_SOVERSION=7
 	EBACKEND_SOVERSION=0
 	EDATACAL_SOVERSION=6
+elif test "x$edsver" = "x2.92"; then
+	EDS_VERSION=-1.2
+	EDS_SOVERSION=11
+	EBOOK_SOVERSION=9
+	ECAL_SOVERSION=8
+	EBACKEND_SOVERSION=1
+	EDATACAL_SOVERSION=11
+elif test "x$edsver" = "x3.2"; then
+	EDS_VERSION=-1.2
+	EDS_SOVERSION=15
+	EBOOK_SOVERSION=12
+	ECAL_SOVERSION=10
+	EBACKEND_SOVERSION=1
+	EDATACAL_SOVERSION=13
+elif test "x$edsver" = "x3.4"; then
+        EDS_VERSION=-1.2
+        EDS_SOVERSION=16
+	EBOOK_SOVERSION=13
+        ECAL_SOVERSION=11
+        EBACKEND_SOVERSION=2
+        EDATACAL_SOVERSION=14
 elif test "x$edsver" = "xunsupported"; then
 	AC_MSG_ERROR([
 
@@ -87,6 +110,9 @@ AM_CONDITIONAL(USE_EDS_1_8, test "x$edsv
 AM_CONDITIONAL(USE_EDS_1_9, test "x$edsver" = "x1.9")
 AM_CONDITIONAL(USE_EDS_1_10, test "x$edsver" = "x1.10")
 AM_CONDITIONAL(USE_EDS_2_24, test "x$edsver" = "x2.24")
+AM_CONDITIONAL(USE_EDS_2_92, test "x$edsver" = "x2.92")
+AM_CONDITIONAL(USE_EDS_3_2, test "x$edsver" = "x3.2")
+AM_CONDITIONAL(USE_EDS_3_4, test "x$edsver" = "x3.4")
 
 PKG_CHECK_MODULES(MONO, mono >= 1.0.0)
 AC_PATH_PROG(CSC, mcs, no)
Index: evolution-sharp-0.21.1/evolution/Makefile.am
===================================================================
--- evolution-sharp-0.21.1.orig/evolution/Makefile.am
+++ evolution-sharp-0.21.1/evolution/Makefile.am
@@ -25,6 +25,27 @@ SOURCES_2_24 = src/CalComponentDateTime.
 CSFLAGS = -define:USE_EDS_2_24
 endif
 
+if USE_EDS_2_92
+RAW_API = evolution-api.raw
+CUSTOMS_2_24 = Icaltimetype.custom CalBackend.custom CalBackendCache.custom CalBackendSExp.custom
+SOURCES_2_24 = src/CalComponentDateTime.cs src/CalCompChanges.cs
+CSFLAGS = -define:USE_EDS_2_24
+endif
+
+if USE_EDS_3_2
+RAW_API = evolution-api.raw
+CUSTOMS_2_24 = Icaltimetype.custom CalBackend.custom CalBackendCache.custom CalBackendSExp.custom
+SOURCES_2_24 = src/CalComponentDateTime.cs src/CalCompChanges.cs
+CSFLAGS = -define:USE_EDS_2_24
+endif
+
+if USE_EDS_3_4
+RAW_API = evolution-api.raw
+CUSTOMS_2_24 = Icaltimetype.custom CalBackend.custom CalBackendCache.custom CalBackendSExp.custom
+SOURCES_2_24 = src/CalComponentDateTime.cs src/CalCompChanges.cs
+CSFLAGS = -define:USE_EDS_2_24
+endif
+
 API=evolution-api.xml
 METADATA = Evolution.metadata
 ASSEMBLY_NAME = evolution-sharp
Index: evolution-sharp-0.21.1/glue/cal/e-cal-glue-comp.h
===================================================================
--- evolution-sharp-0.21.1.orig/glue/cal/e-cal-glue-comp.h
+++ evolution-sharp-0.21.1/glue/cal/e-cal-glue-comp.h
@@ -1,7 +1,7 @@
 #ifndef _E_CAL_GLUE_COMPONENT_H_
 #define _E_CAL_GLUE_COMPONENT_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <time.h>
 #include <glib-object.h>
 #include <libecal/e-cal.h>
Index: evolution-sharp-0.21.1/glue/cal/e-cal-glue-recur.h
===================================================================
--- evolution-sharp-0.21.1.orig/glue/cal/e-cal-glue-recur.h
+++ evolution-sharp-0.21.1/glue/cal/e-cal-glue-recur.h
@@ -1,7 +1,7 @@
 #ifndef _E_CAL_GLUE_RECUR_H_
 #define _E_CAL_GLUE_RECUR_H_
 
-#include <glib/gmacros.h>
+#include <glib.h>
 #include <time.h>
 #include <glib-object.h>
 #include <libical/icalrecur.h>
openSUSE Build Service is sponsored by