[PR PATCH] boinc: update to 7.22.0

[PR PATCH] boinc: update to 7.22.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 532 bytes --]

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages O3boinc
https://github.com/void-linux/void-packages/pull/42131

boinc: update to 7.22.0
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

Fixes the build failure https://github.com/void-linux/void-packages/issues/39083 as well as builds with openssl3 #37681 

A patch file from https://github.com/void-linux/void-packages/pull/42131.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3boinc-42131.patch --]
[-- Type: text/x-diff, Size: 4639 bytes --]

From 238d9d24c5931d3f6a56b9424ec7a76a57db0b15 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 7 Feb 2023 09:45:28 -0500
Subject: [PATCH] boinc: update to 7.22.0

---
 srcpkgs/boinc/patches/arm-not-android.patch   | 39 -------------------
 .../boinc/patches/boinc-am_conditional.patch  | 22 -----------
 srcpkgs/boinc/template                        | 10 +++--
 3 files changed, 7 insertions(+), 64 deletions(-)
 delete mode 100644 srcpkgs/boinc/patches/arm-not-android.patch
 delete mode 100644 srcpkgs/boinc/patches/boinc-am_conditional.patch

diff --git a/srcpkgs/boinc/patches/arm-not-android.patch b/srcpkgs/boinc/patches/arm-not-android.patch
deleted file mode 100644
index 18f64e994279..000000000000
--- a/srcpkgs/boinc/patches/arm-not-android.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/client/Makefile.am	2020-05-31 01:43:58.000000000 -0400
-+++ b/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
---- a/client/whetstone.cpp	2018-01-14 11:07:52.000000000 +0100
-+++ b/client/whetstone.cpp	2018-02-26 20:49:52.185904752 +0100
-@@ -290,6 +290,8 @@
-     return 0;
- }
- 
-+#ifdef ANDROID
- #if defined(ANDROID_NEON) || defined(ANDROID_VFP)
-   }
- #endif // namespace closure
-+#endif
---- a/configure.ac	2020-05-31 01:43:58.000000000 -0400
-+++ b/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/patches/boinc-am_conditional.patch b/srcpkgs/boinc/patches/boinc-am_conditional.patch
deleted file mode 100644
index a7657d7f1d23..000000000000
--- a/srcpkgs/boinc/patches/boinc-am_conditional.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Add objective c++ program and check for gtk+3
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,6 +39,7 @@ AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_F77
- AC_PROG_CPP
-+AC_PROG_OBJCXX
- AC_PROG_MAKE_SET
- SAH_LINKS
- AC_LANG_PUSH(C)
-@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
- AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
- AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
- 
-+PKG_CHECK_MODULES([GTK3], [gtk+-3.0])
-+
- dnl ======================================================================
- dnl some more vodoo required for building portable client-binary (client, clientgui)
- dnl ======================================================================
-
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 1ab9457df318..32eb5d7fe9b2 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
-version=7.16.20
-revision=2
+version=7.22.0
+revision=1
 _majorver=${version%.*}
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config xorgproto shared-mime-info"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=ed2457023ed72a2ba5460494fe016032dd2cf49d9d755e1386d16a4333db7332
+checksum=7c7014300cb6e859b6f784f5c76ff2cb96d36ae35d90e03d1e2e59174cb7c927
 system_accounts="boinc"
 boinc_homedir="/var/lib/boinc"
 boinc_shell="/bin/bash"
@@ -30,6 +30,7 @@ esac
 pre_configure() {
 	autoreconf -if
 }
