diff --git a/.abf.yml b/.abf.yml index 29ca739..3f4b3e9 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,6 +1,6 @@ sources: - chromium-97.0.4692.99.tar.xz: c9f525e5eb01b30e68c1c330d7c4975d208fe4fb - chromium-gost-63253fcf20fea4093044da8713f2b695e0f31b64.tar.gz: e4f542423ef8846df4d5b4dc26721cfe54166dc4 + chromium-98.0.4758.102.tar.xz: 726a70cd4cabe0cf3adcadf130056e56226606b0 + chromium-gost-61264192d351b193aad3584c729af07868dadfd9.tar.gz: b67f76e7914b6cf5f6359077fe1096ad02806e81 depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 msspi-d9e90e4ef29b3a1abbcde4625363158566d6c8a4.tar.gz: 949483d12a369d4ba5266ff52497721ae348ad3b diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index d155217..d8e4a4e 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -50,7 +50,7 @@ # GOST patches and sources # Using commit hashes because upstream often puts tags long after making changes # (they wait for builds to finish to make a new "release" with binary packages) -%define chromium_gost_commit 63253fcf20fea4093044da8713f2b695e0f31b64 +%define chromium_gost_commit 61264192d351b193aad3584c729af07868dadfd9 %define msspi_commit d9e90e4ef29b3a1abbcde4625363158566d6c8a4 %define _gostsourcedir %{_builddir}/chromium-gost @@ -85,7 +85,7 @@ Summary: A fast web browser based on the Blink engine Name: chromium-browser-stable -Version: 97.0.4692.99 +Version: 98.0.4758.102 Release: 1 License: BSD, LGPL Group: Networking/WWW @@ -103,6 +103,7 @@ Source21: missing_fcntl.h Source30: master_preferences.json Source31: default_bookmarks.html Source32: chromium.default +Source33: chromium-default-config.json Source100: icons.tar.bz2 Source997: depot_tools.tar.xz Source999: new-system-icons.tar.xz @@ -148,6 +149,7 @@ BuildRequires: nodejs BuildRequires: nodejs14 %endif BuildRequires: util-linux +BuildRequires: jq BuildRequires: yasm BuildRequires: atomic-devel BuildRequires: bzip2-devel @@ -212,9 +214,6 @@ BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(zlib) BuildRequires: pythonegg(setuptools) -%if %{with gost} -BuildRequires: chrpath -%endif BuildRequires: atomic-devel @@ -256,6 +255,7 @@ if proprietary CryptoPro is installed. %config %{_sysconfdir}/default/%{crname} %{_bindir}/%{crname} %{_crdir}/chromium-wrapper +%{_crdir}/chromium-default-config.json %{_crdir}/chrome %{_crdir}/chrome-sandbox %{_crdir}/chrome_crashpad_handler @@ -494,9 +494,6 @@ export PYTHONPATH="../../third_party/pyjson5/src:../../xcb-proto-%{xcb_version}" gtk_version=3 \ is_clang=true \ %{?clang_use_chrome_plugins} \ - use_system_freetype=false \ - use_system_harfbuzz=false \ - use_system_libpng=false \ use_vaapi=true \ enable_dav1d_decoder=true enable_libaom_decoder=false \ %{?enable_remoting} \ @@ -627,6 +624,8 @@ mkdir -p %{buildroot}%{_crdir}/pepper find out/Release/resources/ -name "*.d" -exec rm {} \; cp -r out/Release/resources %{buildroot}%{_crdir} +install -m 0644 %{SOURCE33} %{buildroot}%{_crdir} + # desktop file mkdir -p %{buildroot}%{_datadir}/applications install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/applications/ @@ -640,3 +639,7 @@ install -m 0644 %{SOURCE30} %{buildroot}%{_sysconfdir}/%{crname}/ install -m 0644 %{SOURCE31} %{buildroot}%{_sysconfdir}/%{crname}/ find %{buildroot} -name "*.nexe" -exec strip {} \; + +%check +# ensure JSON validity +[ "$(jq .browser.custom_chrome_frame %{buildroot}%{_crdir}/chromium-default-config.json)" = "true" ] diff --git a/chromium-default-config.json b/chromium-default-config.json new file mode 100644 index 0000000..521962c --- /dev/null +++ b/chromium-default-config.json @@ -0,0 +1,15 @@ +{ + "browser": { + "custom_chrome_frame": true + }, + "extensions": { + "theme": { + "use_system": true + } + }, + "homepage": "https://rosalinux.ru", + "homepage_is_newtabpage": false, + "session": { + "restore_on_startup": 1 + } +} diff --git a/chromium-wrapper b/chromium-wrapper index e064668..3eb0158 100644 --- a/chromium-wrapper +++ b/chromium-wrapper @@ -17,14 +17,6 @@ usage () { echo " -h or --help This help screen" } -# FFmpeg needs to know where its libs are located -if [ "Z$LD_LIBRARY_PATH" != Z ] ; then - LD_LIBRARY_PATH=$LIBDIR:$LD_LIBRARY_PATH -else - LD_LIBRARY_PATH=$LIBDIR -fi -export LD_LIBRARY_PATH - # xdg-settings should in PATH PATH=$PATH:$LIBDIR export PATH @@ -50,45 +42,8 @@ done # Set the default theme as GTK+ with system window decoration if [ ! -d ~/.config/chromium/Default ]; then mkdir -p ~/.config/chromium/Default - cat < ~/.config/chromium/Default/Preferences -{ - "browser": { - "custom_chrome_frame": false - }, - "extensions": { - "theme": { - "colors": { - - }, - "id": "", - "images": { - - }, - "properties": { - - }, - "tints": { - - }, - "use_system": false - } - }, - "homepage": "https://rosalinux.ru", - "homepage_is_newtabpage": false, - "session": { - "restore_on_startup": 1 - }, - "webkit": { - "webprefs": { - "default_fixed_font_size": 13, - "default_font_size": 16, - "fixed_font_family": "Droid Sans Mono", - "sansserif_font_family": "Droid Sans", - "serif_font_family": "Droid Serif" - } - } -} -EOF + # cat > instead of cp to e.g. respect umask + cat "$LIBDIR"/chromium-default-config.json > ~/.config/chromium/Default/Preferences fi if [ ! -u $CHROME_SANDBOX ] ; then diff --git a/chromium.default b/chromium.default index 2632024..191ac7b 100644 --- a/chromium.default +++ b/chromium.default @@ -1,4 +1,4 @@ -# Default settings for chromium. This file is sourced by /usr/bin/chromium +# Default settings for chromium. This file is sourced by /usr/bin/chromium-browser # Options to pass to chromium CHROMIUM_FLAGS="" diff --git a/default_bookmarks.html b/default_bookmarks.html index 4deeaa3..02ec3de 100644 --- a/default_bookmarks.html +++ b/default_bookmarks.html @@ -11,7 +11,7 @@

Bookmarks Toolbar

ROSA -
Wiki -
Forums +
Wiki +
Forums