fix build due to 'bool' being a macro

I literally do not remember maintaining this package?

3 files changed, 47 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd77355c5db7..0ee87ae2457b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mail-notification
 	pkgdesc = Tray icon application that informs you if you have new mail
 	pkgver = 5.4.r69.g9ae8768
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.nongnu.org/mailnotify/
 	install = mail-notification.install
 	arch = i686
@@ -27,6 +27,7 @@ pkgbase = mail-notification
 	source = http://pkgs.fedoraproject.org/cgit/rpms/mail-notification.git/plain/mail-notification-dont-link-against-bsd-compat.patch
 	source = http://pkgs.fedoraproject.org/cgit/rpms/mail-notification.git/plain/mail-notification-eds3_23_2.patch
 	source = http://pkgs.fedoraproject.org/cgit/rpms/mail-notification.git/plain/mail-notification-gstreamer1.patch
+	source = mail-notification-bool.patch
 	source = mail-notification.desktop
 	sha256sums = SKIP
 	sha256sums = a7646259ca72b58165e4e1c8cf12b197e32807459c4291867479ef3520d39732
@@ -34,7 +35,7 @@ pkgbase = mail-notification
 	sha256sums = 2340c6001ad9dfd071f80cf0cd9b45d3fa7efada6880a530b16a3b4d36a27444
 	sha256sums = dfb9980292524a33f60c80a5abbeac8e6dad0888564105d221e3effee91fd791
 	sha256sums = bc1ccc9aba228a7446732e078775ca6972a549ee77a70d7bc89c464830ab178b
+	sha256sums = 18234400d819e84184127746001975cd9361d03f0d21c9688833639e33dc72e2
 	sha256sums = 6a1a683da2a83e596999b261d3830a10678b46d16317c5ac3615ab29fffe6a38
 
 pkgname = mail-notification
-
diff --git a/PKGBUILD b/PKGBUILD
index 26d512e11d5c..e5c34f403b6c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=mail-notification
 pkgver=5.4.r69.g9ae8768
-pkgrel=5
+pkgrel=6
 pkgdesc="Tray icon application that informs you if you have new mail"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/mailnotify/"
@@ -19,6 +19,7 @@ source=(git+https://github.com/epienbroek/mail-notification.git
         http://pkgs.fedoraproject.org/cgit/rpms/mail-notification.git/plain/mail-notification-dont-link-against-bsd-compat.patch
         http://pkgs.fedoraproject.org/cgit/rpms/mail-notification.git/plain/mail-notification-eds3_23_2.patch
         http://pkgs.fedoraproject.org/cgit/rpms/mail-notification.git/plain/mail-notification-gstreamer1.patch
+        mail-notification-bool.patch
         mail-notification.desktop)
 sha256sums=('SKIP'
             'a7646259ca72b58165e4e1c8cf12b197e32807459c4291867479ef3520d39732'
@@ -26,6 +27,7 @@ sha256sums=('SKIP'
             '2340c6001ad9dfd071f80cf0cd9b45d3fa7efada6880a530b16a3b4d36a27444'
             'dfb9980292524a33f60c80a5abbeac8e6dad0888564105d221e3effee91fd791'
             'bc1ccc9aba228a7446732e078775ca6972a549ee77a70d7bc89c464830ab178b'
+            '18234400d819e84184127746001975cd9361d03f0d21c9688833639e33dc72e2'
             '6a1a683da2a83e596999b261d3830a10678b46d16317c5ac3615ab29fffe6a38')
 
 pkgver() {
@@ -43,6 +45,7 @@ prepare() {
   patch -Np0 < "$srcdir/mail-notification-dont-link-against-bsd-compat.patch"
   patch -Np1 < "$srcdir/mail-notification-eds3_23_2.patch"
   patch -Np1 < "$srcdir/mail-notification-gstreamer1.patch"
+  patch -Np1 < "$srcdir/mail-notification-bool.patch"
 
   cp -p /usr/share/libtool/build-aux/config.{guess,sub} jbsrc/tools/
 }
diff --git a/mail-notification-bool.patch b/mail-notification-bool.patch
new file mode 100644
index 000000000000..60a22f599efe
--- /dev/null
+++ b/mail-notification-bool.patch
@@ -0,0 +1,40 @@
+diff --git a/src/mn-conf.c b/src/mn-conf.c
+index a5aca91..ed29ed4 100644
+--- a/src/mn-conf.c
++++ b/src/mn-conf.c
+@@ -452,10 +452,34 @@ mn_conf_set_value (const char *key, const GConfValue *value)
+   CONF_GETTER(name, get_ctype, fail_retval)				\
+   CONF_SETTER(name, set_ctype)
+ 
+-CONF_ACCESSORS(bool, gboolean, gboolean, FALSE)
+ CONF_ACCESSORS(int, int, int, 0)
+ CONF_ACCESSORS(string, char *, const char *, NULL)
+ 
++gboolean
++mn_conf_get_bool (const char *key)
++{
++  gboolean v;
++  GError *err = NULL;
++
++  g_return_val_if_fail(key != NULL, FALSE);
++
++  v = gconf_client_get_bool(mn_conf_get_client(), key, &err);
++  handle_error(&err);
++
++  return v;
++}
++
++void
++mn_conf_set_bool (const char *key, gboolean value)
++{
++	GError *err = NULL;
++
++	g_return_if_fail(key != NULL);
++
++	gconf_client_set_bool(mn_conf_get_client(), key, value, &err);
++	handle_error(&err);
++}
++
+ GSList *
+ mn_conf_get_string_list (const char *key)
+ {