mirror of
https://github.com/Alex313031/thorium.git
synced 2025-01-09 11:27:32 -03:00
convert to stable
This commit is contained in:
Alexander Frick
parent
dd155c3ae1
commit
d7ccc9896b
15 changed files with 173 additions and 62 deletions
|
|
@ -46,7 +46,7 @@ cp -r -v ./files/product_logo_22.png ./temp/ &&
|
|||
cp -r -v ./files/thorium-shell ./temp/ &&
|
||||
rm -r -v ./temp/cron &&
|
||||
rm -r -v ./temp/thorium-browser &&
|
||||
rm -r -v ./temp/thorium-browser-unstable &&
|
||||
rm -r -v ./temp/thorium-browser-stable &&
|
||||
|
||||
printf "\n" &&
|
||||
printf "${YEL}Building .AppImage using Thorium.yml...\n" &&
|
||||
|
|
|
|||
28
infra/Arch_Linux/.SRCINFO
Normal file
28
infra/Arch_Linux/.SRCINFO
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
pkgbase = thorium-browser-bin
|
||||
pkgdesc = Chromium fork focused on high performance and security.
|
||||
pkgver = 109.0.5414.120
|
||||
pkgrel = 1
|
||||
url = https://github.com/Alex313031/Thorium
|
||||
install = thorium-browser.install
|
||||
arch = x86_64
|
||||
license = GPLv3
|
||||
depends = alsa-lib
|
||||
depends = gtk3
|
||||
depends = libcups
|
||||
depends = libxss
|
||||
depends = libxtst
|
||||
depends = nss
|
||||
depends = ttf-liberation
|
||||
depends = xdg-utils
|
||||
optdepends = pipewire: WebRTC desktop sharing under Wayland
|
||||
optdepends = kdialog: for file dialogs in KDE
|
||||
optdepends = gnome-keyring: for storing passwords in GNOME keyring
|
||||
optdepends = kwallet: for storing passwords in KWallet
|
||||
options = !emptydirs
|
||||
options = !strip
|
||||
source = https://github.com/Alex313031/Thorium/releases/download/M109.0.5414.120/thorium-browser_109.0.5414.120_amd64.deb
|
||||
source = thorium-browser.sh
|
||||
sha512sums = c935f127abbc8e5dcf362a8f9687b5ea69d415efb256233e499bb273ec053fa2b7522b06ccb80387ed791289cd80dfdac1c36ed8dd3467fe757ce5ade4595891
|
||||
sha512sums = 5e34cfbd67d86b31292a61eb5dcee68aeb2c4818bb557fa9aee458215eef8042c57be43b2250f5d89a66df90e4df6473a85688aa63ba2255e789d0f37ed83d8b
|
||||
|
||||
pkgname = thorium-browser-bin
|
||||
4
infra/Arch_Linux/.gitignore
vendored
Normal file
4
infra/Arch_Linux/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
*.deb
|
||||
*.pkg.tar.*
|
||||
src/
|
||||
pkg/
|
||||
61
infra/Arch_Linux/PKGBUILD
Normal file
61
infra/Arch_Linux/PKGBUILD
Normal file
|
|
@ -0,0 +1,61 @@
|
|||
# Copyright (c) 2022 Alex313031, JPratama7, and Dominik Adrian Grzywak.
|
||||
# Maintainer: JPratama7 <josepratama080@gmail.com>
|
||||
# Maintainer: Dominik Adrian Grzywak <starterx4@gmail.com>
|
||||
|
||||
_pkgname=thorium-browser
|
||||
pkgbase=thorium-browser
|
||||
pkgname=${_pkgname}-bin
|
||||
pkgver=109.0.5414.120
|
||||
pkgrel=1
|
||||
pkgdesc="Chromium fork focused on high performance and security."
|
||||
arch=('x86_64')
|
||||
url="https://github.com/Alex313031/Thorium"
|
||||
license=('GPLv3')
|
||||
depends=(
|
||||
'alsa-lib'
|
||||
'gtk3'
|
||||
'libcups'
|
||||
'libxss'
|
||||
'libxtst'
|
||||
'nss'
|
||||
'ttf-liberation'
|
||||
'xdg-utils'
|
||||
)
|
||||
optdepends=(
|
||||
'pipewire: WebRTC desktop sharing under Wayland'
|
||||
'kdialog: for file dialogs in KDE'
|
||||
'gnome-keyring: for storing passwords in GNOME keyring'
|
||||
'kwallet: for storing passwords in KWallet'
|
||||
)
|
||||
options=('!emptydirs' '!strip')
|
||||
install=$_pkgname.install
|
||||
source=("https://github.com/Alex313031/Thorium/releases/download/M${pkgver}/${_pkgname}_${pkgver}_amd64.deb"
|
||||
"$_pkgname.sh")
|
||||
sha512sums=('c935f127abbc8e5dcf362a8f9687b5ea69d415efb256233e499bb273ec053fa2b7522b06ccb80387ed791289cd80dfdac1c36ed8dd3467fe757ce5ade4595891'
|
||||
'5e34cfbd67d86b31292a61eb5dcee68aeb2c4818bb557fa9aee458215eef8042c57be43b2250f5d89a66df90e4df6473a85688aa63ba2255e789d0f37ed83d8b')
|
||||
|
||||
package() {
|
||||
echo " -> Extracting the data.tar.xz..."
|
||||
bsdtar -xf data.tar.xz -C "$pkgdir/"
|
||||
|
||||
echo " -> Moving stuff in place..."
|
||||
# Launcher
|
||||
install -m755 $_pkgname.sh "$pkgdir"/usr/bin/$_pkgname
|
||||
|
||||
chmod 4755 "$pkgdir/opt/chromium.org/thorium/chrome-sandbox"
|
||||
|
||||
# Icons
|
||||
for i in 16x16 24x24 32x32 48x48 64x64 128x128 256x256; do
|
||||
install -Dm644 "$pkgdir"/opt/chromium.org/thorium/product_logo_${i/x*/}.png \
|
||||
"$pkgdir"/usr/share/icons/hicolor/$i/apps/thorium-browser-stable.png
|
||||
done
|
||||
install -Dm644 "$pkgdir/opt/chromium.org/thorium/thorium_shell.png" -t \
|
||||
"$pkgdir/usr/share/icons/hicolor/256x256/apps/"
|
||||
|
||||
echo " -> Removing Debian Cron job, duplicate product logos and menu directory..."
|
||||
rm -r \
|
||||
"$pkgdir"/etc/cron.daily/ \
|
||||
"$pkgdir"/opt/chromium.org/thorium/cron/ \
|
||||
"$pkgdir"/opt/chromium.org/thorium/product_logo_*.{png,xpm} \
|
||||
"$pkgdir"/usr/share/menu/
|
||||
}
|
||||
22
infra/Arch_Linux/thorium-browser.install
Normal file
22
infra/Arch_Linux/thorium-browser.install
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
# Colored makepkg-like functions
|
||||
msg_blue() {
|
||||
printf "${blue}==>${bold} $1${all_off}\n"
|
||||
}
|
||||
|
||||
note() {
|
||||
printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
|
||||
}
|
||||
|
||||
all_off="$(tput sgr0)"
|
||||
bold="${all_off}$(tput bold)"
|
||||
blue="${bold}$(tput setaf 4)"
|
||||
yellow="${bold}$(tput setaf 3)"
|
||||
|
||||
post_install() {
|
||||
note "Custom flags should be put directly in: ~/.config/thorium-flags.conf"
|
||||
note "The launcher is called: 'thorium-browser'"
|
||||
}
|
||||
|
||||
post_upgrade() {
|
||||
post_install
|
||||
}
|
||||
11
infra/Arch_Linux/thorium-browser.sh
Normal file
11
infra/Arch_Linux/thorium-browser.sh
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
#!/bin/bash
|
||||
|
||||
XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-~/.config}
|
||||
|
||||
# Allow users to override command-line options
|
||||
if [[ -f $XDG_CONFIG_HOME/thorium-flags.conf ]]; then
|
||||
THORIUM_USER_FLAGS="$(cat $XDG_CONFIG_HOME/thorium-flags.conf)"
|
||||
fi
|
||||
|
||||
# Launch
|
||||
exec /opt/chromium.org/thorium/thorium-browser-stable $THORIUM_USER_FLAGS "$@"
|
||||
35
infra/Arch_Linux/update_version.sh
Executable file
35
infra/Arch_Linux/update_version.sh
Executable file
|
|
@ -0,0 +1,35 @@
|
|||
#!/bin/bash
|
||||
set -euxo pipefail
|
||||
|
||||
# Get pkgname
|
||||
PKG=$(awk -F '=' '/^pkgname/{ print $2 }' PKGBUILD)
|
||||
|
||||
# Get latest version
|
||||
VER=$(curl -sSf https://dl.thorium.rocks/debian/dists/stable/main/binary-amd64/Packages.gz |
|
||||
grep -A1 "Package: ${PKG}" |
|
||||
awk '/Version/{print $2}' |
|
||||
cut -d '-' -f1)
|
||||
|
||||
# Insert latest version into PKGBUILD and update hashes
|
||||
sed -i \
|
||||
-e "s/^pkgver=.*/pkgver=${VER}/" \
|
||||
PKGBUILD
|
||||
|
||||
# Check whether this changed anything
|
||||
if (git diff --exit-code PKGBUILD); then
|
||||
echo "Package ${PKG} has most recent version ${VER}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e 's/pkgrel=.*/pkgrel=1/' \
|
||||
PKGBUILD
|
||||
|
||||
updpkgsums
|
||||
|
||||
# Update .SRCINFO
|
||||
makepkg --printsrcinfo >.SRCINFO
|
||||
|
||||
# Commit changes
|
||||
git add PKGBUILD .SRCINFO
|
||||
git commit -m "${PKG} v${VER}"
|
||||
|
|
@ -10,7 +10,7 @@ _**The scripts assume the Chromium source is at $HOME/chromiums/src/ and Thorium
|
|||
- '[infra/args.list](https://github.com/Alex313031/Thorium/blob/main/infra/args.list)' contains an alphabetical list with descriptions of all possible build arguments; [gn_args.list](https://github.com/Alex313031/Thorium/blob/main/infra/gn_args.list) gives a similar list but with the flags in args.gn added.
|
||||
- To build, run `./build.sh` (--help for help). For Windows, use `build_win.sh` or `autoninja -C out\thorium chrome chromedriver thorium_shell setup mini_installer -j8` *The -j# can be changed to limit or increase the number of jobs (generally should be the number of CPU cores on your machine)*
|
||||
- To install, copy/paste the contents of your *out/thorium* dir to a good location, i.e. *$HOME/bin/thorium*. **RECOMMENDED** *- Copy and run [clean.sh](https://github.com/Alex313031/Thorium/blob/main/clean.sh) within this dir to clean up build artifacts.* Then you can just run the browser with `~/bin/thorium/chrome`, the content_shell with `~/bin/thorium/thorium_shell`, or chromedriver with `~/bin/thorium/chromedriver`.
|
||||
- **Proper Install:** To install with a .deb, dont copy the contents of *out/thorium*; instead run <br/> `./thordeb.sh` (--help for help). A nice .deb file will now be in *out/thorium* and you can install it with `sudo dpkg -i *.deb` It will be called 'Thorium_Browser_unstable_$VERSIONNUMBER_amd64.deb', and will be installed to */opt/chromium.org/thorium-unstable/*. For Windows, just run the mini_installer.exe. \
|
||||
- **Proper Install:** To install with a .deb, dont copy the contents of *out/thorium*; instead run <br/> `./thordeb.sh` (--help for help). A nice .deb file will now be in *out/thorium* and you can install it with `sudo dpkg -i *.deb` It will be called 'thorium-browser-stable_$VERSIONNUMBER_amd64.deb', and will be installed to */opt/chromium.org/thorium/*. For Windows, just run the mini_installer.exe. \
|
||||
- **Appimage:** You can also make an [Appimage](https://appimage.org/) of Thorium after making the .deb. See > [Appimage README.md](https://github.com/Alex313031/Thorium/tree/main/infra/APPIMAGE#readme)
|
||||
|
||||
__NOTE:__ To get back to "Trunk", i.e. to revert all changes in order to build vanilla Chromium or to update your checkout, just run `./trunk.sh` again. \
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
# Copyright (c) 2022 Alex313031 and JPratama7
|
||||
# Maintainer: JPratama7 <josepratama080@gmail.com>
|
||||
|
||||
pkgbase=thorium-browser-unstable
|
||||
pkgname=${pkgbase}-bin
|
||||
pkgver=105.0.5167.0
|
||||
pkgrel=1
|
||||
pkgdesc="Chromium fork for Linux named after radioactive element No. 90."
|
||||
arch=('x86_64')
|
||||
url="https://thorium.rocks"
|
||||
license=('GPL3')
|
||||
depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
|
||||
'ttf-liberation' 'libxtst' 'dbus' 'libpulse' 'pciutils' 'libva'
|
||||
'desktop-file-utils' 'hicolor-icon-theme')
|
||||
optdepends=(
|
||||
'pipewire: WebRTC desktop sharing under Wayland'
|
||||
'kdialog: for file dialogs in KDE'
|
||||
'gnome-keyring: for storing passwords in GNOME keyring'
|
||||
'kwallet: for storing passwords in KWallet'
|
||||
'org.freedesktop.secrets: password storage backend on GNOME / Xfce'
|
||||
'kwallet: support for storing passwords in KWallet on Plasma'
|
||||
)
|
||||
provides=("${pkgname%-bin}")
|
||||
conflicts=("${pkgname%-bin}")
|
||||
options=('!strip' '!emptydirs')
|
||||
source_x86_64=("https://github.com/Alex313031/Thorium/releases/download/M${pkgver}/thorium-browser_${pkgver}_amd64.deb"
|
||||
#"https://github.com/Alex313031/Thorium/releases/download/M${pkgver}/thorium-browser_${pkgver}-${pkgrel}_amd64.deb"
|
||||
)
|
||||
sha512sums_x86_64=('216ec81322ef3a8963e0844e24a78830c44811768bc6446f652df91317e3df40d68146c74f94fb064b97292677327f7e2ea8835ac985f5fa931b1aeeb2580d90')
|
||||
|
||||
package() {
|
||||
# Extract package data
|
||||
tar xf data.tar.xz -C "${pkgdir}"
|
||||
|
||||
chmod 4755 "$pkgdir/opt/chromium.org/thorium-unstable/chrome-sandbox"
|
||||
|
||||
# install icons
|
||||
for i in 16x16 24x24 32x32 48x48 64x64 128x128 256x256; do
|
||||
icons_dir=usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
|
||||
install -Dm644 "${pkgdir}"/opt/chromium.org/thorium/product_logo_${i/x*}.png \
|
||||
"${pkgdir}"/usr/share/icons/hicolor/${i}/apps/thorium-browser-unstable.png
|
||||
done
|
||||
install -Dm644 "$pkgdir/opt/chromium.org/thorium/thorium_shell.png" -t \
|
||||
"$pkgdir/usr/share/icons/hicolor/256x256/apps/"
|
||||
|
||||
rm -r \
|
||||
"$pkgdir"/etc/ \
|
||||
"$pkgdir"/opt/chromium.org/thorium/cron/ \
|
||||
"$pkgdir"/usr/share/menu/
|
||||
}
|
||||
|
|
@ -38,7 +38,7 @@ export LD_LIBRARY_PATH
|
|||
APPNAME=thorium
|
||||
|
||||
# Set DESKTOP variable
|
||||
# DESKTOP="thorium-browser-unstable"
|
||||
# DESKTOP="thorium-browser-stable"
|
||||
|
||||
# Set XDG Title variable
|
||||
TITLE="Thorium Portable"
|
||||
|
|
@ -48,7 +48,7 @@ export CHROME_DESKTOP="thorium-portable.desktop"
|
|||
|
||||
# Set CHROME_VERSION_EXTRA text, which is displayed in the About dialog on chrome://help
|
||||
DIST=`cat /etc/debian_version`
|
||||
export CHROME_VERSION_EXTRA="unstable, (Portable)"
|
||||
export CHROME_VERSION_EXTRA="stable, (Portable)"
|
||||
|
||||
# We don't want bug-buddy intercepting our crashes. http://crbug.com/24120
|
||||
export GNOME_DISABLE_CRASH_DIALOG=SET_BY_THORIUM
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ tar xvf ./data.tar.xz &&
|
|||
cp -r -v ./opt/chromium.org/thorium/* ./temp/ &&
|
||||
rm -r -v ./temp/cron &&
|
||||
rm -r -v ./temp/thorium-browser &&
|
||||
rm -r -v ./temp/thorium-browser-unstable &&
|
||||
rm -r -v ./temp/thorium-browser-stable &&
|
||||
cp -r -v ./usr/bin/pak temp/ &&
|
||||
cp -r -v ./README.linux temp/README.txt &&
|
||||
cp -r -v ./THORIUM-PORTABLE temp/ &&
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ std::string GetDesktopName(base::Environment* env) {
|
|||
std::string name;
|
||||
if (env->GetVar("CHROME_DESKTOP", &name) && !name.empty())
|
||||
return name;
|
||||
return "thorium-browser-unstable.desktop";
|
||||
return "thorium-browser-stable.desktop";
|
||||
#endif
|
||||
}
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<!-- Copyright 2023 The Chromium Authors and Alex313031 -->
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component type="desktop">
|
||||
<id>thorium-browser-unstable.desktop</id>
|
||||
<id>thorium-browser-stable.desktop</id>
|
||||
<update_contact>alex313031@gmail.com</update_contact>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>BSD-3-Clause and LGPL-2.1+ and Apache-2.0 and IJG and MIT and GPL-2.0+ and GPL-3.0 and ISC and OpenSSL and (MPL-1.1 or GPL-2.0 or LGPL-2.0)</project_license>
|
||||
|
|
|
|||
|
|
@ -43,13 +43,13 @@ find "$HOME/.config/thorium/Crash Reports/pending/" -mtime +30 \
|
|||
APPNAME=thorium
|
||||
|
||||
# Set DESKTOP variable
|
||||
# DESKTOP="thorium-browser-unstable"
|
||||
# DESKTOP="thorium-browser-stable"
|
||||
|
||||
# Set XDG Title variable
|
||||
TITLE="Thorium Browser"
|
||||
|
||||
# Set the correct file name for the desktop file
|
||||
export CHROME_DESKTOP="thorium-browser-unstable.desktop"
|
||||
export CHROME_DESKTOP="thorium-browser-stable.desktop"
|
||||
|
||||
# Set CHROME_VERSION_EXTRA text, which is displayed in the About dialog on chrome://help
|
||||
# DIST=`cat /etc/debian_version`
|
||||
|
|
@ -68,8 +68,8 @@ usage () {
|
|||
echo " --temp-profile Start with a new and temporary profile"
|
||||
echo
|
||||
echo " Other supported options are:"
|
||||
MANWIDTH=80 man thorium-browser-unstable | sed -e '1,/OPTIONS/d; /ENVIRONMENT/,$d'
|
||||
echo " See 'man thorium-browser-unstable' for more details"
|
||||
MANWIDTH=80 man thorium-browser-stable | sed -e '1,/OPTIONS/d; /ENVIRONMENT/,$d'
|
||||
echo " See 'man thorium-browser-stable' for more details"
|
||||
}
|
||||
|
||||
want_temp_profile=0
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ printf "${CYA}\n" &&
|
|||
# Build debian package
|
||||
export NINJA_SUMMARIZE_BUILD=1 &&
|
||||
|
||||
./depot_tools/autoninja -C ~/chromium/src/out/thorium "chrome/installer/linux:unstable_deb" -j$@ &&
|
||||
./depot_tools/autoninja -C ~/chromium/src/out/thorium "chrome/installer/linux:stable_deb" -j$@ &&
|
||||
|
||||
printf "${GRE}Done. ${YEL}Installer at //out/thorium/thorium*.deb\n" &&
|
||||
tput sgr0
|
||||
|
|
|
|||
Loading…
Reference in a new issue