From effc8007305ec404667cde52211ca0e2f1fa42b8 Mon Sep 17 00:00:00 2001
From: Leonid Pliushch <leonid.pliushch@gmail.com>
Date: Thu, 16 Apr 2020 14:53:18 +0300
Subject: [PATCH] boinc: update patches

As suggested in https://github.com/termux/termux-packages/issues/5048#issuecomment-614472026.
---
 packages/boinc/build.sh                              |  4 ++--
 packages/boinc/lib-synch.cpp.patch                   | 12 ++++++++++++
 packages/boinc/lib-synch.h.patch                     | 12 ------------
 .../boinc/{no-hardlins.patch => no-hardlinks.patch}  |  0
 4 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 packages/boinc/lib-synch.cpp.patch
 delete mode 100644 packages/boinc/lib-synch.h.patch
 rename packages/boinc/{no-hardlins.patch => no-hardlinks.patch} (100%)

diff --git a/packages/boinc/build.sh b/packages/boinc/build.sh
index 6b6112c12..4cbb36704 100644
--- a/packages/boinc/build.sh
+++ b/packages/boinc/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open-source software for volunteer computing"
 TERMUX_PKG_LICENSE="GPL-3.0"
 _MAJOR_VERSION=7.16
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.6
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/BOINC/boinc/archive/client_release/${_MAJOR_VERSION}/${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=caa567da8d3eb50859efe2eeba1c23c7b27d3b0f15b548136e75302713b25303
 TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libcurl, openssl, zlib"
@@ -18,7 +19,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 TERMUX_PKG_CONFFILES="etc/boinc-client.conf"
 
 termux_step_pre_configure() {
-	CPPFLAGS+=" -DANDROID"
-	LDFLAGS+=" -llog"
+	LDFLAGS+=" -landroid-shmem"
 	./_autosetup
 }
diff --git a/packages/boinc/lib-synch.cpp.patch b/packages/boinc/lib-synch.cpp.patch
new file mode 100644
index 000000000..b14163833
--- /dev/null
+++ b/packages/boinc/lib-synch.cpp.patch
@@ -0,0 +1,12 @@
+diff -uNr boinc-client_release-7.16-7.16.6/lib/synch.cpp boinc-client_release-7.16-7.16.6.mod/lib/synch.cpp
+--- boinc-client_release-7.16-7.16.6/lib/synch.cpp	2020-03-23 07:13:30.000000000 +0200
++++ boinc-client_release-7.16-7.16.6.mod/lib/synch.cpp	2020-04-16 14:37:09.972107225 +0300
+@@ -18,7 +18,7 @@
+ 
+ // interfaces for accessing sempahores
+ 
+-#ifndef ANDROID
++#ifndef __ANDROID__
+ 
+ #include "config.h"
+ #include <cstdio>
diff --git a/packages/boinc/lib-synch.h.patch b/packages/boinc/lib-synch.h.patch
deleted file mode 100644
index cf42c4961..000000000
--- a/packages/boinc/lib-synch.h.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr boinc-client_release-7.14-7.14.3/lib/synch.h boinc-client_release-7.14-7.14.3.mod/lib/synch.h
---- boinc-client_release-7.14-7.14.3/lib/synch.h	2020-03-10 01:47:48.000000000 +0000
-+++ boinc-client_release-7.14-7.14.3.mod/lib/synch.h	2020-03-20 10:26:50.144236854 +0000
-@@ -18,7 +18,7 @@
- #ifndef BOINC_SYNCH_H
- #define BOINC_SYNCH_H
- 
--#include <sys/sem.h>
-+#include <linux/sem.h>
- 
- extern int create_semaphore(key_t);
- extern int destroy_semaphore(key_t);
diff --git a/packages/boinc/no-hardlins.patch b/packages/boinc/no-hardlinks.patch
similarity index 100%
rename from packages/boinc/no-hardlins.patch
rename to packages/boinc/no-hardlinks.patch