From c897f9291a940b075a7e10270a89625a083b0612 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 23 Nov 2022 14:06:05 +0100 Subject: boinc-client: Update boinc from 7.18.1 to 7.20.4 Drop patches now upstream, or deprecated due to gtk3 switch Signed-off-by: Gianfranco Costamagna Signed-off-by: Gianfranco Costamagna Signed-off-by: Khem Raj --- .../recipes-extended/boinc/boinc-client/4563.patch | 36 --------- .../boinc/boinc-client/gtk-configure.patch | 28 ------- .../recipes-extended/boinc/boinc-client_7.18.1.bb | 91 ---------------------- .../recipes-extended/boinc/boinc-client_7.20.4.bb | 81 +++++++++++++++++++ 4 files changed, 81 insertions(+), 155 deletions(-) delete mode 100644 meta-oe/recipes-extended/boinc/boinc-client/4563.patch delete mode 100644 meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch delete mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb create mode 100644 meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-extended/boinc/boinc-client/4563.patch b/meta-oe/recipes-extended/boinc/boinc-client/4563.patch deleted file mode 100644 index a18da45395..0000000000 --- a/meta-oe/recipes-extended/boinc/boinc-client/4563.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 689dc20ede9768377d4032ff8c70b58269c8dc9c Mon Sep 17 00:00:00 2001 -From: Charlie Fenton -Date: Mon, 18 Oct 2021 01:43:08 -0700 -Subject: [PATCH 01/10] Mac: update dependent libraries to latest: - c-ares-1.17.2, curl-7.79.1, freetype-2.11.0, openssl-3.0.0 Previously updated - to wxWidgets-3.1.5. FTGL version ftgl-2.1.3~rc5 is still the current - version. - ---- - lib/crypt.cpp | 7 +- - 8 files changed, 199 insertions(+), 150 deletions(-) - -diff --git a/lib/crypt.cpp b/lib/crypt.cpp -index 01249cfc340..9b1f69160b8 100644 ---- a/lib/crypt.cpp -+++ b/lib/crypt.cpp -@@ -1,6 +1,6 @@ - // This file is part of BOINC. - // http://boinc.berkeley.edu --// Copyright (C) 2008 University of California -+// Copyright (C) 2021 University of California - // - // BOINC is free software; you can redistribute it and/or modify it - // under the terms of the GNU Lesser General Public License -@@ -672,7 +672,10 @@ int check_validity_of_cert( - } - #ifdef HAVE_OPAQUE_RSA_DSA_DH - RSA *rsa; -- rsa = EVP_PKEY_get0_RSA(pubKey); -+ // CAUTION: In OpenSSL 3.0.0, EVP_PKEY_get0_RSA() now returns a -+ // pointer of type "const struct rsa_st*" to an immutable value. -+ // Do not try to modify the contents of the returned struct. -+ rsa = (rsa_st*)EVP_PKEY_get0_RSA(pubKey); - if (!RSA_blinding_on(rsa, c)) { - #else - if (!RSA_blinding_on(pubKey->pkey.rsa, c)) { diff --git a/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch b/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch deleted file mode 100644 index 3b814e903c..0000000000 --- a/meta-oe/recipes-extended/boinc/boinc-client/gtk-configure.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d53e9617fb6446780478bb13907efd111f241cd1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 3 Nov 2016 01:20:33 -0700 -Subject: [PATCH] Check for gtk2+ only when manager is enabled - -Signed-off-by: Khem Raj -Upstream-Status: Pending - ---- - configure.ac | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7beeb34ae2..35234c2762 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1044,6 +1044,11 @@ else - AM_CONDITIONAL([GUI_GTK], false) - fi - -+dnl ---------- GTK+2.0----------------------------------------------------- -+if test "X${no_x}" != "Xyes"; then -+ PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) -+fi -+ - dnl ---------- libNotify -------------------------------------------------- - if test "${enable_manager}" = yes ; then - PKG_CHECK_MODULES(LIBNOTIFY, [libnotify]) diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb deleted file mode 100644 index 8f85a508e7..0000000000 --- a/meta-oe/recipes-extended/boinc/boinc-client_7.18.1.bb +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright (C) 2016 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Open-source software for volunteer computing" -DESCRIPTION = "The Berkeley Open Infrastructure for Network Computing (BOINC) is an open- \ -source software platform which supports distributed computing, primarily in \ -the form of volunteer computing and desktop Grid computing. It is well \ -suited for problems which are often described as trivially parallel. BOINC \ -is the underlying software used by projects such as SETI@home, Einstein@Home, \ -ClimatePrediciton.net, the World Community Grid, and many other distributed \ -computing projects. \ -This package installs the BOINC client software, which will allow your \ -computer to participate in one or more BOINC projects, using your spare \ -computer time to search for cures for diseases, model protein folding, study \ -global warming, discover sources of gravitational waves, and many other types \ -of scientific and mathematical research." - -HOMEPAGE = "http://boinc.berkeley.edu/" -LICENSE = "LGPL-2.0-or-later & GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" -SECTION = "applications" -DEPENDS = "curl \ - jpeg \ - openssl \ - sqlite3 \ - virtual/egl \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libnotify', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \ - nettle \ -" -SRCREV = "b49adfb118211e11c719766c0d71e7bdfe7f3363" -BRANCH = "client_release/7/7.18" -SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ - file://boinc-AM_CONDITIONAL.patch \ - file://gtk-configure.patch \ - file://4563.patch \ - file://0001-scripts-Do-not-check-for-files-on-build-host.patch \ -" - -inherit gettext autotools pkgconfig features_check systemd - -REQUIRED_DISTRO_FEATURES += "opengl" - -S = "${WORKDIR}/git" - -EXTRA_OECONF += "\ - --enable-libraries \ - --enable-unicode \ - --enable-shared \ - --enable-dynamic-client-linkage \ - --enable-client \ - --disable-server \ - --disable-static \ - --disable-manager \ - --with-ssl=${STAGING_EXECPREFIXDIR} \ - --without-wxdir \ - --without-x \ - --with-boinc-platform=${TARGET_SYS} \ - ac_cv_c_undeclared_builtin_options='none' \ -" -export PKG_CONFIG = "${STAGING_BINDIR_NATIVE}/pkg-config" - -do_configure:prepend () { - if [ "${@bb.utils.contains('DEPENDS', 'gtk+', '1', '0', d)}" = "0" ] - then - export GTK2_CFLAGS="" - export GTK2_LIBS="" - fi -} - -do_compile:prepend () { - # Disable rpaths - sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${B}/libtool - sed -i -e 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec=""|g' ${B}/libtool - sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/libtool -} - -do_install:prepend() { - # help script install a bit to do right thing for OE - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - mkdir -p ${D}${systemd_system_unitdir} - else - mkdir -p ${D}${sysconfdir}/init.d - fi - mkdir -p ${D}${sysconfdir}/default -} - -SYSTEMD_SERVICE:${PN} = "boinc-client.service" - -FILES:${PN} += "${libdir}/systemd" diff --git a/meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb b/meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb new file mode 100644 index 0000000000..4cbbca23f2 --- /dev/null +++ b/meta-oe/recipes-extended/boinc/boinc-client_7.20.4.bb @@ -0,0 +1,81 @@ +# Copyright (C) 2016 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Open-source software for volunteer computing" +DESCRIPTION = "The Berkeley Open Infrastructure for Network Computing (BOINC) is an open- \ +source software platform which supports distributed computing, primarily in \ +the form of volunteer computing and desktop Grid computing. It is well \ +suited for problems which are often described as trivially parallel. BOINC \ +is the underlying software used by projects such as SETI@home, Einstein@Home, \ +ClimatePrediciton.net, the World Community Grid, and many other distributed \ +computing projects. \ +This package installs the BOINC client software, which will allow your \ +computer to participate in one or more BOINC projects, using your spare \ +computer time to search for cures for diseases, model protein folding, study \ +global warming, discover sources of gravitational waves, and many other types \ +of scientific and mathematical research." + +HOMEPAGE = "http://boinc.berkeley.edu/" +LICENSE = "LGPL-2.0-or-later & GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSER;md5=6a6a8e020838b23406c81b19c1d46df6" +SECTION = "applications" +DEPENDS = "curl \ + jpeg \ + openssl \ + sqlite3 \ + virtual/egl \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libnotify', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+3 wxwidgets libnotify xcb-util libxscrnsaver', '', d)} \ + nettle \ +" +SRCREV = "1eca0c7931d0409d65a1254dc5d5c46abe058daa" +BRANCH = "client_release/7/7.20" +SRC_URI = "git://github.com/BOINC/boinc;protocol=https;branch=${BRANCH} \ + file://boinc-AM_CONDITIONAL.patch \ + file://0001-scripts-Do-not-check-for-files-on-build-host.patch \ +" + +inherit gettext autotools pkgconfig features_check systemd + +REQUIRED_DISTRO_FEATURES += "opengl" + +S = "${WORKDIR}/git" + +EXTRA_OECONF += "\ + --enable-libraries \ + --enable-unicode \ + --enable-shared \ + --enable-dynamic-client-linkage \ + --enable-client \ + --disable-server \ + --disable-static \ + --disable-manager \ + --with-ssl=${STAGING_EXECPREFIXDIR} \ + --without-wxdir \ + --without-x \ + --with-boinc-platform=${TARGET_SYS} \ + ac_cv_c_undeclared_builtin_options='none' \ +" +export PKG_CONFIG = "${STAGING_BINDIR_NATIVE}/pkg-config" + +do_compile:prepend () { + # Disable rpaths + sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' ${B}/libtool + sed -i -e 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec=""|g' ${B}/libtool + sed -i -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' ${B}/libtool +} + +do_install:prepend() { + # help script install a bit to do right thing for OE + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + mkdir -p ${D}${systemd_system_unitdir} + else + mkdir -p ${D}${sysconfdir}/init.d + fi + mkdir -p ${D}${sysconfdir}/default +} + +SYSTEMD_SERVICE:${PN} = "boinc-client.service" + +FILES:${PN} += "${libdir}/systemd" -- cgit v1.2.3-54-g00ecf