diff --git a/download_cef.sh b/download_cef.sh index 6c638fc..2d6a3f2 100755 --- a/download_cef.sh +++ b/download_cef.sh @@ -12,20 +12,20 @@ ARCH=`uname -m` if [ "$ARCH" == "x86_64" ] then - wget "https://cef-builds.spotifycdn.com/cef_binary_90.6.7%2Bg19ba721%2Bchromium-90.0.4430.212_linux64.tar.bz2" -O cef_unverified.tar.bz2 - SHA1="f449aac4e0ce2d0a3f6da0005a0ade010b83103c" + wget "https://cef-builds.spotifycdn.com/cef_binary_94.3.0%2Bgffef496%2Bchromium-94.0.4606.54_linux64.tar.bz2" -O cef_unverified.tar.bz2 + SHA1="1b1d834449aa54ae8887d8056eb9a6b961c1c997" elif [[ "$ARCH" =~ ^i[3-7]86$ ]] then - wget "https://cef-builds.spotifycdn.com/cef_binary_90.6.7%2Bg19ba721%2Bchromium-90.0.4430.212_linux32.tar.bz2" -O cef_unverified.tar.bz2 - SHA1="7d90fed73ac42020973363ad924fd6fbad7a524b" + wget "https://cef-builds.spotifycdn.com/cef_binary_94.3.0%2Bgffef496%2Bchromium-94.0.4606.54_linux32.tar.bz2" -O cef_unverified.tar.bz2 + SHA1="0806720a62a05e4da1269c335b15d7c13feb87cf" elif [ "$ARCH" == "armv7l" ] then - wget "https://cef-builds.spotifycdn.com/cef_binary_90.6.7%2Bg19ba721%2Bchromium-90.0.4430.212_linuxarm.tar.bz2" -O cef_unverified.tar.bz2 - SHA1="4c00009546821772ea6fe9a96b99f3843a9edf30" + wget "https://cef-builds.spotifycdn.com/cef_binary_94.3.0%2Bgffef496%2Bchromium-94.0.4606.54_linuxarm.tar.bz2" -O cef_unverified.tar.bz2 + SHA1="6972594641d4ee565e7ded3b913a4ce0030a3022" elif [ "$ARCH" == "aarch64" ] then - wget "https://cef-builds.spotifycdn.com/cef_binary_90.6.7%2Bg19ba721%2Bchromium-90.0.4430.212_linuxarm64.tar.bz2" -O cef_unverified.tar.bz2 - SHA1="828c1aad32eecfecccc120e1f0cebf629891eb05" + wget "https://cef-builds.spotifycdn.com/cef_binary_94.3.0%2Bgffef496%2Bchromium-94.0.4606.54_linuxarm64.tar.bz2" -O cef_unverified.tar.bz2 + SHA1="0c88d899874aa3811bc1b5b34cd91b398b8f4469" else echo "Unsupported architecture" exit 1 diff --git a/src/common.cpp b/src/common.cpp index d9dc838..96d1ddd 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -1,6 +1,7 @@ #include "common.hpp" #include "include/wrapper/cef_closure_task.h" +#include "include/base/cef_callback.h" namespace browservice { diff --git a/src/config.cpp b/src/config.cpp index ea39a6f..72e635a 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -6,7 +6,7 @@ namespace browservice { -const char* BrowserviceVersion = "0.9.2.2"; +const char* BrowserviceVersion = "0.9.3.0"; namespace { diff --git a/src/main.cpp b/src/main.cpp index 50a125d..65fae5a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -8,6 +8,7 @@ #include #include "include/wrapper/cef_closure_task.h" +#include "include/base/cef_callback.h" #include "include/cef_app.h" #include diff --git a/src/timeout.cpp b/src/timeout.cpp index b5377d5..d158ef7 100644 --- a/src/timeout.cpp +++ b/src/timeout.cpp @@ -1,6 +1,7 @@ #include "timeout.hpp" #include "include/wrapper/cef_closure_task.h" +#include "include/base/cef_callback.h" namespace browservice { diff --git a/tools/appimage_build_data/build_appimage_impl.sh b/tools/appimage_build_data/build_appimage_impl.sh index 966e238..eafbf4e 100755 --- a/tools/appimage_build_data/build_appimage_impl.sh +++ b/tools/appimage_build_data/build_appimage_impl.sh @@ -128,7 +128,7 @@ done U bash -c "echo \$(ls deps | sort) > depnamelist" msg "Library dependencies: $(cat depnamelist)" -if [ "$(cat depnamelist)" != "libGL.so.1 libGLX.so.0 libGLdispatch.so.0 libPocoCrypto.so.50 libPocoFoundation.so.50 libPocoNet.so.50 libX11.so.6 libXau.so.6 libXcomposite.so.1 libXcursor.so.1 libXdamage.so.1 libXdmcp.so.6 libXext.so.6 libXfixes.so.3 libXfont2.so.2 libXi.so.6 libXinerama.so.1 libXmuu.so.1 libXrandr.so.2 libXrender.so.1 libasound.so.2 libatk-1.0.so.0 libatk-bridge-2.0.so.0 libatspi.so.0 libaudit.so.1 libavahi-client.so.3 libavahi-common.so.3 libblkid.so.1 libbsd.so.0 libbz2.so.1.0 libcairo-gobject.so.2 libcairo.so.2 libcap-ng.so.0 libcom_err.so.2 libcrypto.so.1.1 libcups.so.2 libdatrie.so.1 libdbus-1.so.3 libdrm.so.2 libepoxy.so.0 libexpat.so.1 libffi.so.6 libfontconfig.so.1 libfontenc.so.1 libfreetype.so.6 libgbm.so.1 libgcc_s.so.1 libgcrypt.so.20 libgdk-3.so.0 libgdk_pixbuf-2.0.so.0 libgio-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgnutls.so.30 libgobject-2.0.so.0 libgpg-error.so.0 libgraphite2.so.3 libgssapi_krb5.so.2 libgtk-3.so.0 libharfbuzz.so.0 libhogweed.so.4 libjpeg.so.8 libk5crypto.so.3 libkeyutils.so.1 libkrb5.so.3 libkrb5support.so.0 liblz4.so.1 liblzma.so.5 libmount.so.1 libmspack.so.0 libnettle.so.6 libnspr4.so libnss3.so libnssutil3.so libp11-kit.so.0 libpango-1.0.so.0 libpangocairo-1.0.so.0 libpangoft2-1.0.so.0 libpcre.so.3 libpixman-1.so.0 libplc4.so libplds4.so libpng16.so.16 libpsl.so.5 libselinux.so.1 libsmime3.so libsqlite3.so.0 libssl.so.1.1 libsystemd.so.0 libtasn1.so.6 libthai.so.0 libunistring.so.2 libuuid.so.1 libwayland-client.so.0 libwayland-cursor.so.0 libwayland-egl.so.1 libwayland-server.so.0 libxcb-render.so.0 libxcb-shm.so.0 libxcb.so.1 libxkbcommon.so.0 libxshmfence.so.1 libz.so.1" ] +if [ "$(cat depnamelist)" != "libGL.so.1 libGLX.so.0 libGLdispatch.so.0 libPocoCrypto.so.50 libPocoFoundation.so.50 libPocoNet.so.50 libX11.so.6 libXau.so.6 libXcomposite.so.1 libXdamage.so.1 libXdmcp.so.6 libXext.so.6 libXfixes.so.3 libXfont2.so.2 libXmuu.so.1 libXrandr.so.2 libXrender.so.1 libasound.so.2 libatk-1.0.so.0 libatk-bridge-2.0.so.0 libatspi.so.0 libaudit.so.1 libavahi-client.so.3 libavahi-common.so.3 libblkid.so.1 libbsd.so.0 libbz2.so.1.0 libcairo.so.2 libcap-ng.so.0 libcom_err.so.2 libcrypto.so.1.1 libcups.so.2 libdatrie.so.1 libdbus-1.so.3 libdrm.so.2 libexpat.so.1 libffi.so.6 libfontconfig.so.1 libfontenc.so.1 libfreetype.so.6 libgbm.so.1 libgcc_s.so.1 libgcrypt.so.20 libgio-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgnutls.so.30 libgobject-2.0.so.0 libgpg-error.so.0 libgraphite2.so.3 libgssapi_krb5.so.2 libharfbuzz.so.0 libhogweed.so.4 libjpeg.so.8 libk5crypto.so.3 libkeyutils.so.1 libkrb5.so.3 libkrb5support.so.0 liblz4.so.1 liblzma.so.5 libmount.so.1 libmspack.so.0 libnettle.so.6 libnspr4.so libnss3.so libnssutil3.so libp11-kit.so.0 libpango-1.0.so.0 libpangoft2-1.0.so.0 libpcre.so.3 libpixman-1.so.0 libplc4.so libplds4.so libpng16.so.16 libpsl.so.5 libselinux.so.1 libsmime3.so libsqlite3.so.0 libssl.so.1.1 libsystemd.so.0 libtasn1.so.6 libthai.so.0 libunistring.so.2 libuuid.so.1 libwayland-server.so.0 libxcb-render.so.0 libxcb-shm.so.0 libxcb.so.1 libxkbcommon.so.0 libxshmfence.so.1 libz.so.1" ] then msg "Error: Unexpected list of library dependencies; build_appimage_impl.sh must be updated" false diff --git a/viceplugins/retrojsvice/src/vice_plugin_api.cpp b/viceplugins/retrojsvice/src/vice_plugin_api.cpp index ef76153..a5a2c79 100644 --- a/viceplugins/retrojsvice/src/vice_plugin_api.cpp +++ b/viceplugins/retrojsvice/src/vice_plugin_api.cpp @@ -6,7 +6,7 @@ namespace { using namespace retrojsvice; -const char* RetrojsviceVersion = "0.9.2.2"; +const char* RetrojsviceVersion = "0.9.3.0"; template class GlobalCallback {