Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update metainfo, update link in appimage build #712

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions infra/APPIMAGE/Thorium.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ script:
- cp -v usr/bin/product_logo_128.png usr/share/icons/hicolor/128x128/apps/thorium.png
- cp -v usr/bin/product_logo_256.png usr/share/icons/hicolor/256x256/apps/thorium.png
- cp -v usr/bin/product_logo_512.png usr/share/icons/hicolor/512x512/apps/thorium.png
- cp -v usr/bin/thorium.svg usr/share/icons/
- # Set Version
- ./usr/bin/thorium --version | cut -d ' ' -f2 > ../VERSION
- # Remove redundant libffmpeg.so
Expand Down
8 changes: 4 additions & 4 deletions infra/APPIMAGE/pkg2appimage
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ check_dependencies \
if [ ! -f "${!#}" ] ; then
YAMLFILE=/tmp/_recipe.yml
rm -f "$YAMLFILE"
wget -q "https://github.com/AppImage/AppImages/raw/${PKG2AICOMMIT}/recipes/${!#}.yml" -O "$YAMLFILE"
wget -q "https://github.com/AppImageCommunity/pkg2appimage/raw/${PKG2AICOMMIT}/recipes/${!#}.yml" -O "$YAMLFILE"
else
YAMLFILE=$(readlink -f "${!#}")
fi
Expand Down Expand Up @@ -153,7 +153,7 @@ if [ -e "${HERE}/usr/share/pkg2appimage/functions.sh" ] ; then
. "${HERE}/usr/share/pkg2appimage/functions.sh"
elif [ -z "$FUNCTIONS_SH" ] ; then
if [ ! -e functions.sh ] ; then
wget -q https://github.com/AppImage/AppImages/raw/${PKG2AICOMMIT}/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/${PKG2AICOMMIT}/functions.sh -O ./functions.sh
fi
. ./functions.sh
else
Expand Down Expand Up @@ -233,7 +233,7 @@ if [ ! -z "${_ingredients_dist}" ] ; then
cp ${DEBFILE} .
done
# Use libcurl-slim to reduce AppImage size, thanks darealshinji
# Not really compiled on xenial but CentOS 6, https://github.com/AppImage/AppImages/issues/187
# Not really compiled on xenial but CentOS 6, https://github.com/AppImageCommunity/pkg2appimage/issues/187
echo "deb http://ppa.launchpad.net/djcj/libcurl-slim/ubuntu xenial main" >> sources.list
# Use gnutls-patched to have libgnutls look in various distributions' places for certificates,
# https://github.com/darealshinji/vlc-AppImage/issues/1#issuecomment-321041496
Expand Down Expand Up @@ -461,7 +461,7 @@ sed -i -e 's|\.xpm||g' *.desktop || true

# Setting PYTHONHOME instead
# Fix Python imports,
# https://github.com/AppImage/AppImages/issues/172
# https://github.com/AppImageCommunity/pkg2appimage/issues/172
# SITECUSTOMIZEFILES=$(find . -name "sitecustomize.py")
# for SITECUSTOMIZEFILE in $SITECUSTOMIZEFILES ; do
# rm $SITECUSTOMIZEFILE # Remove symlinks, replace by files
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
### Extension points

To avoid having to expose more of the host filesystem in the sandbox but still
allowing extending Chromium, the `org.chromium.Chromium.Extension` extension
allowing extending Chromium, the `rocks.thorium.Thorium.Extension` extension
point is defined.

