Browse Source

minor fix

tags/90.0.4430.93-1
wchen342 5 months ago
parent
commit
bba2a6f364
Signed by: wchen342 GPG Key ID: 9C19365D69B04CEC
3 changed files with 32 additions and 22 deletions
  1. +10
    -0
      chromium-missing-std-vector.patch
  2. +16
    -17
      ungoogled-chromium.sh
  3. +6
    -5
      ungoogled-chromium.spec

+ 10
- 0
chromium-missing-std-vector.patch View File

@ -0,0 +1,10 @@
--- a/components/autofill/core/browser/pattern_provider/pattern_provider.h
+++ b/components/autofill/core/browser/pattern_provider/pattern_provider.h
@@ -6,6 +6,7 @@
#define COMPONENTS_AUTOFILL_CORE_BROWSER_PATTERN_PROVIDER_PATTERN_PROVIDER_H_
#include <string>
+#include <vector>
#include "base/macros.h"
#include "base/no_destructor.h"

+ 16
- 17
ungoogled-chromium.sh View File

@ -4,16 +4,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# This file is obtained from https://src.fedoraproject.org/rpms/chromium/
# and modified by Akarshan Biswas <[email protected]>. All modifications are also
# licensed under 3-clause BSD license.
CHROMIUM_DISTRO_FLAGS=()
# Let the wrapped binary know that it has been run through the wrapper.
export CHROME_WRAPPER="$(readlink -f "$0")"
export CHROME_WRAPPER="`readlink -f "$0"`"
HERE="`dirname "$CHROME_WRAPPER"`"
export CHROME_DESKTOP="ungoogled-chromium.desktop"
# We include some xdg utilities next to the binary, and we want to prefer them
# over the system versions when we know the system versions are very old. We
# detect whether the system xdg utilities are sufficiently new to be likely to
@ -39,19 +34,23 @@ else
fi
export LD_LIBRARY_PATH
export CHROME_VERSION_EXTRA="Built from source for @@[email protected]@"
# We don't want bug-buddy intercepting our crashes. http://crbug.com/24120
export GNOME_DISABLE_CRASH_DIALOG=SET_BY_GOOGLE_CHROME
# Disable allow_rgb_configs to fix odd color and vaapi issues with Mesa
export allow_rgb10_configs=false
CHROMIUM_DISTRO_FLAGS+=" --enable-plugins \
--enable-extensions \
--enable-user-scripts \
--enable-printing \
--disable-sync \
--disable-background-networking \
--force-local-ntp \
--disallow-signin"
exec -a "$0" "@@[email protected]@/$(basename "$0" | sed 's/\.sh$//')" $CHROMIUM_DISTRO_FLAGS "[email protected]"
CHROMIUM_DISTRO_FLAGS=" --enable-plugins \
--enable-extensions \
--enable-user-scripts \
--enable-printing \
--enable-gpu-rasterization \
--disable-sync \
--disable-background-networking \
--force-local-ntp \
--disallow-signin \
--auto-ssl-client-auth @@[email protected]@"
exec -a "$0" "$HERE/@@[email protected]@" $CHROMIUM_DISTRO_FLAGS "[email protected]"

+ 6
- 5
ungoogled-chromium.spec View File

@ -1,8 +1,8 @@
%define _lto_cflags %{nil}
%global numjobs 10
%global numjobs 14
%ifarch aarch64
%global numjobs 8
%global numjobs 12
%endif
# Fancy build status, so we at least know, where we are..
@ -214,6 +214,7 @@ Patch600: chromium-default-user-data-dir.patch
# Additional patches:
Patch700: chromium-widevine-locations.patch
Patch701: chromium-missing-std-vector.patch
# Unfortunately, Fedora & Copr forbids uploading sources with patent-encumbered
@ -550,6 +551,7 @@ browser, ungoogled-chromium is essentially a drop-in replacement for Chromium.
# Additional patches:
%patch700 -p1 -b .widevine-locations
%patch701 -p1 -b .missing-std-vector
# Change shebang in all relevant files in this directory and all subdirectories
# See `man find` for how the `-exec command {} +` syntax works
@ -630,7 +632,7 @@ UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_custom_libcxx=false'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' target_cpu="arm64"'
%endif
UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_gnome_keyring=false use_glib=true'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_gio=true use_pulseaudio=true icu_use_data_file=false'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' use_gio=true use_pulseaudio=true icu_use_data_file = true'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' enable_nacl=false'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=false'
UNGOOGLED_CHROMIUM_GN_DEFINES+=' blink_symbol_level=0 enable_hangout_services_extension=false'
@ -1087,7 +1089,6 @@ rm -rf %{buildroot}
cp -a snapshot_blob.bin %{buildroot}%{chromium_path}
cp -a v8_context_snapshot.bin %{buildroot}%{chromium_path}
cp -a xdg-mime xdg-settings %{buildroot}%{chromium_path}
cp -a MEIPreload %{buildroot}%{chromium_path}
# This is ANGLE, not to be confused with the similarly named files under swiftshader/
cp -a libEGL.so* libGLESv2.so* %{buildroot}%{chromium_path}
@ -1170,13 +1171,13 @@ fi
%dir %{chromium_path}
%{chromium_path}/*.bin
%{chromium_path}/chrome_*.pak
%{chromium_path}/headless_*.pak
%{chromium_path}/resources.pak
%{chromium_path}/icudtl.dat
%{chromium_path}/%{chromium_browser_channel}
%{chromium_path}/%{chromium_browser_channel}.sh
%{chromium_path}/libEGL.so*
%{chromium_path}/libGLESv2.so*
%{chromium_path}/MEIPreload/
%ifarch x86_64 i686 aarch64
%{chromium_path}/swiftshader/
%endif


Loading…
Cancel
Save