From d4f48ecd4910a6fcb3fe3f66f0e2ad770f35efdc Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 16 Jul 2017 09:32:09 +0200
Subject: [PATCH] - updated to 3.24.0 - added types patch (fix format string
 outside x86_64) - added localedir patch (fix locale dir define)

---
 bijiben-localedir.patch | 22 ++++++++++++++++++++++
 bijiben-types.patch     | 19 +++++++++++++++++++
 bijiben.spec            | 18 ++++++++++--------
 3 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 bijiben-localedir.patch
 create mode 100644 bijiben-types.patch

diff --git a/bijiben-localedir.patch b/bijiben-localedir.patch
new file mode 100644
index 0000000..c9904c5
--- /dev/null
+++ b/bijiben-localedir.patch
@@ -0,0 +1,22 @@
+--- bijiben-3.24.0/src/Makefile.am.orig	2017-05-25 02:15:49.000000000 +0200
++++ bijiben-3.24.0/src/Makefile.am	2017-07-16 09:23:26.593855414 +0200
+@@ -9,7 +9,7 @@
+ 
+ AM_CPPFLAGS = \
+ 	-DDATADIR=\""$(datadir)"\" \
+-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
++	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
+ 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	-I$(top_srcdir)/libgd \
+--- bijiben-3.24.0/src/libbiji/Makefile.am.orig	2017-05-25 02:15:49.000000000 +0200
++++ bijiben-3.24.0/src/libbiji/Makefile.am	2017-07-16 09:23:47.530521843 +0200
+@@ -6,7 +6,7 @@
+ 
+ AM_CPPFLAGS = \
+ 	-DDATADIR=\""$(datadir)"\" \
+-	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
++	-DPACKAGE_LOCALE_DIR=\""$(datadir)/locale"\" \
+ 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	-I$(top_srcdir)/libgd \
diff --git a/bijiben-types.patch b/bijiben-types.patch
new file mode 100644
index 0000000..994638b
--- /dev/null
+++ b/bijiben-types.patch
@@ -0,0 +1,19 @@
+--- bijiben-3.24.0/src/libbiji/provider/biji-memo-provider.c.orig	2017-05-25 02:15:49.000000000 +0200
++++ bijiben-3.24.0/src/libbiji/provider/biji-memo-provider.c	2017-07-16 08:59:26.097205197 +0200
+@@ -25,6 +25,7 @@
+  */
+ 
+ 
++#include <inttypes.h>
+ #include <libecal/libecal.h>        /* ECalClient      */
+ #include <libgd/gd.h>               /* Embed in frame  */
+ 
+@@ -200,7 +201,7 @@
+ 
+     create_note_from_item (item);
+     /* debug pour tracker. Il faut en plus datasource->urn */
+-    g_debug ("created=%li", item->set.created);
++    g_debug ("created=%"PRIi64, item->set.created);
+     g_debug ("title=%s", item->set.title);
+     g_debug ("url=%s", item->set.url);
+     g_debug ("content=%s\n================\n\n\n", item->set.content);
diff --git a/bijiben.spec b/bijiben.spec
index ee7d64d..4b1b3ef 100644
--- a/bijiben.spec
+++ b/bijiben.spec
@@ -1,12 +1,14 @@
 Summary:	Bijiben - notes editor
 Summary(pl.UTF-8):	Bijiben - edytor notatek
 Name:		bijiben
-Version:	3.20.2
+Version:	3.24.0
 Release:	1
 License:	GPL v3+
 Group:		X11/Applications/Editors
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/bijiben/3.20/%{name}-%{version}.tar.xz
-# Source0-md5:	1d5d71dffbf6fd28f8b43e1fa2484c07
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/bijiben/3.24/%{name}-%{version}.tar.xz
+# Source0-md5:	9f7b891cc4f64ef862e60b08c1b2c69d
+Patch0:		%{name}-types.patch
+Patch1:		%{name}-localedir.patch
 URL:		https://wiki.gnome.org/Apps/Bijiben
 BuildRequires:	appstream-glib-devel
 BuildRequires:	autoconf >= 2.50
@@ -17,10 +19,10 @@ BuildRequires:	gettext-tools
 BuildRequires:	glib2-devel >= 1:2.28
 BuildRequires:	gnome-online-accounts-devel
 BuildRequires:	gtk+3-devel >= 3.11.4
-BuildRequires:	gtk-webkit3-devel
+BuildRequires:	gtk-webkit4-devel >= 2.10.0
 BuildRequires:	intltool >= 0.50.1
 BuildRequires:	libxml2-devel >= 2.0
-BuildRequires:	libtool
+BuildRequires:	libtool >= 2:2
 BuildRequires:	libuuid-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.592
@@ -36,6 +38,7 @@ Requires(post,postun):	shared-mime-info
 Requires:	evolution-data-server >= 3.13.90
 Requires:	glib2 >= 1:2.28
 Requires:	gtk+3 >= 3.11.4
+Requires:	gtk-webkit4 >= 2.10.0
 Requires:	hicolor-icon-theme
 Requires:	shared-mime-info
 Requires:	tracker-libs >= 1.0
@@ -51,9 +54,8 @@ zintegrowanego z pulpitem.
 
 %prep
 %setup -q
-
-# outdated macro
-%{__sed} -i -e '/^GNOME_DOC_PREPARE/d' configure.ac
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}
-- 
2.44.0