diff --git a/.SRCINFO b/.SRCINFO index 4ba878c..67df097 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = java-cef-git pkgdesc = Java Chromium Embedded Framework (JCEF). A simple framework for embedding Chromium-based browsers in other applications using the Java programming language. - pkgver = r257.4bb479a + pkgver = r285.23a6e96 pkgrel = 1 url = https://bitbucket.org/chromiumembedded/java-cef/src/master/ arch = x86_64 @@ -11,9 +11,8 @@ depends = java-environment=11 provides = java-cef source = java-cef-git::git://github.com/chromiumembedded/java-cef.git - source = 0001-make-run.sh-from-any-location.patch + source = 0001-update-gsutil-for-python3-compatibility.patch md5sums = SKIP md5sums = SKIP pkgname = java-cef-git - diff --git a/0001-make-run.sh-from-any-location.patch b/0001-make-run.sh-from-any-location.patch deleted file mode 100644 index b9ede31..0000000 --- a/0001-make-run.sh-from-any-location.patch +++ /dev/null @@ -1,33 +0,0 @@ -From a8fe72c51887020e831288aea58b2a268e971517 Mon Sep 17 00:00:00 2001 -From: soloturn -Date: Thu, 23 Jul 2020 14:01:01 +0200 -Subject: [PATCH] make run.sh from any location - ---- - tools/distrib/linux64/run.sh | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/tools/distrib/linux64/run.sh b/tools/distrib/linux64/run.sh -index 2eabf9c..a6b74ee 100755 ---- a/tools/distrib/linux64/run.sh -+++ b/tools/distrib/linux64/run.sh -@@ -4,7 +4,8 @@ - # that can be found in the LICENSE file. - - # Determine the absolute path to the library directory. --export LIB_PATH=$(readlink -f "./bin/lib/linux64") -+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -+export LIB_PATH="${DIR}/bin/lib/linux64" - - # Necessary for jcef_helper to find libcef.so. - if [ -n "$LD_LIBRARY_PATH" ]; then -@@ -15,4 +16,5 @@ fi - export LD_LIBRARY_PATH - - # Preload libcef.so to avoid crashes. --LD_PRELOAD=$LIB_PATH/libcef.so java -cp "./bin:./bin/*" -Djava.library.path=$LIB_PATH tests.detailed.MainFrame "$@" -+LD_PRELOAD=$LIB_PATH/libcef.so java -cp "${DIR}/bin:${DIR}/bin/*" -Djava.library.path=$LIB_PATH tests.detailed.MainFrame "$@" -+ --- -2.27.0 - diff --git a/0001-update-gsutil-for-python3-compatibility.patch b/0001-update-gsutil-for-python3-compatibility.patch new file mode 100644 index 0000000..9401bd9 --- /dev/null +++ b/0001-update-gsutil-for-python3-compatibility.patch @@ -0,0 +1,25 @@ +From 5b7de73a7ae0657053de169af6a4461fd3c855ba Mon Sep 17 00:00:00 2001 +From: soloturn +Date: Sun, 7 Nov 2021 11:03:27 +0100 +Subject: [PATCH] update gsutil for python3 compatibility + +--- + tools/buildtools/download_from_google_storage.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/buildtools/download_from_google_storage.py b/tools/buildtools/download_from_google_storage.py +index 3f27954..56cd5bc 100644 +--- a/tools/buildtools/download_from_google_storage.py ++++ b/tools/buildtools/download_from_google_storage.py +@@ -78,7 +78,7 @@ class Gsutil(object): + RETRY_BASE_DELAY = 5.0 + RETRY_DELAY_MULTIPLE = 1.3 + +- def __init__(self, path, boto_path=None, version='4.46'): ++ def __init__(self, path, boto_path=None, version='5.4'): + if not os.path.exists(path): + raise FileNotFoundError('GSUtil not found in %s' % path) + self.path = path +-- +2.33.1 + diff --git a/PKGBUILD b/PKGBUILD index 00a213f..c65ddc9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ _basename=java-cef pkgname="$_basename-git" -pkgver=r257.4bb479a +pkgver=r285.23a6e96 pkgrel=1 pkgdesc="Java Chromium Embedded Framework (JCEF). A simple framework for embedding Chromium-based browsers in other applications using the Java programming language." arch=('x86_64') @@ -19,7 +19,7 @@ install= source=( "$pkgname::git://github.com/chromiumembedded/$_basename.git" - "0001-make-run.sh-from-any-location.patch" + "0001-update-gsutil-for-python3-compatibility.patch" ) noextract=() md5sums=( @@ -35,7 +35,7 @@ prepare () { cd ${pkgbase} mkdir -p jcef_build - patch -p1 -i "${srcdir}/0001-make-run.sh-from-any-location.patch" + patch -p1 -i "${srcdir}/0001-update-gsutil-for-python3-compatibility.patch" } build() {