From e0389baac4e8f6d7303e387287c03022d739a5ee Mon Sep 17 00:00:00 2001 From: Randy McCaskill Date: Thu, 4 Jun 2020 00:06:28 -0400 Subject: [PATCH] boinc: update to 7.16.7; fix Android false detection. --- srcpkgs/boinc/patches/arm-not-android.patch | 28 +++++++++++++++++++++ srcpkgs/boinc/template | 10 ++++---- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/srcpkgs/boinc/patches/arm-not-android.patch b/srcpkgs/boinc/patches/arm-not-android.patch index d731fd76ae0..d04f8f780a8 100644 --- a/srcpkgs/boinc/patches/arm-not-android.patch +++ b/srcpkgs/boinc/patches/arm-not-android.patch @@ -1,3 +1,21 @@ +--- client/Makefile.am 2020-05-31 01:43:58.000000000 -0400 ++++ client/Makefile.am 2020-06-06 11:31:53.051972845 -0400 +@@ -113,6 +113,7 @@ + + boinc_clientdir = $(bindir) + ++if ANDROID + if OS_ARM_LINUX + boinc_client_LDADD += libwhetneon.a libwhetvfp.a + noinst_LIBRARIES = libwhetneon.a libwhetvfp.a +@@ -122,6 +123,7 @@ + libwhetvfp_a_SOURCES = whetstone.cpp + libwhetvfp_a_CXXFLAGS = $(boinc_client_CXXFLAGS) -DANDROID_VFP -mfloat-abi=softfp -mfpu=vfp + endif ++endif + + switcher_SOURCES = switcher.cpp + switcher_LDFLAGS = $(AM_LDFLAGS) -L../lib --- client/whetstone.cpp 2018-01-14 11:07:52.000000000 +0100 +++ client/whetstone.cpp 2018-02-26 20:49:52.185904752 +0100 @@ -290,6 +290,8 @@ @@ -9,3 +27,13 @@ } #endif // namespace closure +#endif +--- configure.ac 2020-05-31 01:43:58.000000000 -0400 ++++ configure.ac 2020-06-06 11:41:14.259984481 -0400 +@@ -1051,6 +1051,7 @@ + dnl or OS2 + AM_CONDITIONAL(OS_OS2, [echo $host_os | grep '^os2' > /dev/null]) + AM_CONDITIONAL(OS_ARM_LINUX, [echo $host_alias | grep '^arm-linux' > /dev/null]) ++AM_CONDITIONAL([ANDROID], [AS_CASE([$host_os],[linux-android*],[true], [false])]) + + dnl Whether to build fcgi components + AM_CONDITIONAL(ENABLE_FCGI,[test "${enable_fcgi}" = yes]) diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template index 0e24919fb35..a359a2210c6 100644 --- a/srcpkgs/boinc/template +++ b/srcpkgs/boinc/template @@ -1,6 +1,6 @@ # Template file for 'boinc' pkgname=boinc -version=7.16.6 +version=7.16.7 revision=1 _majorver=${version%.*} wrksrc=boinc-client_release-${_majorver}-${version} @@ -10,16 +10,16 @@ makedepends="glu-devel libfreeglut-devel libcurl-devel libjpeg-turbo-devel libnotify-devel sqlite-devel libxcb-devel libXmu-devel libXi-devel gtk+-devel webkit2gtk-devel wxWidgets-gtk3-devel" depends="curl ca-certificates" -system_accounts="boinc" -boinc_homedir="/var/lib/boinc" -boinc_shell="/bin/bash" conf_files="/etc/default/boinc-client" short_desc="Berkely Infrastructure for Network Computing" maintainer="Jürgen Buchmüller " license="LGPL-3.0-or-later" homepage="https://boinc.berkeley.edu/" distfiles="https://github.com/BOINC/boinc/archive/client_release/${_majorver}/${version}.tar.gz>boinc-${version}.tar.gz" -checksum=caa567da8d3eb50859efe2eeba1c23c7b27d3b0f15b548136e75302713b25303 +checksum=38130d532031e75701eee910da64b9eb837e5bfeff9979dbb200c37146be3fed +system_accounts="boinc" +boinc_homedir="/var/lib/boinc" +boinc_shell="/bin/bash" conflicts="boinc-nox>=0" CXXFLAGS="-Wno-redundant-decls"