+
 do_configure() {
 	if [ -n "$CROSS_BUILD" ]; then
 		# XXX: cross building used to be a lot easier
@@ -85,12 +86,14 @@ do_configure() {
 		--without-x \
 		--without-wxdir
 }
+
 do_build() {
 	cd ${wrksrc}/x11
 	make ${makejobs}
 	cd ${wrksrc}/nox
 	make ${makejobs}
 }
+
 do_install() {
 	cd ${wrksrc}/x11
 	make ${makejobs} DESTDIR="${DESTDIR}" install
@@ -125,6 +128,7 @@ boinc-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
 boinc-nox_package() {
 	short_desc+=" - no X"
 	conflicts="boinc>=0"

Re: [PR PATCH] [Updated] boinc: update to 7.22.0

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 537 bytes --]

There is an updated pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages O3boinc
https://github.com/void-linux/void-packages/pull/42131

boinc: update to 7.22.0
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

Fixes the build failure https://github.com/void-linux/void-packages/issues/39083 as well as builds with openssl3 #37681 

A patch file from https://github.com/void-linux/void-packages/pull/42131.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-O3boinc-42131.patch --]
[-- Type: text/x-diff, Size: 4948 bytes --]

From 982e062ea2aaa5e759e3e6575defe6ef6753be69 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Tue, 7 Feb 2023 09:45:28 -0500
Subject: [PATCH] boinc: update to 7.22.0

---
 srcpkgs/boinc/patches/arm-not-android.patch   | 47 +++++--------------
 .../boinc/patches/boinc-am_conditional.patch  | 22 ---------
 srcpkgs/boinc/template                        | 10 ++--
 3 files changed, 20 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/boinc/patches/boinc-am_conditional.patch

diff --git a/srcpkgs/boinc/patches/arm-not-android.patch b/srcpkgs/boinc/patches/arm-not-android.patch
index 18f64e994279..8c7c2399d2b6 100644
--- a/srcpkgs/boinc/patches/arm-not-android.patch
+++ b/srcpkgs/boinc/patches/arm-not-android.patch
@@ -1,39 +1,18 @@
---- a/client/Makefile.am	2020-05-31 01:43:58.000000000 -0400
-+++ b/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
---- a/client/whetstone.cpp	2018-01-14 11:07:52.000000000 +0100
-+++ b/client/whetstone.cpp	2018-02-26 20:49:52.185904752 +0100
-@@ -290,6 +290,8 @@
+ client/whetstone.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/client/whetstone.cpp b/client/whetstone.cpp
+index 230efb1210..6e2472ca9e 100644
+--- a/client/whetstone.cpp 
++++ b/client/whetstone.cpp 
+@@ -290,6 +290,8 @@ int whetstone(double& flops, double& cpu_time, double min_cpu_time) { 
      return 0;
  }
- 
-+#ifdef ANDROID
+
++#ifdef ANDROID 
  #if defined(ANDROID_NEON) || defined(ANDROID_VFP)
    }
  #endif // namespace closure
-+#endif
---- a/configure.ac	2020-05-31 01:43:58.000000000 -0400
-+++ b/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])
++#endif 
+--  
+2.39.1 
diff --git a/srcpkgs/boinc/patches/boinc-am_conditional.patch b/srcpkgs/boinc/patches/boinc-am_conditional.patch
deleted file mode 100644
index a7657d7f1d23..000000000000
--- a/srcpkgs/boinc/patches/boinc-am_conditional.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Add objective c++ program and check for gtk+3
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -39,6 +39,7 @@ AC_PROG_CC
- AC_PROG_CXX
- AC_PROG_F77
- AC_PROG_CPP
-+AC_PROG_OBJCXX
- AC_PROG_MAKE_SET
- SAH_LINKS
- AC_LANG_PUSH(C)
-@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test "
- AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes])
- AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so])
- 
-+PKG_CHECK_MODULES([GTK3], [gtk+-3.0])
-+
- dnl ======================================================================
- dnl some more vodoo required for building portable client-binary (client, clientgui)
- dnl ======================================================================
-
diff --git a/srcpkgs/boinc/template b/srcpkgs/boinc/template
index 1ab9457df318..32eb5d7fe9b2 100644
--- a/srcpkgs/boinc/template
+++ b/srcpkgs/boinc/template
@@ -1,7 +1,7 @@
 # Template file for 'boinc'
 pkgname=boinc
-version=7.16.20
-revision=2
+version=7.22.0
+revision=1
 _majorver=${version%.*}
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config xorgproto shared-mime-info"
@@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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=ed2457023ed72a2ba5460494fe016032dd2cf49d9d755e1386d16a4333db7332
+checksum=7c7014300cb6e859b6f784f5c76ff2cb96d36ae35d90e03d1e2e59174cb7c927
 system_accounts="boinc"
 boinc_homedir="/var/lib/boinc"
 boinc_shell="/bin/bash"
@@ -30,6 +30,7 @@ esac
 pre_configure() {
 	autoreconf -if
 }
+
 do_configure() {
 	if [ -n "$CROSS_BUILD" ]; then
 		# XXX: cross building used to be a lot easier
@@ -85,12 +86,14 @@ do_configure() {
 		--without-x \
 		--without-wxdir
 }
+
 do_build() {
 	cd ${wrksrc}/x11
 	make ${makejobs}
 	cd ${wrksrc}/nox
 	make ${makejobs}
 }
+
 do_install() {
 	cd ${wrksrc}/x11
 	make ${makejobs} DESTDIR="${DESTDIR}" install
@@ -125,6 +128,7 @@ boinc-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
 boinc-nox_package() {
 	short_desc+=" - no X"
 	conflicts="boinc>=0"

Re: boinc: update to 7.22.0

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/42131#issuecomment-1424125318

Comment:
Tested and working fine for me

Re: boinc: update to 7.22.0

[TinfoilSubmarine]

[-- Attachment #1: Type: text/plain, Size: 199 bytes --]

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/42131#issuecomment-1424125318

Comment:
Tested and working fine for me (on x86_64-glibc)

Re: [PR PATCH] [Merged]: boinc: update to 7.22.0

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 387 bytes --]

There's a merged pull request on the void-packages repository

boinc: update to 7.22.0
https://github.com/void-linux/void-packages/pull/42131

Description:
- I tested the changes in this PR: no
- I built this PR locally for my native architecture, (x86_64-musl)

Fixes the build failure https://github.com/void-linux/void-packages/issues/39083 as well as builds with openssl3 #37681