rdnvndr/aurpkg
1
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update ungoogled-chromium

Browse source
This commit is contained in:
Andrey Rodionov 2024-04-24 21:56:10 +03:00
parent 8ffd565203
commit 519016caa1
3 changed files with 50 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ungoogled-chromium/.SRCINFO
View file

@ -1,6 +1,6 @@
pkgbase = ungoogled-chromium-xdg
pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory (using pre-releases)
pkgver = 123.0.6312.46
pkgver = 124.0.6367.60
pkgrel = 1
url = https://github.com/ungoogled-software/ungoogled-chromium
arch = x86_64
@ -40,7 +40,6 @@ pkgbase = ungoogled-chromium-xdg
depends = dav1d
depends = flac
depends = libxml2
depends = libwebp
depends = minizip
depends = opus
depends = harfbuzz
@ -54,35 +53,35 @@ pkgbase = ungoogled-chromium-xdg
optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
optdepends = kwallet5: support for storing passwords in KWallet on Plasma
optdepends = chromium-extension-web-store: Web Store Functionality
provides = chromium=123.0.6312.46
provides = chromedriver=123.0.6312.46
provides = chromium=124.0.6367.60
provides = chromedriver=124.0.6367.60
conflicts = chromium
conflicts = chromedriver
options = !lto
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-123.0.6312.46.tar.xz
source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-124.0.6367.60.tar.xz
source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/123/chromium-patches-123.tar.bz2
source = https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/124/chromium-patches-124.tar.bz2
source = drop-flag-unsupported-by-clang17.patch
source = compiler-rt-adjust-paths.patch
source = use-oauth2-client-switches-as-default.patch
source = xdg-basedir.patch
source = no-omnibox-suggestion-autocomplete.patch
source = index.html
source = ungoogled-chromium-123.0.6312.46-1.tar.gz::https://github.com/noahvogt/ungoogled-chromium/archive/refs/tags/123.0.6312.46-1.tar.gz
source = ungoogled-chromium-124.0.6367.60-1.tar.gz::https://github.com/noahvogt/ungoogled-chromium/archive/refs/tags/124.0.6367.60-1.tar.gz
source = 0001-adjust-buffer-format-order.patch
source = 0001-enable-linux-unstable-deb-target.patch
source = 0001-ozone-wayland-implement-text_input_manager_v3.patch
source = 0001-ozone-wayland-implement-text_input_manager-fixes.patch
sha256sums = 23f98adabeb040e002fb8aae17efb3e23a3036b2d14a75d03debf8644dab02e7
sha256sums = ebd553527149cb8477a522df90acd6cea2388a6f431e2db589a0301df1d0cae2
sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
sha256sums = 488f02af92b148eaa91ad5015b3bf383dfc8618ebafe9c3c250cd4c7f4e27b19
sha256sums = c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12
sha256sums = 3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1
sha256sums = b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961
sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
sha256sums = f97e6cd3c4d2e04f5d9a0ea234fe768d6ba0fa9f4ecd5c7b2ca91030a1249078
sha256sums = 41258e1eb5c9523e543c88459fffa2eadc8dd90972a4d4fb4f4172ba3f1c4d23
sha256sums = ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8
sha256sums = a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665
sha256sums = 64745d76954ffcaa91e590db2b385eb10251f9aed5a28087d119e63662834f08
sha256sums = 22899b0817ccf459ad7f4c0742bea0a0911eee2e7e4d140cd8cff30e51d66bbd
sha256sums = 8ba5c67b7eb6cacd2dbbc29e6766169f0fca3bbb07779b1a0a76c913f17d343f
sha256sums = 2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3
sha256sums = d9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285

16
ungoogled-chromium/PKGBUILD
View file

