Skip to content

Commit

Permalink
PKGBUILD+Patches: Fix building with third party re2
Browse files Browse the repository at this point in the history
  • Loading branch information
networkException committed Sep 22, 2024
1 parent fe91533 commit 262c83e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
8 changes: 6 additions & 2 deletions PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
0001-ozone-wayland-implement-text_input_manager-fixes.patch
0001-vaapi-flag-ozone-wayland.patch
p010-Zero-Copy-for-VA-API-Decoding-for-Vulkan.patch
add-feature-to-allow-zero-copy-video-formats.patch)
add-feature-to-allow-zero-copy-video-formats.patch
fix-ungoogled-third-party-re2.patch)
sha256sums=('eaf850183d32627ce0cde9f3d3f853bc11c217ef7f41540303214ed47803d96d'
'a52872325dcf1121acbabec781edfabe068a50a9080e81e69b249dd6301f2eac'
'213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
Expand All @@ -60,7 +61,8 @@ sha256sums=('eaf850183d32627ce0cde9f3d3f853bc11c217ef7f41540303214ed47803d96d'
'a2da75d0c20529f2d635050e0662941c0820264ea9371eb900b9d90b5968fa6a'
'9a5594293616e1390462af1f50276ee29fd6075ffab0e3f944f6346cb2eb8aec'
'40db59162df2b7a2c0387bd620802f15424f637c09ba305b674fc09410ab21d1'
'713dab4f8c26790c0e4a4c5ce6a9269e90446df5370cc14214a01a363f7afe39')
'713dab4f8c26790c0e4a4c5ce6a9269e90446df5370cc14214a01a363f7afe39'
'ffa3cf9d1386bd1a2c400c09ddf2790f125f44ccf108d1a3c62a21cd7fb1ff09')

# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
# Keys are the names in the above script; values are the dependencies in Arch
Expand Down Expand Up @@ -123,6 +125,8 @@ prepare() {
# Increase _FORTIFY_SOURCE level to match Arch's default flags
patch -Np1 -i ../increase-fortify-level.patch

patch -Np1 -i ../fix-ungoogled-third-party-re2.patch

# Fixes for building with libstdc++ instead of libc++

# test deps are broken for ui/lens with system ICU
Expand Down
20 changes: 20 additions & 0 deletions fix-ungoogled-third-party-re2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--- a/components/plus_addresses/BUILD.gn
+++ b/components/plus_addresses/BUILD.gn
@@ -95,6 +95,7 @@ source_set("plus_addresses") {
"//net",
"//services/data_decoder/public/cpp",
"//services/network/public/cpp",
+ "//third_party/re2",
"//ui/base",
]
public_deps = [
--- a/components/component_updater/installer_policies/BUILD.gn
+++ b/components/component_updater/installer_policies/BUILD.gn
@@ -45,6 +45,7 @@ static_library("installer_policies_no_co
"//components/update_client",
"//mojo/public/cpp/base:protobuf_support",
"//services/network/public/cpp",
+ "//third_party/re2",
]

# Disallow depending on content.

0 comments on commit 262c83e

Please sign in to comment.