This extension point is currently on version '1' and will expose any extension
Expand All @@ -15,7 +15,7 @@ manifests](https://developer.chrome.com/docs/apps/nativeMessaging/) under
#### Legacy extension points

This application also supports two other extension points:
`org.chromium.Chromium.Policy` and `org.chromium.Chromium.NativeMessagingHost`.
`rocks.thorium.Thorium.Policy` and `rocks.thorium.Thorium.NativeMessagingHost`.
These primarily exist for compatibility reasons and should not be used.

#### Using extension points
Expand All @@ -33,8 +33,8 @@ policies, extensions, etc.
One example of such "unmanaged extension" could be an extension point that exposes
all system policies installed under `/etc/chromium-browser/policies/{managed,recommended}`.
This could be done for example by creating an extension point under
`/var/lib/flatpak/extension/org.chromium.Chromium.Extension.system-policies`, with
`/var/lib/flatpak/extension/org.chromium.Chromium.Extension.system-policies/<arch>/<version>`
`/var/lib/flatpak/extension/rocks.thorium.Thorium.Extension.system-policies`, with
`/var/lib/flatpak/extension/rocks.thorium.Thorium.Extension.system-policies/<arch>/<version>`
being a symlink to `/etc/chromium-browser`. Note that `<version>` must match the
extension point version.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ install -Dm 755 out/ReleaseFree/libffmpeg.so /app/chromium/libffmpeg.so
install -Dm 755 out/Release/libffmpeg.so /app/chromium/nonfree-codecs/lib/libffmpeg.so

for size in 24 48 64 128 256; do
install -Dvm 644 chrome/app/theme/chromium/linux/product_logo_$size.png /app/share/icons/hicolor/${size}x${size}/apps/org.chromium.Chromium.png;
install -Dvm 644 chrome/app/theme/chromium/linux/product_logo_$size.png /app/share/icons/hicolor/${size}x${size}/apps/rocks.thorium.Thorium.png;
done
install -Dvm 644 cobalt.ini -t /app/etc
install -Dvm 644 org.chromium.Chromium.desktop -t /app/share/applications
install -Dvm 644 org.chromium.Chromium.metainfo.xml -t /app/share/metainfo
install -Dvm 644 rocks.thorium.Thorium.desktop -t /app/share/applications
install -Dvm 644 rocks.thorium.Thorium.metainfo.xml -t /app/share/metainfo
install -Dvm 755 chromium.sh /app/bin/chromium
install -Dvm 755 unlink_profiles.py -t /app/bin
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
app-id: org.chromium.Chromium.Extension.google-safe-search-policy
app-id: rocks.thorium.Thorium.Extension.google-safe-search-policy
# This should match the extension point version
branch: '1'
runtime: org.chromium.Chromium
runtime: rocks.thorium.Thorium
runtime-version: stable
sdk: org.freedesktop.Sdk//20.08
build-extension: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Some general notes on implementation:
but this impl uses the same codepath no matter the DE when running
on flatpak

Closes https://github.com/flathub/org.chromium.Chromium/issues/36
Closes https://github.com/flathub/rocks.thorium.Thorium/issues/36
---
chrome/app/generated_resources.grd | 6 +
.../net/system_network_context_manager.cc | 9 +-
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Exec=/app/bin/chromium %U
StartupWMClass=chromium-browser
StartupNotify=true
Terminal=false
Icon=org.chromium.Chromium
Icon=rocks.thorium.Thorium
Type=Application
Categories=Network;WebBrowser;
Keywords=chrome;internet;google;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2017 The Chromium Authors -->
<component type="desktop">
<id>org.chromium.Chromium</id>
<launchable type="desktop-id">org.chromium.Chromium.desktop</launchable>
<name>Chromium Web Browser</name>
<developer_name>The Chromium Authors</developer_name>
<summary>The web browser from Chromium project</summary>
<id>rocks.thorium.Thorium</id>
<launchable type="desktop-id">rocks.thorium.Thorium.desktop</launchable>
<name>Thorium Web Browser</name>
<developer_name>Alexander Frick</developer_name>
<summary>Fork Chromium browser with optimizations</summary>
<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 ISC and OpenSSL and (MPL-1.1 or GPL-2.0 or LGPL-2.0)</project_license>
<url type="homepage">https://www.chromium.org/Home</url>
<url type="homepage">https://thorium.rocks/</url>
<description>
<p>
Chromium is an open-source browser project that aims to build a safer, faster,
Expand Down Expand Up @@ -122,5 +122,5 @@
</releases>
<content_rating type="oars-1.1"/>
<translation/>
<update_contact>rymg19_at_gmail.com</update_contact>
<update_contact>alex313031_at_gmail.com</update_contact>
</component>
121 changes: 121 additions & 0 deletions infra/Flatpak/rocks.thorium.Thorium/rocks.thorium.Thorium.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2017 The Chromium Authors -->
<component type="desktop">
<id>rocks.thorium.Thorium</id>
<launchable type="desktop-id">rocks.thorium.Thorium.desktop</launchable>
<name>Thorium Web Browser</name>
<developer_name>Alexander Frick</developer_name>
<summary>Fork Chromium browser with optimizations</summary>
<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 ISC and OpenSSL and (MPL-1.1 or GPL-2.0 or LGPL-2.0)</project_license>
<url type="homepage">https://thorium.rocks/</url>
<url type="bugtracker">https://github.com/Alex313031/Thorium/issues</url>
<description>
<p>
Chromium fork for linux, includes Widevine, All Codecs, Chrome Plugins, as well as thinLTO, CFlag, LDFlag, LLVM Loop, and PGO compiler optimizations
</p>
</description>
<screenshots>
<screenshot type="default">
<image>https://www.gstatic.com/chrome/appstream/chrome-2.png</image>
<caption/>
</screenshot>
</screenshots>
<releases>
<release version="114.0.5735.133" date="2023-06-13"/>
<release version="114.0.5735.106" date="2023-06-05"/>
<release version="114.0.5735.90" date="2023-05-31"/>
<release version="113.0.5672.126" date="2023-05-16"/>
<release version="113.0.5672.92" date="2023-05-09"/>
<release version="113.0.5672.63" date="2023-04-26"/>
<release version="112.0.5615.165" date="2023-04-19"/>
<release version="112.0.5615.121" date="2023-04-14"/>
<release version="112.0.5615.49" date="2023-03-30"/>
<release version="111.0.5563.146" date="2023-03-27"/>
<release version="111.0.5563.110" date="2023-03-22"/>
<release version="111.0.5563.64" date="2023-03-07"/>
<release version="110.0.5481.177" date="2023-02-22"/>
<release version="110.0.5481.100" date="2023-02-16"/>
<release version="110.0.5481.77" date="2023-02-01"/>
<release version="109.0.5414.119" date="2023-01-24"/>
<release version="109.0.5414.74" date="2023-01-04"/>
<release version="108.0.5359.124" date="2022-12-14"/>
<release version="108.0.5359.98" date="2022-12-07"/>
<release version="108.0.5359.94" date="2022-12-02"/>
<release version="108.0.5359.71" date="2022-11-29"/>
<release version="107.0.5304.121" date="2022-11-24"/>
<release version="107.0.5304.110" date="2022-11-09"/>
<release version="107.0.5304.87" date="2022-10-27"/>
<release version="107.0.5304.68" date="2022-10-25"/>
<release version="106.0.5249.119" date="2022-10-12"/>
<release version="106.0.5249.91" date="2022-09-30"/>
<release version="106.0.5249.61" date="2022-09-26"/>
<release version="105.0.5195.125" date="2022-09-13"/>
<release version="105.0.5195.102" date="2022-09-02"/>
<release version="105.0.5195.52" date="2022-08-24"/>
<release version="104.0.5112.101" date="2022-08-16"/>
<release version="104.0.5112.79" date="2022-08-01"/>
<release version="103.0.5060.134" date="2022-07-19"/>
<release version="103.0.5060.114" date="2022-07-09"/>
<release version="103.0.5060.53" date="2022-06-16"/>
<release version="102.0.5005.115" date="2022-06-10"/>
<release version="102.0.5005.61" date="2022-05-19"/>
<release version="101.0.4951.64" date="2022-05-11"/>
<release version="101.0.4951.54" date="2022-05-03"/>
<release version="101.0.4951.41" date="2022-04-20"/>
<release version="100.0.4896.127" date="2022-04-15"/>
<release version="100.0.4896.88" date="2022-04-12"/>
<release version="100.0.4896.75" date="2022-04-05"/>
<release version="100.0.4896.60" date="2022-03-29"/>
<release version="99.0.4844.84" date="2022-03-26"/>
<release version="99.0.4844.82" date="2022-03-20"/>
<release version="99.0.4844.74" date="2022-03-16"/>
<release version="98.0.4758.102" date="2022-02-15"/>
<release version="98.0.4758.80" date="2022-02-01"/>
<release version="97.0.4692.99" date="2022-01-20"/>
<release version="97.0.4692.71" date="2021-12-31"/>
<release version="96.0.4664.110" date="2021-12-14"/>
<release version="96.0.4664.93" date="2021-12-07"/>
<release version="96.0.4664.45" date="2021-11-12"/>
<release version="95.0.4638.69" date="2021-10-29"/>
<release version="95.0.4638.54" date="2021-10-18"/>
<release version="94.0.4606.81" date="2021-10-08"/>
<release version="94.0.4606.71" date="2021-10-01"/>
<release version="94.0.4606.61" date="2021-09-24"/>
<release version="94.0.4606.54" date="2021-09-20"/>
<release version="93.0.4577.82" date="2021-09-14"/>
<release version="93.0.4577.63" date="2021-09-01"/>
<release version="92.0.4515.159" date="2021-08-17"/>
<release version="92.0.4515.131" date="2021-08-03"/>
<release version="92.0.4515.107" date="2021-07-19"/>
<release version="91.0.4472.164" date="2021-07-15"/>
<release version="91.0.4472.114" date="2021-06-18"/>
<release version="91.0.4472.106" date="2021-06-15"/>
<release version="91.0.4472.101" date="2021-06-09"/>
<release version="91.0.4472.77" date="2021-05-24"/>
<release version="90.0.4430.212" date="2021-05-10"/>
<release version="90.0.4430.93" date="2021-04-27"/>
<release version="90.0.4430.85" date="2021-04-20"/>
<release version="90.0.4430.72" date="2021-04-14"><url>https://chromereleases.googleblog.com/2021/04/stable-channel-update-for-desktop_14.html</url></release>
<release version="89.0.4389.128" date="2021-04-14"/>
<release version="89.0.4389.114" date="2021-03-30"/>
<release version="89.0.4389.90" date="2021-03-13"/>
<release version="89.0.4389.82" date="2021-03-05"/>
<release version="89.0.4389.72" date="2021-03-02"/>
<release version="88.0.4324.182" date="2021-02-16"/>
<release version="88.0.4324.150" date="2021-02-05"/>
<release version="88.0.4324.146" date="2021-02-02"/>
<release version="88.0.4324.96" date="2020-01-19"/>
<release version="87.0.4280.141" date="2021-01-07"/>
<release version="87.0.4280.88-1" date="2020-12-17"/>
<release version="87.0.4280.88" date="2020-12-04"/>
<release version="87.0.4280.66" date="2020-11-18"/>
<release version="86.0.4240.198" date="2020-11-12"/>
<release version="86.0.4240.183" date="2020-11-02"/>
<release version="86.0.4240.111" date="2020-11-01"/>
<release version="86.0.4240.75" date="2020-10-15"/>
<release version="85.0.4183.121" date="2020-09-29"/>
</releases>
<content_rating type="oars-1.1"/>
<update_contact>alex313031_at_gmail.com</update_contact>
</component>
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
app-id: org.chromium.Chromium
app-id: rocks.thorium.Thorium
runtime: org.freedesktop.Platform
runtime-version: '22.08'
sdk: org.freedesktop.Sdk
base: org.chromium.Chromium.BaseApp
base: rocks.thorium.Thorium.BaseApp
base-version: '22.08'
command: chromium
finish-args:
Expand Down Expand Up @@ -31,29 +31,29 @@ finish-args:
- --own-name=org.mpris.MediaPlayer2.chromium.*

add-extensions:
org.chromium.Chromium.Codecs:
rocks.thorium.Thorium.Codecs:
directory: chromium/nonfree-codecs
add-ld-path: lib
bundle: true
autodelete: true

org.chromium.Chromium.NativeMessagingHost:
rocks.thorium.Thorium.NativeMessagingHost:
version: '1'
directory: chromium/native-messaging-hosts
merge-dirs: native-messaging-hosts
subdirectories: true
no-autodownload: true
autodelete: true

org.chromium.Chromium.Extension:
rocks.thorium.Thorium.Extension:
version: '1'
directory: chromium/extensions
merge-dirs: extensions;native-messaging-hosts;policies/managed;policies/recommended
subdirectories: true
no-autodownload: true
autodelete: true

org.chromium.Chromium.Policy:
rocks.thorium.Thorium.Policy:
version: '1'
directory: chromium/policies
merge-dirs: policies/managed;policies/recommended
Expand Down Expand Up @@ -139,9 +139,9 @@ modules:
component: llvm-git
- patches/all.json
- type: file
path: org.chromium.Chromium.desktop
path: rocks.thorium.Thorium.desktop
- type: file
path: org.chromium.Chromium.metainfo.xml
path: rocks.thorium.Thorium.metainfo.xml
- type: file
path: chromium.sh
- type: file
Expand Down