mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-04 14:39:54 +00:00
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 <costamagnagianfranco@yahoo.it> Signed-off-by: Gianfranco Costamagna <locutusofborg@debian.org> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
d7f46fa816
commit
c897f9291a
@@ -1,36 +0,0 @@
|
||||
From 689dc20ede9768377d4032ff8c70b58269c8dc9c Mon Sep 17 00:00:00 2001
|
||||
From: Charlie Fenton <charlief@example.com>
|
||||
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)) {
|
||||
@@ -1,28 +0,0 @@
|
||||
From d53e9617fb6446780478bb13907efd111f241cd1 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Thu, 3 Nov 2016 01:20:33 -0700
|
||||
Subject: [PATCH] Check for gtk2+ only when manager is enabled
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
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])
|
||||
+3
-13
@@ -26,15 +26,13 @@ DEPENDS = "curl \
|
||||
sqlite3 \
|
||||
virtual/egl \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libnotify', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+ libnotify xcb-util libxscrnsaver', '', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+3 wxwidgets libnotify xcb-util libxscrnsaver', '', d)} \
|
||||
nettle \
|
||||
"
|
||||
SRCREV = "b49adfb118211e11c719766c0d71e7bdfe7f3363"
|
||||
BRANCH = "client_release/7/7.18"
|
||||
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://gtk-configure.patch \
|
||||
file://4563.patch \
|
||||
file://0001-scripts-Do-not-check-for-files-on-build-host.patch \
|
||||
"
|
||||
|
||||
@@ -61,14 +59,6 @@ EXTRA_OECONF += "\
|
||||
"
|
||||
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
|
||||
Reference in New Issue
Block a user