From 7b7587bc390fd26b35d938e30422e2e10bd8386c Mon Sep 17 00:00:00 2001 From: Alexander Frick Date: Mon, 18 Mar 2024 01:10:48 -0500 Subject: [PATCH] add svg and enable WebSQL by default --- setup.sh | 6 ++---- src/chrome/installer/linux/common/desktop.template | 6 +++--- src/chrome/installer/linux/common/installer.include | 1 + src/chrome/installer/mini_installer/chrome.release | 1 + src/third_party/blink/common/features.cc | 2 +- thorium_shell/thorium.svg | 1 + 6 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 thorium_shell/thorium.svg diff --git a/setup.sh b/setup.sh index c5792fd6..8575863c 100755 --- a/setup.sh +++ b/setup.sh @@ -65,6 +65,8 @@ cp -r -v thorium_shell/. ${CR_SRC_DIR}/out/thorium/ && cp -r -v pak_src/binaries/pak ${CR_SRC_DIR}/out/thorium/ && cp -r -v pak_src/binaries/pak-win/. ${CR_SRC_DIR}/out/thorium/ && +echo "Copying other files to \`out/thorium\`" && + # Add default_apps dir for Google Docs Offline extension. mkdir -v -p ${CR_SRC_DIR}/out/thorium/default_apps && cp -r -v infra/default_apps/. ${CR_SRC_DIR}/out/thorium/default_apps/ && @@ -73,10 +75,6 @@ cp -r -v infra/default_apps/. ${CR_SRC_DIR}/out/thorium/default_apps/ && cp -v infra/initial_preferences ${CR_SRC_DIR}/out/thorium/ && cp -v infra/thor_ver ${CR_SRC_DIR}/out/thorium/ && -echo " # Workaround for DevTools" && -mkdir -v -p ${CR_SRC_DIR}/out/thorium/gen/third_party/devtools-frontend/src/front_end/Images/ && -cp -r -v src/third_party/devtools-frontend/src/front_end/Images/src/chromeSelectDark.svg ${CR_SRC_DIR}/out/thorium/gen/third_party/devtools-frontend/src/front_end/Images/ && - # MacOS ARMv8.3-A optimizations copyMacOS () { printf "\n" && diff --git a/src/chrome/installer/linux/common/desktop.template b/src/chrome/installer/linux/common/desktop.template index 20930e64..f93fdbd7 100644 --- a/src/chrome/installer/linux/common/desktop.template +++ b/src/chrome/installer/linux/common/desktop.template @@ -169,7 +169,7 @@ Name[uk]=Нове вікно Name[vi]=Cửa sổ Mới Name[zh_CN]=新建窗口 Name[zh_TW]=開新視窗 -Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@ +Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@ --new-window %U [Desktop Action new-private-window] Name=New Incognito Window @@ -221,7 +221,7 @@ Name[uk]=Нове вікно в режимі анонімного перегля Name[vi]=Cửa sổ ẩn danh mới Name[zh_CN]=新建隐身窗口 Name[zh_TW]=新增無痕式視窗 -Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@ --incognito +Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@ --incognito %U [Desktop Action temp-profile] Name=Open New Window with a temporary profile @@ -259,7 +259,7 @@ Name[ug]=ۋاقىتلىق سەپلىمە ھۆججەت بىلەن يېڭى كۆز Name[vi]=Mở cửa sổ mới với hồ sơ tạm Name[zh_CN]=以临时配置文件打开新窗口 Name[zh_TW]=以暫時性個人身分開啟新視窗 -Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@ --temp-profile +Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@ --temp-profile %U [Desktop Action content-shell] Name=Open Thorium Shell diff --git a/src/chrome/installer/linux/common/installer.include b/src/chrome/installer/linux/common/installer.include index 18145bbf..f7660c22 100644 --- a/src/chrome/installer/linux/common/installer.include +++ b/src/chrome/installer/linux/common/installer.include @@ -174,6 +174,7 @@ stage_install_common() { # install -m ${SHLIB_PERMS} "${OUTPUTDIR}/libblink_test_plugin.so" "${STAGEDIR}/${INSTALLDIR}/lib" install -m ${SHLIB_PERMS} "${OUTPUTDIR}/ClearKeyCdm/_platform_specific/linux_x64/libclearkeycdm.so" "${STAGEDIR}/${INSTALLDIR}/lib" install -m 644 "${OUTPUTDIR}/thorium_shell.png" "${STAGEDIR}/${INSTALLDIR}/" + install -m 644 "${OUTPUTDIR}/thorium.svg" "${STAGEDIR}/${INSTALLDIR}/" install -m 644 "${OUTPUTDIR}/thor_ver" "${STAGEDIR}/${INSTALLDIR}/" install -m 644 "${OUTPUTDIR}/thorium-shell.desktop" "${STAGEDIR}/usr/share/applications/" install -m 755 "${OUTPUTDIR}/thorium-shell" "${STAGEDIR}/usr/bin/" diff --git a/src/chrome/installer/mini_installer/chrome.release b/src/chrome/installer/mini_installer/chrome.release index 193d2539..98b166cd 100644 --- a/src/chrome/installer/mini_installer/chrome.release +++ b/src/chrome/installer/mini_installer/chrome.release @@ -101,6 +101,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ [HIDPI] chrome_200_percent.pak: %(VersionDir)s\ thorium.ico: %(VersionDir)s\ +thorium.svg: %(VersionDir)s\ # Add component ffmpeg to Thorium. [FFMPEG] diff --git a/src/third_party/blink/common/features.cc b/src/third_party/blink/common/features.cc index 2463923f..edfb543e 100644 --- a/src/third_party/blink/common/features.cc +++ b/src/third_party/blink/common/features.cc @@ -2310,7 +2310,7 @@ BASE_FEATURE(kWebRtcUseMinMaxVEADimensions, ); // Allow access to WebSQL APIs. -BASE_FEATURE(kWebSQLAccess, "kWebSQLAccess", base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kWebSQLAccess, "kWebSQLAccess", base::FEATURE_ENABLED_BY_DEFAULT); // Enables small accelerated canvases for webview (crbug.com/1004304) BASE_FEATURE(kWebviewAccelerateSmallCanvases, diff --git a/thorium_shell/thorium.svg b/thorium_shell/thorium.svg new file mode 100644 index 00000000..6f30469f --- /dev/null +++ b/thorium_shell/thorium.svg @@ -0,0 +1 @@ +