From 7529cb13b307d428d8920658972556a2afa878bd Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Feb 17 2015 16:23:39 +0000
Subject: add mcrha's patch to actually build against 3.13.90


---

diff --git a/bijiben-3.15.3-eds31390.patch b/bijiben-3.15.3-eds31390.patch
new file mode 100644
index 0000000..6b5f6d7
--- /dev/null
+++ b/bijiben-3.15.3-eds31390.patch
@@ -0,0 +1,34 @@
+diff -upr bijiben-3.15.3.old/configure.ac bijiben-3.15.3/configure.ac
+--- bijiben-3.15.3.old/configure.ac	2015-02-17 14:03:37.726656755 +0100
++++ bijiben-3.15.3/configure.ac	2015-02-17 13:44:55.536705077 +0100
+@@ -62,6 +62,7 @@ APPSTREAM_XML
+ # version, modules
+ GLIB_REQUIRED_VERSION=2.28
+ GTK_REQUIRED_VERSION=3.11.4
++EDSEVO_REQUIRED_VERSION=3.13.90
+ 
+ 
+ PKG_CHECK_MODULES([TRACKER], [tracker-sparql-1.0], [sparql_version="tracker-sparql-1.0"],
+@@ -69,8 +70,8 @@ PKG_CHECK_MODULES([TRACKER], [tracker-sp
+ ])
+ 
+ PKG_CHECK_MODULES(BIJIBEN,
+-                  [ evolution-calendar-3.0
+-		    evolution-data-server-1.2
++                  [ evolution-calendar-3.0 >= $EDSEVO_REQUIRED_VERSION
++		    evolution-data-server-1.2 >= $EDSEVO_REQUIRED_VERSION
+                     gio-unix-2.0
+                     glib-2.0 >= $GLIB_REQUIRED_VERSION
+                     goa-1.0
+diff -upr bijiben-3.15.3.old/src/libbiji/provider/biji-memo-provider.c bijiben-3.15.3/src/libbiji/provider/biji-memo-provider.c
+--- bijiben-3.15.3.old/src/libbiji/provider/biji-memo-provider.c	2015-02-17 14:03:37.742656755 +0100
++++ bijiben-3.15.3/src/libbiji/provider/biji-memo-provider.c	2015-02-17 13:56:39.603674760 +0100
+@@ -498,6 +504,7 @@ biji_memo_provider_constructed (GObject
+ 
+   e_cal_client_connect (self->priv->source,
+                         E_CAL_CLIENT_SOURCE_TYPE_MEMOS,
++			10, /* wait up to 10 seconds until the memo list is connected */
+                         NULL, /* cancel */
+                         on_client_connected,
+                         self);
+
diff --git a/bijiben.spec b/bijiben.spec
index 23e7fbb..03a0eeb 100644
--- a/bijiben.spec
+++ b/bijiben.spec
@@ -8,6 +8,9 @@ Summary:	Simple Note Viewer
 License:	GPLv3+ and LGPLv3 and LGPLv2+
 Url:		http://www.gnome.org
 Source0:	http://download.gnome.org/sources/%{name}/3.15/%{name}-%{version}.tar.xz
+# Build against e-d-s 3.13.90: from mcrha
+# https://bugzilla.gnome.org/attachment.cgi?id=297018
+Patch0:		bijiben-3.15.3-eds31390.patch
 
 
 
@@ -46,6 +49,7 @@ notes, quickly find it back.
 
 %prep
 %setup -q
+%patch0 -p1 -b .eds31390
 
 %build
 %configure \
@@ -102,7 +106,7 @@ fi
 
 %changelog
 * Tue Feb 17 2015 Adam Williamson <awilliam@redhat.com> - 3.15.3-2
-- rebuild for new e-d-s
+- rebuild for new e-d-s (patch from mrcha, BGO #744660)
 
 * Fri Dec 19 2014 Richard Hughes <rhughes@redhat.com> - 3.15.3-1
 - Update to 3.15.3