@ -10,7 +10,7 @@
# binary version of this package (-bin): github.com/noahvogt/ungoogled-chromium-xdg-bin-aur
pkgname=ungoogled-chromium-xdg
pkgver=123.0.6312.46
pkgver=124.0.6367.60
pkgrel=1
_launcher_ver=8
_manual_clone=0
@ -23,7 +23,7 @@ depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'libva'
'libffi' 'desktop-file-utils' 'hicolor-icon-theme')
makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'nodejs' 'pipewire'
'rust' 'qt5-base' 'java-runtime-headless' 'git')
'rust' 'qt6-base' 'java-runtime-headless' 'git')
optdepends=('pipewire: WebRTC desktop sharing under Wayland'
'kdialog: support for native dialogs in Plasma'
'qt5-base: enable Qt5 with --enable-features=AllowQt'
@ -37,9 +37,9 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
drop-flag-unsupported-by-clang17.patch
compiler-rt-adjust-paths.patch
use-oauth2-client-switches-as-default.patch)
sha256sums=('23f98adabeb040e002fb8aae17efb3e23a3036b2d14a75d03debf8644dab02e7'
sha256sums=('ebd553527149cb8477a522df90acd6cea2388a6f431e2db589a0301df1d0cae2'
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
'488f02af92b148eaa91ad5015b3bf383dfc8618ebafe9c3c250cd4c7f4e27b19'
'c2bc4e65ed2a4e23528dd10d5c15bf99f880b7bbb789cc720d451b78098a7e12'
'3bd35dab1ded5d9e1befa10d5c6c4555fe0a76d909fb724ac57d0bf10cb666c1'
'b3de01b7df227478687d7517f61a777450dca765756002c80c4915f271e2d961'
'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
@ -50,7 +50,7 @@ source=(${source[@]}
no-omnibox-suggestion-autocomplete.patch
index.html)
sha256sums=(${sha256sums[@]}
'f97e6cd3c4d2e04f5d9a0ea234fe768d6ba0fa9f4ecd5c7b2ca91030a1249078'
'41258e1eb5c9523e543c88459fffa2eadc8dd90972a4d4fb4f4172ba3f1c4d23'
'ff1591fa38e0ede7e883dc7494b813641b7a1a7cb1ded00d9baaee987c1dbea8'
'a4cdd2b86f32d5302c2792be841ff40d982b19bb58a4e63df9d77f4c706b8665')
@ -76,7 +76,7 @@ source=(${source[@]}
0001-ozone-wayland-implement-text_input_manager_v3.patch
0001-ozone-wayland-implement-text_input_manager-fixes.patch)
sha256sums=(${sha256sums[@]}
'64745d76954ffcaa91e590db2b385eb10251f9aed5a28087d119e63662834f08'
'22899b0817ccf459ad7f4c0742bea0a0911eee2e7e4d140cd8cff30e51d66bbd'
'8ba5c67b7eb6cacd2dbbc29e6766169f0fca3bbb07779b1a0a76c913f17d343f'
'2a44756404e13c97d000cc0d859604d6848163998ea2f838b3b9bb2c840967e3'
'd9974ddb50777be428fd0fa1e01ffe4b587065ba6adefea33678e1b3e25d1285'
@ -100,7 +100,7 @@ declare -gA _system_libs=(
[libjpeg]=libjpeg
[libpng]=libpng
#[libvpx]=libvpx
[libwebp]=libwebp
#[libwebp]=libwebp # //third_party/libavif:libavif_enc needs //third_party/libwebp:libwebp_sharpyuv
[libxml]=libxml2
[libxslt]=libxslt
[opus]=opus
@ -138,7 +138,7 @@ prepare() {
third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
third_party/libxml/chromium/*.cc \
third_party/maldoca/src/maldoca/ole/oss_utils.h
patch -Np1 -i $startdir/tab.patch
# Use the --oauth2-client-id= and --oauth2-client-secret= switches for

62
ungoogled-chromium/xdg-basedir.patch
View file

@ -2,34 +2,6 @@
# builds to follow the XDG Base Directory Specification. For details, refer to
# https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
--- a/base/nix/xdg_util.cc
+++ b/base/nix/xdg_util.cc
@@ -30,6 +30,8 @@ const char kDotConfigDir[] = ".config";
const char kXdgConfigHomeEnvVar[] = "XDG_CONFIG_HOME";
const char kXdgCurrentDesktopEnvVar[] = "XDG_CURRENT_DESKTOP";
const char kXdgSessionTypeEnvVar[] = "XDG_SESSION_TYPE";
+const char kDotDataDir[] = ".local/share";
+const char kXdgDataHomeEnvVar[] = "XDG_DATA_HOME";
FilePath GetXDGDirectory(Environment* env, const char* env_name,
const char* fallback_dir) {
--- a/base/nix/xdg_util.h
+++ b/base/nix/xdg_util.h
@@ -61,6 +61,12 @@ BASE_EXPORT extern const char kXdgCurrentDesktopEnvVar[];
// The XDG session type environment variable.
BASE_EXPORT extern const char kXdgSessionTypeEnvVar[];
+// The default XDG data directory name.
+BASE_EXPORT extern const char kDotDataDir[];
+
+// The XDG data directory environment variable.
+BASE_EXPORT extern const char kXdgDataHomeEnvVar[];
+
// Utility function for getting XDG directories.
// |env_name| is the name of an environment variable that we want to use to get
// a directory path. |fallback_dir| is the directory relative to $HOME that we
--- a/crypto/nss_util.cc
+++ b/crypto/nss_util.cc
@@ -30,6 +30,9 @@
@ -42,7 +14,7 @@
namespace crypto {
@@ -45,12 +48,21 @@ static const base::FilePath::CharType kReadOnlyCertDB[] =
@@ -45,12 +48,25 @@ static const base::FilePath::CharType kReadOnlyCertDB[] =
base::FilePath GetDefaultConfigDirectory() {
base::FilePath dir;
@ -53,8 +25,11 @@
base::PathService::Get(base::DIR_HOME, &dir);
+#endif
if (dir.empty()) {
- LOG(ERROR) << "Failed to get home directory.";
+#if defined(OS_LINUX)
+ LOG(ERROR) << "Failed to get $HOME or $XDG_DATA_HOME directory.";
+#else
LOG(ERROR) << "Failed to get home directory.";
+#endif
return dir;
}
+#if defined(OS_LINUX)
@ -65,3 +40,30 @@
if (!base::CreateDirectory(dir)) {
LOG(ERROR) << "Failed to create " << dir.value() << " directory.";
dir.clear();
--- a/base/nix/xdg_util.cc
+++ b/base/nix/xdg_util.cc
@@ -41,6 +41,9 @@ std::optional<std::string>& GetXdgActivationToken() {
namespace base::nix {
+const char kDotDataDir[] = ".local/share";
+const char kXdgDataHomeEnvVar[] = "XDG_DATA_HOME";
+
const char kDotConfigDir[] = ".config";
const char kXdgConfigHomeEnvVar[] = "XDG_CONFIG_HOME";
const char kXdgCurrentDesktopEnvVar[] = "XDG_CURRENT_DESKTOP";
--- a/base/nix/xdg_util.h
+++ b/base/nix/xdg_util.h
@@ -72,6 +72,12 @@ BASE_EXPORT extern const char kXdgConfigHomeEnvVar[];
// The XDG current desktop environment variable.
BASE_EXPORT extern const char kXdgCurrentDesktopEnvVar[];
+// The default XDG data directory name.
+BASE_EXPORT extern const char kDotDataDir[];
+
+// The XDG data directory environment variable.
+BASE_EXPORT extern const char kXdgDataHomeEnvVar[];
+
// The XDG session type environment variable.
BASE_EXPORT extern const char kXdgSessionTypeEnvVar[];