Date: Wednesday, April 20, 2022 @ 13:43:39 Author: kgizdov Revision: 1187134
fix FTBFS and FS#74460 Added: tensorboard/trunk/bazel.patch tensorboard/trunk/oauthlib-version.patch Modified: tensorboard/trunk/PKGBUILD ------------------------+ PKGBUILD | 18 +++++++++++++++--- bazel.patch | 31 +++++++++++++++++++++++++++++++ oauthlib-version.patch | 12 ++++++++++++ 3 files changed, 58 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-04-20 12:50:52 UTC (rev 1187133) +++ PKGBUILD 2022-04-20 13:43:39 UTC (rev 1187134) @@ -3,7 +3,7 @@ pkgname=tensorboard pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="TensorFlow's Visualization Toolkit" url='https://github.com/tensorflow/tensorboard' arch=('x86_64') @@ -13,10 +13,22 @@ 'python-tensorboard_plugin_wit' 'absl-py') makedepends=('bazel' 'python-setuptools' 'tree' 'rust' 'python-pip') optdepends=('python-tensorflow: advanced features for TensorBoard') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/tensorflow/tensorboard/archive/${pkgver}.tar.gz";) +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/tensorflow/tensorboard/archive/${pkgver}.tar.gz"; + oauthlib-version.patch + bazel.patch) options=('!lto') -sha512sums=('9bb53d4ce2e4735bf01e135e382ff5bcf55d41b7e8bd81061096b6a2010ac48793288eb9da9d2ee3c5ce7cd0532cbcaff72d4c0905d3ebee1c5a42fd3851dff7') +sha512sums=('9bb53d4ce2e4735bf01e135e382ff5bcf55d41b7e8bd81061096b6a2010ac48793288eb9da9d2ee3c5ce7cd0532cbcaff72d4c0905d3ebee1c5a42fd3851dff7' + 'c85bf0c6e67a19bce0af3ad2dd65851991ba15a6bb7f96433650d5a2725706e015a34166656cfb76874d2498067e6c56bdabb07d114fd9299436f68ebdf50ec3' + 'b85a33ea074c1a6022fd9c71a0d2477953400c49a1ddbad149ed356061a70f5c60b26b65dae272d1f88c8f6b22b6a12fd1a9a32322876b38d173201f87ab6846') +prepare() { + cd "$pkgname-$pkgver" + # FS#74460 + patch -Np1 -i "${srcdir}"/oauthlib-version.patch + # fix build + patch -Np1 -i "${srcdir}"/bazel.patch +} + build() { cd "$pkgname-$pkgver" Added: bazel.patch =================================================================== --- bazel.patch (rev 0) +++ bazel.patch 2022-04-20 13:43:39 UTC (rev 1187134) @@ -0,0 +1,31 @@ +diff --color -aur tensorboard-2.8.0-old/WORKSPACE tensorboard-2.8.0-new/WORKSPACE +--- tensorboard-2.8.0-old/WORKSPACE 2022-01-20 22:45:42.000000000 +0200 ++++ tensorboard-2.8.0-new/WORKSPACE 2022-04-20 16:09:22.681666037 +0300 +@@ -3,6 +3,14 @@ + load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") + + http_archive( ++ name = "build_bazel_rules_apple", ++ sha256 = "0052d452af7742c8f3a4e0929763388a66403de363775db7e90adecb2ba4944b", ++ urls = [ ++ "https://github.com/bazelbuild/rules_apple/releases/download/0.31.3/rules_apple.0.31.3.tar.gz";, ++ ], ++) ++ ++http_archive( + name = "io_bazel_rules_webtesting", + sha256 = "9bb461d5ef08e850025480bab185fd269242d4e533bca75bfb748001ceb343c3", + urls = [ +@@ -39,10 +47,9 @@ + + http_archive( + name = "build_bazel_rules_nodejs", +- sha256 = "1134ec9b7baee008f1d54f0483049a97e53a57cd3913ec9d6db625549c98395a", ++ sha256 = "e79c08a488cc5ac40981987d862c7320cee8741122a2649e9b08e850b6f20442", + urls = [ +- "http://mirror.tensorflow.org/github.com/bazelbuild/rules_nodejs/releases/download/3.4.0/rules_nodejs-3.4.0.tar.gz";, +- "https://github.com/bazelbuild/rules_nodejs/releases/download/3.4.0/rules_nodejs-3.4.0.tar.gz";, ++ "https://github.com/bazelbuild/rules_nodejs/releases/download/3.8.0/rules_nodejs-3.8.0.tar.gz"; + ], + ) + Added: oauthlib-version.patch =================================================================== --- oauthlib-version.patch (rev 0) +++ oauthlib-version.patch 2022-04-20 13:43:39 UTC (rev 1187134) @@ -0,0 +1,12 @@ +diff --color -aur tensorboard-2.8.0-old/tensorboard/pip_package/requirements.txt tensorboard-2.8.0-new/tensorboard/pip_package/requirements.txt +--- tensorboard-2.8.0-old/tensorboard/pip_package/requirements.txt 2022-01-20 22:45:42.000000000 +0200 ++++ tensorboard-2.8.0-new/tensorboard/pip_package/requirements.txt 2022-04-20 15:24:05.125066973 +0300 +@@ -21,7 +21,7 @@ + # Until this issue is closed + # https://github.com/googleapis/google-cloud-python/issues/10566 + google-auth >= 1.6.3, < 3 +-google-auth-oauthlib >= 0.4.1, < 0.5 ++google-auth-oauthlib >= 0.4.1 + markdown >= 2.6.8 + numpy >= 1.12.0 + protobuf >= 3.6.0
