mirror of
				https://gitlab.alpinelinux.org/alpine/aports.git
				synced 2025-11-04 10:21:36 +01:00 
			
		
		
		
	testing/electron: upgrade to 21.1.0
This commit is contained in:
		
							parent
							
								
									53464cf181
								
							
						
					
					
						commit
						90966cea8a
					
				@ -1,10 +1,10 @@
 | 
				
			|||||||
# Maintainer: psykose <alice@ayaya.dev>
 | 
					# Maintainer: psykose <alice@ayaya.dev>
 | 
				
			||||||
pkgname=electron
 | 
					pkgname=electron
 | 
				
			||||||
pkgver=19.1.2
 | 
					pkgver=21.1.0
 | 
				
			||||||
pkgrel=0
 | 
					pkgrel=0
 | 
				
			||||||
_gitrev=47487510053d86b231fcd3437bd08810409fe529
 | 
					_gitrev=2b69b32c1d4581cb7c6ec95c38a37bc4235664bf
 | 
				
			||||||
_chromium=102.0.5005.167
 | 
					_chromium=106.0.5249.91
 | 
				
			||||||
_depot_tools=2c54a19bd02b9803db96926e556b9e3ee6db8b63
 | 
					_depot_tools=7b1f933dc4ec81cd78d6287f2bc53d3b48eb512f
 | 
				
			||||||
pkgdesc="Electron cross-platform desktop toolkit"
 | 
					pkgdesc="Electron cross-platform desktop toolkit"
 | 
				
			||||||
url="https://github.com/electron/electron"
 | 
					url="https://github.com/electron/electron"
 | 
				
			||||||
arch="aarch64 x86_64" # same as chromium
 | 
					arch="aarch64 x86_64" # same as chromium
 | 
				
			||||||
@ -12,7 +12,9 @@ license="MIT"
 | 
				
			|||||||
depends="gtk+3.0 so:libudev.so.1 xdg-utils"
 | 
					depends="gtk+3.0 so:libudev.so.1 xdg-utils"
 | 
				
			||||||
makedepends="
 | 
					makedepends="
 | 
				
			||||||
	alsa-lib-dev
 | 
						alsa-lib-dev
 | 
				
			||||||
 | 
						aom-dev
 | 
				
			||||||
	bash
 | 
						bash
 | 
				
			||||||
 | 
						brotli-dev
 | 
				
			||||||
	bsd-compat-headers
 | 
						bsd-compat-headers
 | 
				
			||||||
	bzip2-dev
 | 
						bzip2-dev
 | 
				
			||||||
	c-ares-dev
 | 
						c-ares-dev
 | 
				
			||||||
@ -22,6 +24,7 @@ makedepends="
 | 
				
			|||||||
	compiler-rt
 | 
						compiler-rt
 | 
				
			||||||
	cups-dev
 | 
						cups-dev
 | 
				
			||||||
	curl-dev
 | 
						curl-dev
 | 
				
			||||||
 | 
						dav1d-dev
 | 
				
			||||||
	dbus-glib-dev
 | 
						dbus-glib-dev
 | 
				
			||||||
	eudev-dev
 | 
						eudev-dev
 | 
				
			||||||
	ffmpeg-dev
 | 
						ffmpeg-dev
 | 
				
			||||||
@ -43,6 +46,7 @@ makedepends="
 | 
				
			|||||||
	krb5-dev
 | 
						krb5-dev
 | 
				
			||||||
	lcms2-dev
 | 
						lcms2-dev
 | 
				
			||||||
	libarchive-tools
 | 
						libarchive-tools
 | 
				
			||||||
 | 
						libavif-dev
 | 
				
			||||||
	libbsd-dev
 | 
						libbsd-dev
 | 
				
			||||||
	libcap-dev
 | 
						libcap-dev
 | 
				
			||||||
	libevent-dev
 | 
						libevent-dev
 | 
				
			||||||
@ -84,6 +88,7 @@ makedepends="
 | 
				
			|||||||
	snappy-dev
 | 
						snappy-dev
 | 
				
			||||||
	speex-dev
 | 
						speex-dev
 | 
				
			||||||
	sqlite-dev
 | 
						sqlite-dev
 | 
				
			||||||
 | 
						woff2-dev
 | 
				
			||||||
	xcb-proto
 | 
						xcb-proto
 | 
				
			||||||
	yarn
 | 
						yarn
 | 
				
			||||||
	zlib-dev
 | 
						zlib-dev
 | 
				
			||||||
@ -91,9 +96,8 @@ makedepends="
 | 
				
			|||||||
subpackages="$pkgname-lang $pkgname-dev"
 | 
					subpackages="$pkgname-lang $pkgname-dev"
 | 
				
			||||||
# the lower patches are specific to electron, the top ones are from the equivalent chromium version
 | 
					# the lower patches are specific to electron, the top ones are from the equivalent chromium version
 | 
				
			||||||
source="https://dev.alpinelinux.org/archive/electron/electron-$pkgver.tar.xz
 | 
					source="https://dev.alpinelinux.org/archive/electron/electron-$pkgver.tar.xz
 | 
				
			||||||
 | 
						angle-wayland-include.patch
 | 
				
			||||||
	canonicalize-file-name.patch
 | 
						canonicalize-file-name.patch
 | 
				
			||||||
	chromium-102-fenced_frame_utils-include.patch
 | 
					 | 
				
			||||||
	chromium-102-regex_pattern-array.patch
 | 
					 | 
				
			||||||
	chromium-VirtualCursor-standard-layout.patch
 | 
						chromium-VirtualCursor-standard-layout.patch
 | 
				
			||||||
	chromium-revert-drop-of-system-java.patch
 | 
						chromium-revert-drop-of-system-java.patch
 | 
				
			||||||
	chromium-use-alpine-target.patch
 | 
						chromium-use-alpine-target.patch
 | 
				
			||||||
@ -104,8 +108,7 @@ source="https://dev.alpinelinux.org/archive/electron/electron-$pkgver.tar.xz
 | 
				
			|||||||
	fix-missing-cstdint-include-musl.patch
 | 
						fix-missing-cstdint-include-musl.patch
 | 
				
			||||||
	fix-narrowing-cast.patch
 | 
						fix-narrowing-cast.patch
 | 
				
			||||||
	gdbinit.patch
 | 
						gdbinit.patch
 | 
				
			||||||
	iwyu-add-utility-for-std-exchange.patch
 | 
						jsoncpp.patch
 | 
				
			||||||
	libxml-unbundle.patch
 | 
					 | 
				
			||||||
	lto-core-count.patch
 | 
						lto-core-count.patch
 | 
				
			||||||
	memory-tagging-arm64.patch
 | 
						memory-tagging-arm64.patch
 | 
				
			||||||
	musl-sandbox.patch
 | 
						musl-sandbox.patch
 | 
				
			||||||
@ -116,21 +119,23 @@ source="https://dev.alpinelinux.org/archive/electron/electron-$pkgver.tar.xz
 | 
				
			|||||||
	no-mallinfo.patch
 | 
						no-mallinfo.patch
 | 
				
			||||||
	no-res-ninit-nclose.patch
 | 
						no-res-ninit-nclose.patch
 | 
				
			||||||
	no-stat-redefine.patch
 | 
						no-stat-redefine.patch
 | 
				
			||||||
 | 
						nullptr-t.patch
 | 
				
			||||||
	partition-atfork.patch
 | 
						partition-atfork.patch
 | 
				
			||||||
	push-back-nullptr.patch
 | 
					 | 
				
			||||||
	quiche-arena-size.patch
 | 
						quiche-arena-size.patch
 | 
				
			||||||
	remove-no-opaque-pointers-flag.patch
 | 
						roll-src-third_party-ffmpeg-102.patch
 | 
				
			||||||
	roll-src-third_party-ffmpeg.patch
 | 
						roll-src-third_party-ffmpeg-106.patch
 | 
				
			||||||
	scoped-file-no-close.patch
 | 
						scoped-file-no-close.patch
 | 
				
			||||||
	temp-failure-retry.patch
 | 
						temp-failure-retry.patch
 | 
				
			||||||
	wtf-stacksize.patch
 | 
						wtf-stacksize.patch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						icon.patch
 | 
				
			||||||
	python-jinja-3.10.patch
 | 
						python-jinja-3.10.patch
 | 
				
			||||||
	system-node.patch
 | 
						system-node.patch
 | 
				
			||||||
	vector-const.patch
 | 
						vector-const.patch
 | 
				
			||||||
	webpack-hash.patch
 | 
						webpack-hash.patch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	default.conf
 | 
						default.conf
 | 
				
			||||||
 | 
						electron.desktop
 | 
				
			||||||
	electron-launcher.sh
 | 
						electron-launcher.sh
 | 
				
			||||||
	"
 | 
						"
 | 
				
			||||||
options="!check suid"
 | 
					options="!check suid"
 | 
				
			||||||
@ -192,6 +197,8 @@ snapshot() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	python3 src/build/landmines.py
 | 
						python3 src/build/landmines.py
 | 
				
			||||||
	python3 src/build/util/lastchange.py -o src/build/util/LASTCHANGE
 | 
						python3 src/build/util/lastchange.py -o src/build/util/LASTCHANGE
 | 
				
			||||||
 | 
						python3 src/build/util/lastchange.py -s src/third_party/dawn \
 | 
				
			||||||
 | 
							--revision src/gpu/webgpu/DAWN_VERSION
 | 
				
			||||||
	python3 src/build/util/lastchange.py -m GPU_LISTS_VERSION \
 | 
						python3 src/build/util/lastchange.py -m GPU_LISTS_VERSION \
 | 
				
			||||||
		--revision-id-only --header src/gpu/config/gpu_lists_version.h
 | 
							--revision-id-only --header src/gpu/config/gpu_lists_version.h
 | 
				
			||||||
	python3 src/build/util/lastchange.py -m SKIA_COMMIT_HASH \
 | 
						python3 src/build/util/lastchange.py -m SKIA_COMMIT_HASH \
 | 
				
			||||||
@ -252,12 +259,16 @@ prepare() {
 | 
				
			|||||||
	)
 | 
						)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	local use_system="
 | 
						local use_system="
 | 
				
			||||||
 | 
							brotli
 | 
				
			||||||
 | 
							dav1d
 | 
				
			||||||
		ffmpeg
 | 
							ffmpeg
 | 
				
			||||||
		flac
 | 
							flac
 | 
				
			||||||
		fontconfig
 | 
							fontconfig
 | 
				
			||||||
		freetype
 | 
							freetype
 | 
				
			||||||
		harfbuzz-ng
 | 
							harfbuzz-ng
 | 
				
			||||||
		icu
 | 
							icu
 | 
				
			||||||
 | 
							jsoncpp
 | 
				
			||||||
 | 
							libaom
 | 
				
			||||||
		libdrm
 | 
							libdrm
 | 
				
			||||||
		libevent
 | 
							libevent
 | 
				
			||||||
		libjpeg
 | 
							libjpeg
 | 
				
			||||||
@ -268,6 +279,7 @@ prepare() {
 | 
				
			|||||||
		opus
 | 
							opus
 | 
				
			||||||
		re2
 | 
							re2
 | 
				
			||||||
		snappy
 | 
							snappy
 | 
				
			||||||
 | 
							woff2
 | 
				
			||||||
		zlib
 | 
							zlib
 | 
				
			||||||
		"
 | 
							"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -384,6 +396,11 @@ package() {
 | 
				
			|||||||
	mkdir -p "$pkgdir"/usr/include/electron/node_headers/include/nan
 | 
						mkdir -p "$pkgdir"/usr/include/electron/node_headers/include/nan
 | 
				
			||||||
	cp -v "$builddir"/third_party/nan/*.h "$pkgdir"/usr/include/electron/node_headers/include/nan
 | 
						cp -v "$builddir"/third_party/nan/*.h "$pkgdir"/usr/include/electron/node_headers/include/nan
 | 
				
			||||||
	ln -sv /usr/include/electron/node_headers/include/nan "$pkgdir"/usr/include/electron/nan
 | 
						ln -sv /usr/include/electron/node_headers/include/nan "$pkgdir"/usr/include/electron/nan
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						install -Dm644 electron/default_app/icon.png \
 | 
				
			||||||
 | 
							"$pkgdir"/usr/share/icons/hicolor/1024x1024/apps/electron.png
 | 
				
			||||||
 | 
						install -Dm644 "$srcdir"/electron.desktop \
 | 
				
			||||||
 | 
							-t "$pkgdir"/usr/share/applications/
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
lang() {
 | 
					lang() {
 | 
				
			||||||
@ -399,44 +416,44 @@ lang() {
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
sha512sums="
 | 
					sha512sums="
 | 
				
			||||||
8b5bf3f2aeaf974025d21372a0d4fed56be99caec3fba266139b4263708b64fa1e31e5fe57af0bb51872d79a243a7b51ae5b51e4d0ec19a8b135c8b8b7f937e0  electron-19.1.2.tar.xz
 | 
					bda65733639fd74851362a21167c75185215cb29f4b4a85bbfc093497e0235285f548a0616f2d3d037289c9edeb1cdc73984e271a57caa2b9512647e9e8fc1f8  electron-21.1.0.tar.xz
 | 
				
			||||||
 | 
					f19ba0c0f542115e6f53019659df256471e811a23d2f37569c9d4dfa265c0c1ace3e62c74d7507f82e6b7b4152c704e651810a00616f8f531592b14bb2af01d9  angle-wayland-include.patch
 | 
				
			||||||
252b37a2ecc5e7a25385943045f426dc2e30991b28d206ceaff1be7fd8ffeeb024310a8fca6b3e69a4b1c57db535d51c570935351053525f393682d5ecd0f9a9  canonicalize-file-name.patch
 | 
					252b37a2ecc5e7a25385943045f426dc2e30991b28d206ceaff1be7fd8ffeeb024310a8fca6b3e69a4b1c57db535d51c570935351053525f393682d5ecd0f9a9  canonicalize-file-name.patch
 | 
				
			||||||
459910ac11dfd2953240a72836aac55c33d914906194897b38328f482173a101930cad1656906df0bc1c903d41199eee8089f474f5d8b056cfb12c8f2b0acffb  chromium-102-fenced_frame_utils-include.patch
 | 
					 | 
				
			||||||
a6f066e0cbb4e0644733b48013f150647b3c431dc5ebcbff611b3214c86739726208874f67cb339140045e7934e7636f7514bd7aec603545d47c7ab6ca205be4  chromium-102-regex_pattern-array.patch
 | 
					 | 
				
			||||||
ac0a80174f95d733f33ddc06fc88cdcf7db0973378c28d8544dc9c19e2dabeac47f91c99b3e7384f650b3405554a9e222543f0860b6acc407c078a8c9180d727  chromium-VirtualCursor-standard-layout.patch
 | 
					ac0a80174f95d733f33ddc06fc88cdcf7db0973378c28d8544dc9c19e2dabeac47f91c99b3e7384f650b3405554a9e222543f0860b6acc407c078a8c9180d727  chromium-VirtualCursor-standard-layout.patch
 | 
				
			||||||
c4654d5b23c6f5d9502507e534fe1951d6749c62251e49b6adfe10d1569431e7f7a5a6fa5ff09ec30984415ced27a5e20985df8c91295de34af3c84557fa5b91  chromium-revert-drop-of-system-java.patch
 | 
					c4654d5b23c6f5d9502507e534fe1951d6749c62251e49b6adfe10d1569431e7f7a5a6fa5ff09ec30984415ced27a5e20985df8c91295de34af3c84557fa5b91  chromium-revert-drop-of-system-java.patch
 | 
				
			||||||
6add8b4c293f5392748a2eec9486cb4a6534e161977c6a98de71617b9abcdd1e8ad94b44014256a4b52e33eb9dd4aca380279d4161629a1bb2d7b15f8eb5b459  chromium-use-alpine-target.patch
 | 
					d2b5b0396173367fcf1804aaee8e7fbefce9c63ac2a91c3a1ede759cb85e567317a57e4d4f82d3ca021682fb7856e15c074276a03eda946d9b28e1cb706b07ad  chromium-use-alpine-target.patch
 | 
				
			||||||
274858323d040ac8c51bac90b6ef91bb075d7b8d92d73952ed700c10a8bae2c2115fb2a9cc6912de79be226c141d7106839fc3486e22c0206e75cb6d8ff65ee6  credentials-sys-types-header.patch
 | 
					ec04bf43278a19d4bb090eddd636ad7093c7e757cb2ffa1875971e0709761174790e109b9be03a8e299d4077a87fbd8dabd301b8754bb6fe53c055396e8af556  credentials-sys-types-header.patch
 | 
				
			||||||
22da17c649ae9845d6a174187f2b666245a10db8a997169fc214c430fbba10143cfb57f8f6ece5acf856cd9ea09f293a1aca90cdf3e64fd9423b78beac53f517  default-pthread-stacksize.patch
 | 
					4ab8261bf95547b10df44e4d528c06a64c33602c10a1e09d531190dc8947ba6ef9e69145405b801cd364707570f791fee6d93e3bf5d57831f5a85212ddf01729  default-pthread-stacksize.patch
 | 
				
			||||||
cd7719c30518aeb659e9b7dc126241f897afe1a231e601271b63ba170e811a93b514c4d2a77680cdf0c846f81fa6db766ac619aa200efb32cbdfff6732a63893  dns-resolver.patch
 | 
					f011f66e5aae5a6f0d440492ee9400878b47b66214c1bc8dc1477fdd07ad0a508cdbb74415e55e27085c4e61e112e7c2ae2edfa217f2fb387e13097b24cb17b1  dns-resolver.patch
 | 
				
			||||||
9d1edb1e0624ee61825e3af23fbb8c5dbc09d2b92d7769d19f8ca618edae8de8a3e051fedf4ad92c230e1373dc8495922c46971aef93a580c04ad80bc33516c0  fix-crashpad.patch
 | 
					9d1edb1e0624ee61825e3af23fbb8c5dbc09d2b92d7769d19f8ca618edae8de8a3e051fedf4ad92c230e1373dc8495922c46971aef93a580c04ad80bc33516c0  fix-crashpad.patch
 | 
				
			||||||
8bebf4a9d5225c6e47edc5b07c4b97be24a45cc221f49632836915ceeb4ecb69b7f79a31ea7f82171cde3443f45fec541f409892542cf1014e81aa6acd01566d  fix-missing-cstdint-include-musl.patch
 | 
					8bebf4a9d5225c6e47edc5b07c4b97be24a45cc221f49632836915ceeb4ecb69b7f79a31ea7f82171cde3443f45fec541f409892542cf1014e81aa6acd01566d  fix-missing-cstdint-include-musl.patch
 | 
				
			||||||
efe97b9dd2ec5965fa0cdf1b2a3c01253835c2df710da7ea105c4ce008c11f9caaf8b4321736a2b91f06d8d61972c08e225b16509dc05176a2c39337688ad5b9  fix-narrowing-cast.patch
 | 
					efe97b9dd2ec5965fa0cdf1b2a3c01253835c2df710da7ea105c4ce008c11f9caaf8b4321736a2b91f06d8d61972c08e225b16509dc05176a2c39337688ad5b9  fix-narrowing-cast.patch
 | 
				
			||||||
82f2bd4aa613e792d3af6e7a8632e0920cf48504a7572fb97d5480ea182fa125fe526e7df1ce4311b5d139a3f78da0f0b54605fbd09d7cd43135906a7639e47f  gdbinit.patch
 | 
					cf73cbe5bf19d6a22157fb7aafb43f326885e852fc6292728f4ed1cd145d07ba5af51b6ec808095136cd406478aaa427ee1b9611c855fbd87976e1a91e1609bd  gdbinit.patch
 | 
				
			||||||
4d268992ddb341e70f4e730c82c676c0c95b3958bc9553bbe83383cebde7373c79a8e9aeef47c7af2add8353263b02ccfd7e5bd864f544a584361a02d30374ec  iwyu-add-utility-for-std-exchange.patch
 | 
					fa2637f92f851614347e296fbab744af2c5d7edcbb444aeb4a5d3182a8ec2549593d75e717d7e78e9b2a7257e693b48fc88c149c1591052d7ae802f4fda0a775  jsoncpp.patch
 | 
				
			||||||
17b54042c58cd448c7e26dca1504bb48d85fdd7c2385930e639c283493a5e430923041f01cde5a5dfaa32fbb7f0a645baca55b202d56d3f245fb4febdf026da2  libxml-unbundle.patch
 | 
					 | 
				
			||||||
1e004d2390a8031125345d39a98e03aab7fa5120317b632cfb250f705bd2983292f41e9c29637b2ea284d095b5747ac2d9664bf0a309e13967283b505f134a29  lto-core-count.patch
 | 
					1e004d2390a8031125345d39a98e03aab7fa5120317b632cfb250f705bd2983292f41e9c29637b2ea284d095b5747ac2d9664bf0a309e13967283b505f134a29  lto-core-count.patch
 | 
				
			||||||
63e5b25c49af484964b3ac723da1c2f348812572a2e24ad412d2fb9eb7eec9ddc0e76568e76d1f352cdc562bc5003c93e04ee519a82e8568f48484d1682e237f  memory-tagging-arm64.patch
 | 
					e0afb7066c2cb41aa461feb9e45e571517229deab9d06186490b527783a7ba826a4d67d3a14a33a164eea64fa561eb5b93a1d4dfd0acc2e7a9eb038e6ee273db  memory-tagging-arm64.patch
 | 
				
			||||||
af7f8408a5125e2fd75372fcd9d6b355c96b97e1003e48634e54115b4e612c6f6d8d3a3c18d9a114363b6934e728aec1b94e93c8a2772785f88a83bbc7f42488  musl-sandbox.patch
 | 
					fdf8ba7badbd5b61d415ad9d49c66b6ef0a6a40ec95a47e13af48711fe1bd3a5574e987929a3c486cdd02c239863b8517e7f834cecd30f156479e43a9441a18e  musl-sandbox.patch
 | 
				
			||||||
a018cf58b9e34f73d588961f2f9a36de67267060fb2e77ebc562974c6c92a59009161e374cf9bbdc35e8bf1a7e90f0b90117a0d494dcd2e2bb2f5e6534925d0b  musl-tid-caching.patch
 | 
					85c2842a251a3f8aa59c701ca5f2ce2f5d49b5c7e4773d5387dc597447fb47c9d876f5fb308576686c9a8abc7e35cfc172b6cdfb9f5f1dc1509329e3590b38d8  musl-tid-caching.patch
 | 
				
			||||||
556cc2ba28184a75745f13c673605327f5be590be179eb3f941dc0abded854a814e5da1432a28fb8d4dcdcd66ffd4c94ee1a8824d2cd93b632f48e9310dbc3fa  musl-v8-monotonic-pthread-cont_timedwait.patch
 | 
					d2825aa9525fcbb53791f0ef2502c0f444a9d668f09db6ae4987b94dc4d0e6f1cf58a6e9e772ab11c896a469ca32242feb3ad9c9dbb20df9316cd74151ab0ec9  musl-v8-monotonic-pthread-cont_timedwait.patch
 | 
				
			||||||
3f90f888f015efd04636eee0e8431d41e073d432563553298d7b8be7650c397eb7d43a5bf682df1f66ffd7182852d4b836adb7dcd934f9b45247cdd99046e45c  no-execinfo.patch
 | 
					ebd5cf28277853dc5e984961c370ab4a6331488ae7cff45083fea0470262f56486664bc9bd7947fdd796c8635e479633c4d08cfd89270c0310f3ec21cc6642d2  no-execinfo.patch
 | 
				
			||||||
caf9c4e4533b94dfe6b28350f8ea9654311b684dfd0c5ba768ab14775e0164f577dfd356cd507bcad9f378ec2c180c8e6edbde9bba62caf70fbac5a642edc61b  no-glibc-version.patch
 | 
					f0bf97a80e663041e33cb0468fd8c47c5f351d6de61059ce1f359a813c40db8e247eaef294c3f562c0a8204e4f1992a918f1d879b1da9891027500e21f482b79  no-glibc-version.patch
 | 
				
			||||||
86a75fd53f5fc0c7a0b1ea73bbc0a6966464f613c8c410684cc25e5eee09482490aece8d2925bcece2489e1e3c1d70c659c6b6220119d7d546bf651864258a3e  no-mallinfo.patch
 | 
					10ae0f74a4c1db899b571508100af63e5af8d0f7c41a37fc9b7987cbf9f27f4c55894c02d6820957d7522a528929059f562f96c2f05fd6509f60c6c71d9d8256  no-mallinfo.patch
 | 
				
			||||||
3319fa42bd582679f449151de5905c582e156cf8dff850326cfbd7a97c92afea0b074ff1275e1ec923ed1491db2adec632d4222fed0f7f1c6607aee930ec9559  no-res-ninit-nclose.patch
 | 
					a5aa82c30402773903db1d3876208132fdef175f56ebc0ce1ee4c104a98d498d709c5565c4381736c04c238203b3c8a9cd7a5b5e69876f6afb65d7fc48df23d0  no-res-ninit-nclose.patch
 | 
				
			||||||
0c0d3ed0a8f2bcecb2bf4eb56130fcd71031bb63744fb56e1b5a6b9dfbe16680607ff592e24602fe045b819509a70556e240b6fe0e876710977d60185f682df4  no-stat-redefine.patch
 | 
					2c0d7239728d98c0564ad7b81d6d243e58e56de58a21357fa30c39e333fc29c1aa98529c6e1b6fa7694169b513391ca27fa542f69b483bbde644cc2ed739bbdd  no-stat-redefine.patch
 | 
				
			||||||
 | 
					5e9f6279698195467e3b506cea9be0d97ec2d970672b1b12d3d7880eec4f6f53b8f92942dc3fc6738b02889382534ce0f4310a1f94b33e21f8fbc70b85640b81  nullptr-t.patch
 | 
				
			||||||
ad563e29ac7d83c203f5af966c4ed3ebdeb5c997835a45fb28ecde08dde5231d0a775fb413f44867af28724504c42316b27d5a6aaa602057642dcbdf7ec20a7a  partition-atfork.patch
 | 
					ad563e29ac7d83c203f5af966c4ed3ebdeb5c997835a45fb28ecde08dde5231d0a775fb413f44867af28724504c42316b27d5a6aaa602057642dcbdf7ec20a7a  partition-atfork.patch
 | 
				
			||||||
36f8b96a8143355b7855a248473206c16101616d46978773c8fad92757bb24f60f23d843a25c219efe4b0a957f43aa7ea5ce5867b29228ef7371d1b886e528da  push-back-nullptr.patch
 | 
					083ed731e0a3788f2cb04a3035022fbb3e4db99eba01516ea233ea3229f7d898943d8115463a48655ac83eb3cc7a48aceb8bf17c68930a5a1d83b1af95dfade8  quiche-arena-size.patch
 | 
				
			||||||
c7fc8a1a079224b9ed6a1f8331cef901833bec04f337fa122381e0a65a1acdd529368f6653dc6d03475381659e07e6e31dd2ec0530257606480f06d15faf3aaf  quiche-arena-size.patch
 | 
					128ec0fd14349e065c8bb0910d53cbea7423182a06e06f7b7765f3cba1e5ba5e7a8bccbcdab079335b5235abb7bf0d46dee21ecc8c221be7e1c5c6d9795f958e  roll-src-third_party-ffmpeg-102.patch
 | 
				
			||||||
b5ca72a12045a8f25bed548b35ea03097a7ecc4c738d619e1c3b975b7da71352db9bb87088ce1059284385edb2a190051d8e47b668c5bd1e81e75f2fda151b65  remove-no-opaque-pointers-flag.patch
 | 
					1063e68f477645914ddf5641eabdd3eaf744e569635d645ea860c3546f67a7ef91eded99331378ee75071b67ecfe9bd4be307bd3da7c7ad93509e2bd634d1ec3  roll-src-third_party-ffmpeg-106.patch
 | 
				
			||||||
128ec0fd14349e065c8bb0910d53cbea7423182a06e06f7b7765f3cba1e5ba5e7a8bccbcdab079335b5235abb7bf0d46dee21ecc8c221be7e1c5c6d9795f958e  roll-src-third_party-ffmpeg.patch
 | 
					3cf36b269e9fcfa74975d267bbf31bef68b533a51672e5ed81ae511a70f28a45206168af370961a3dab5695ddaff41cb8839c8c2fa53f22a9f3c88d207cb2996  scoped-file-no-close.patch
 | 
				
			||||||
9c44875bcc5dd5431226568ba52d225f086b321325371d9e9e01d1fd892049e5aff324a89ba8268f32c59ce1a47e0b0d5448c9162a45ee5a60a58eecb69ca788  scoped-file-no-close.patch
 | 
					f2f7673f9e793dfbf4456ff8c2be785ea551c36bd512572245d04bf44da08b0133e98d85a1ffd51158009754c83121cad48d755cbc153735df2d2e73233856c0  temp-failure-retry.patch
 | 
				
			||||||
ece751cd29d28772dd0955c84f5553a6858ac24d06ccb66ac75fcfc6b13460cf5c1f27392c094487e20e08e621d2099c3b5cc9a2a819a458e8c56c78fea11269  temp-failure-retry.patch
 | 
					 | 
				
			||||||
1d4e8c6e65205e6b72af47b9a2fa6f96aaada9b7d5a74f4e11a345a885df3078b523d02aaf8e9dac3aa30d72bbbd07cd6dc7edcf44fb9ae57a7f81251c398f65  wtf-stacksize.patch
 | 
					1d4e8c6e65205e6b72af47b9a2fa6f96aaada9b7d5a74f4e11a345a885df3078b523d02aaf8e9dac3aa30d72bbbd07cd6dc7edcf44fb9ae57a7f81251c398f65  wtf-stacksize.patch
 | 
				
			||||||
 | 
					905565c10f5e5600e7d4db965c892cc45009a258e9995da958974d838ace469e1db1019195307e8807860d5b55ba6bfeea478b1f39a9b99e82c619b2816a1a22  icon.patch
 | 
				
			||||||
e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3  python-jinja-3.10.patch
 | 
					e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3  python-jinja-3.10.patch
 | 
				
			||||||
26a8e4040e69f335a7104f42d012b9d933a40985b33a7be02add27a801c097c5a2be4c6e69faf9175ce8945210ae4c5592ecad2123ccff2beee5473194a765e3  system-node.patch
 | 
					26a8e4040e69f335a7104f42d012b9d933a40985b33a7be02add27a801c097c5a2be4c6e69faf9175ce8945210ae4c5592ecad2123ccff2beee5473194a765e3  system-node.patch
 | 
				
			||||||
71571b15cf8bd6259b7fd22bea0e46b64890f3db776365de33fe539f26ce9ef99459e05c3dde9434c3657225bc67160abc915acd93033cb487c770c6a2a5975f  vector-const.patch
 | 
					71571b15cf8bd6259b7fd22bea0e46b64890f3db776365de33fe539f26ce9ef99459e05c3dde9434c3657225bc67160abc915acd93033cb487c770c6a2a5975f  vector-const.patch
 | 
				
			||||||
2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30  webpack-hash.patch
 | 
					2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30  webpack-hash.patch
 | 
				
			||||||
08460b15037511a4e5469ceac6ae5dd4db4c8cb87c129aaaf40ba58b16c60b8a307ffdd85805efead235758abed09ec31db1ef4cf9159f7b9acdcee3031bc96c  default.conf
 | 
					08460b15037511a4e5469ceac6ae5dd4db4c8cb87c129aaaf40ba58b16c60b8a307ffdd85805efead235758abed09ec31db1ef4cf9159f7b9acdcee3031bc96c  default.conf
 | 
				
			||||||
 | 
					191559fc7aa1ea0353c6fb0cc321ee1d5803a0e44848c8be941cfab96277b0de6a59962d373e2a2a1686c8f9be2bcf2d2f33706759a339a959e297d3f7fda463  electron.desktop
 | 
				
			||||||
03750694e5e0b66f084c6e43135e60be15abb059e23486346ee4352dcc236984f2f35467b47f2b2ad46c98c22091cc2b978de8e73680febadba169d960f13f9f  electron-launcher.sh
 | 
					03750694e5e0b66f084c6e43135e60be15abb059e23486346ee4352dcc236984f2f35467b47f2b2ad46c98c22091cc2b978de8e73680febadba169d960f13f9f  electron-launcher.sh
 | 
				
			||||||
"
 | 
					"
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										39
									
								
								testing/electron/angle-wayland-include.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								testing/electron/angle-wayland-include.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,39 @@
 | 
				
			|||||||
 | 
					Patch-Source: https://github.com/archlinux/svntogit-packages/blob/a353833a5a731abfaa465b658f61894a516aa49b/trunk/angle-wayland-include-protocol.patch
 | 
				
			||||||
 | 
					diff -upr third_party/angle.orig/BUILD.gn third_party/angle/BUILD.gn
 | 
				
			||||||
 | 
					--- a/third_party/angle.orig/BUILD.gn	2022-08-17 19:38:11.000000000 +0000
 | 
				
			||||||
 | 
					+++ b/third_party/angle/BUILD.gn	2022-08-18 11:04:09.061751111 +0000
 | 
				
			||||||
 | 
					@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") {
 | 
				
			||||||
 | 
					   if (angle_enable_vulkan && angle_use_wayland &&
 | 
				
			||||||
 | 
					       defined(vulkan_wayland_include_dirs)) {
 | 
				
			||||||
 | 
					     include_dirs = vulkan_wayland_include_dirs
 | 
				
			||||||
 | 
					+  } else if (angle_enable_vulkan && angle_use_wayland) {
 | 
				
			||||||
 | 
					+    include_dirs = [
 | 
				
			||||||
 | 
					+      "$wayland_gn_dir/src/src",
 | 
				
			||||||
 | 
					+      "$wayland_gn_dir/include/src",
 | 
				
			||||||
 | 
					+      "$wayland_gn_dir/include/protocol",
 | 
				
			||||||
 | 
					+    ]
 | 
				
			||||||
 | 
					   }
 | 
				
			||||||
 | 
					 }
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					@@ -1073,6 +1079,7 @@ if (angle_use_wayland) {
 | 
				
			||||||
 | 
					     include_dirs = [
 | 
				
			||||||
 | 
					       "$wayland_dir/egl",
 | 
				
			||||||
 | 
					       "$wayland_dir/src",
 | 
				
			||||||
 | 
					+      "$wayland_gn_dir/include/protocol",
 | 
				
			||||||
 | 
					     ]
 | 
				
			||||||
 | 
					   }
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					diff -upr third_party/angle.orig/src/third_party/volk/BUILD.gn third_party/angle/src/third_party/volk/BUILD.gn
 | 
				
			||||||
 | 
					--- a/third_party/angle.orig/src/third_party/volk/BUILD.gn	2022-08-17 19:38:12.000000000 +0000
 | 
				
			||||||
 | 
					+++ b/third_party/angle/src/third_party/volk/BUILD.gn	2022-08-18 11:04:36.499828006 +0000
 | 
				
			||||||
 | 
					@@ -21,6 +21,9 @@ source_set("volk") {
 | 
				
			||||||
 | 
					   configs += [ "$angle_root:angle_no_cfi_icall" ]
 | 
				
			||||||
 | 
					   public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ]
 | 
				
			||||||
 | 
					   if (angle_use_wayland) {
 | 
				
			||||||
 | 
					-    include_dirs = [ "$wayland_dir/src" ]
 | 
				
			||||||
 | 
					+    include_dirs = [
 | 
				
			||||||
 | 
					+      "$wayland_dir/src",
 | 
				
			||||||
 | 
					+      "$wayland_gn_dir/include/protocol",
 | 
				
			||||||
 | 
					+    ]
 | 
				
			||||||
 | 
					   }
 | 
				
			||||||
 | 
					 }
 | 
				
			||||||
@ -1,26 +0,0 @@
 | 
				
			|||||||
Patch-Source: https://github.com/stha09/chromium-patches/blob/chromium-102-patchset-6/chromium-102-fenced_frame_utils-include.patch
 | 
					 | 
				
			||||||
From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Stephan Hartmann <stha09@googlemail.com>
 | 
					 | 
				
			||||||
Date: Wed, 27 Apr 2022 16:01:01 +0000
 | 
					 | 
				
			||||||
Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
 | 
					 | 
				
			||||||
 1 file changed, 2 insertions(+)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
 | 
					 | 
				
			||||||
index 9e2d3ad..68f4823 100644
 | 
					 | 
				
			||||||
--- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
 | 
					 | 
				
			||||||
+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
 | 
					 | 
				
			||||||
@@ -4,6 +4,8 @@
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 #include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+#include <cstring>
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
 #include "base/guid.h"
 | 
					 | 
				
			||||||
 #include "base/strings/string_util.h"
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-- 
 | 
					 | 
				
			||||||
2.35.1
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@ -1,15 +0,0 @@
 | 
				
			|||||||
Patch-Source: https://github.com/stha09/chromium-patches/blob/chromium-102-patchset-6/chromium-102-regex_pattern-array.patch
 | 
					 | 
				
			||||||
--- a/components/autofill/core/browser/BUILD.gn
 | 
					 | 
				
			||||||
+++ b/components/autofill/core/browser/BUILD.gn
 | 
					 | 
				
			||||||
@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
 | 
					 | 
				
			||||||
 }
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 static_library("browser") {
 | 
					 | 
				
			||||||
+  if (is_clang) {
 | 
					 | 
				
			||||||
+    cflags = [
 | 
					 | 
				
			||||||
+      "-fbracket-depth=1000",
 | 
					 | 
				
			||||||
+    ]
 | 
					 | 
				
			||||||
+  }
 | 
					 | 
				
			||||||
   sources = [
 | 
					 | 
				
			||||||
     "address_normalization_manager.cc",
 | 
					 | 
				
			||||||
     "address_normalization_manager.h",
 | 
					 | 
				
			||||||
@ -1,13 +1,13 @@
 | 
				
			|||||||
--- ./build/config/compiler/BUILD.gn
 | 
					--- a/build/config/compiler/BUILD.gn
 | 
				
			||||||
+++ ./build/config/compiler/BUILD.gn
 | 
					+++ b/build/config/compiler/BUILD.gn
 | 
				
			||||||
@@ -766,8 +766,8 @@
 | 
					@@ -917,8 +917,8 @@
 | 
				
			||||||
       }
 | 
					 | 
				
			||||||
     } else if (current_cpu == "arm64") {
 | 
					     } else if (current_cpu == "arm64") {
 | 
				
			||||||
       if (is_clang && !is_android && !is_nacl && !is_fuchsia) {
 | 
					       if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
 | 
				
			||||||
 | 
					           !(is_chromeos_lacros && is_chromeos_device)) {
 | 
				
			||||||
-        cflags += [ "--target=aarch64-linux-gnu" ]
 | 
					-        cflags += [ "--target=aarch64-linux-gnu" ]
 | 
				
			||||||
-        ldflags += [ "--target=aarch64-linux-gnu" ]
 | 
					-        ldflags += [ "--target=aarch64-linux-gnu" ]
 | 
				
			||||||
+        cflags += [ "--target=aarch64-alpine-linux-musl" ]
 | 
					+        cflags += [ "--target=aarch64-alpine-linux-musl" ]
 | 
				
			||||||
+        ldflags += [ "--target=aarch64-alpine-linux-musl" ]
 | 
					+        ldflags += [ "--target=aarch64-alpine-linux-musl" ]
 | 
				
			||||||
       }
 | 
					       }
 | 
				
			||||||
     } else if (current_cpu == "mipsel" && !is_nacl) {
 | 
					       if (is_android) {
 | 
				
			||||||
       ldflags += [ "-Wl,--hash-style=sysv" ]
 | 
					         # Outline atomics crash on Exynos 9810. http://crbug.com/1272795
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
--- ./sandbox/linux/services/credentials.h.orig
 | 
					--- a/sandbox/linux/services/credentials.h
 | 
				
			||||||
+++ ./sandbox/linux/services/credentials.h
 | 
					+++ b/sandbox/linux/services/credentials.h
 | 
				
			||||||
@@ -14,6 +14,8 @@
 | 
					@@ -14,6 +14,8 @@
 | 
				
			||||||
 #include <string>
 | 
					 #include <string>
 | 
				
			||||||
 #include <vector>
 | 
					 #include <vector>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
--- ./base/threading/platform_thread_linux.cc
 | 
					--- a/base/threading/platform_thread_linux.cc
 | 
				
			||||||
+++ ./base/threading/platform_thread_linux.cc
 | 
					+++ b/base/threading/platform_thread_linux.cc
 | 
				
			||||||
@@ -186,7 +186,8 @@
 | 
					@@ -186,7 +186,8 @@
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
 | 
					 size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
 | 
				
			||||||
@ -10,8 +10,8 @@
 | 
				
			|||||||
 #else
 | 
					 #else
 | 
				
			||||||
   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
 | 
					   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
 | 
				
			||||||
   // default stack size isn't enough for some browser tests.
 | 
					   // default stack size isn't enough for some browser tests.
 | 
				
			||||||
--- ./base/threading/platform_thread_unittest.cc.orig
 | 
					--- a/base/threading/platform_thread_unittest.cc
 | 
				
			||||||
+++ ./base/threading/platform_thread_unittest.cc
 | 
					+++ b/base/threading/platform_thread_unittest.cc
 | 
				
			||||||
@@ -420,7 +420,7 @@
 | 
					@@ -420,7 +420,7 @@
 | 
				
			||||||
     ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&                \
 | 
					     ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&                \
 | 
				
			||||||
      !defined(THREAD_SANITIZER)) ||                                    \
 | 
					      !defined(THREAD_SANITIZER)) ||                                    \
 | 
				
			||||||
@ -21,8 +21,8 @@
 | 
				
			|||||||
 #else
 | 
					 #else
 | 
				
			||||||
   EXPECT_GT(stack_size, 0u);
 | 
					   EXPECT_GT(stack_size, 0u);
 | 
				
			||||||
   EXPECT_LT(stack_size, 20u * (1 << 20));
 | 
					   EXPECT_LT(stack_size, 20u * (1 << 20));
 | 
				
			||||||
--- ./chrome/browser/shutdown_signal_handlers_posix.cc
 | 
					--- a/chrome/browser/shutdown_signal_handlers_posix.cc
 | 
				
			||||||
+++ ./chrome/browser/shutdown_signal_handlers_posix.cc
 | 
					+++ b/chrome/browser/shutdown_signal_handlers_posix.cc
 | 
				
			||||||
@@ -187,11 +187,19 @@
 | 
					@@ -187,11 +187,19 @@
 | 
				
			||||||
   g_shutdown_pipe_read_fd = pipefd[0];
 | 
					   g_shutdown_pipe_read_fd = pipefd[0];
 | 
				
			||||||
   g_shutdown_pipe_write_fd = pipefd[1];
 | 
					   g_shutdown_pipe_write_fd = pipefd[1];
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
--- ./net/dns/host_resolver_manager.cc.orig
 | 
					--- a/net/dns/host_resolver_manager.cc
 | 
				
			||||||
+++ ./net/dns/host_resolver_manager.cc
 | 
					+++ b/net/dns/host_resolver_manager.cc
 | 
				
			||||||
@@ -3014,8 +3014,7 @@
 | 
					@@ -3014,8 +3014,7 @@
 | 
				
			||||||
   NetworkChangeNotifier::AddConnectionTypeObserver(this);
 | 
					   NetworkChangeNotifier::AddConnectionTypeObserver(this);
 | 
				
			||||||
   if (system_dns_config_notifier_)
 | 
					   if (system_dns_config_notifier_)
 | 
				
			||||||
@ -10,8 +10,8 @@
 | 
				
			|||||||
   EnsureDnsReloaderInit();
 | 
					   EnsureDnsReloaderInit();
 | 
				
			||||||
 #endif
 | 
					 #endif
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
--- ./net/dns/dns_reloader.cc.orig
 | 
					--- a/net/dns/dns_reloader.cc
 | 
				
			||||||
+++ ./net/dns/dns_reloader.cc
 | 
					+++ b/net/dns/dns_reloader.cc
 | 
				
			||||||
@@ -6,8 +6,7 @@
 | 
					@@ -6,8 +6,7 @@
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 #include "build/build_config.h"
 | 
					 #include "build/build_config.h"
 | 
				
			||||||
@ -22,8 +22,8 @@
 | 
				
			|||||||
 
 | 
					 
 | 
				
			||||||
 #include <resolv.h>
 | 
					 #include <resolv.h>
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
--- ./net/dns/host_resolver_proc.cc.orig
 | 
					--- a/net/dns/host_resolver_proc.cc
 | 
				
			||||||
+++ ./net/dns/host_resolver_proc.cc
 | 
					+++ b/net/dns/host_resolver_proc.cc
 | 
				
			||||||
@@ -176,8 +176,7 @@
 | 
					@@ -176,8 +176,7 @@
 | 
				
			||||||
   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
 | 
					   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
 | 
				
			||||||
                                                 base::BlockingType::WILL_BLOCK);
 | 
					                                                 base::BlockingType::WILL_BLOCK);
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										8
									
								
								testing/electron/electron.desktop
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										8
									
								
								testing/electron/electron.desktop
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,8 @@
 | 
				
			|||||||
 | 
					[Desktop Entry]
 | 
				
			||||||
 | 
					Type=Application
 | 
				
			||||||
 | 
					Name=electron21
 | 
				
			||||||
 | 
					Icon=electron
 | 
				
			||||||
 | 
					Exec=electron %u
 | 
				
			||||||
 | 
					Categories=Development;GTK;
 | 
				
			||||||
 | 
					StartupNotify=true
 | 
				
			||||||
 | 
					StartupWMClass=electron
 | 
				
			||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
--- ./tools/gdb/gdbinit.orig
 | 
					--- a/tools/gdb/gdbinit
 | 
				
			||||||
+++ ./tools/gdb/gdbinit
 | 
					+++ b/tools/gdb/gdbinit
 | 
				
			||||||
@@ -50,17 +50,7 @@
 | 
					@@ -50,17 +50,7 @@
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 def set_src_dir(compile_dir):
 | 
					 def set_src_dir(compile_dir):
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										21
									
								
								testing/electron/icon.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								testing/electron/icon.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,21 @@
 | 
				
			|||||||
 | 
					--- a/electron/default_app/default_app.ts
 | 
				
			||||||
 | 
					+++ b/electron/default_app/default_app.ts
 | 
				
			||||||
 | 
					@@ -60,7 +60,7 @@
 | 
				
			||||||
 | 
					   };
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					   if (process.platform === 'linux') {
 | 
				
			||||||
 | 
					-    options.icon = path.join(__dirname, 'icon.png');
 | 
				
			||||||
 | 
					+    options.icon = '/usr/share/icons/hicolor/1024x1024/apps/electron.png';
 | 
				
			||||||
 | 
					   }
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					   mainWindow = new BrowserWindow(options);
 | 
				
			||||||
 | 
					--- a/electron/filenames.gni
 | 
				
			||||||
 | 
					+++ b/electron/filenames.gni
 | 
				
			||||||
 | 
					@@ -6,7 +6,6 @@
 | 
				
			||||||
 | 
					   ]
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					   default_app_static_sources = [
 | 
				
			||||||
 | 
					-    "default_app/icon.png",
 | 
				
			||||||
 | 
					     "default_app/index.html",
 | 
				
			||||||
 | 
					     "default_app/package.json",
 | 
				
			||||||
 | 
					     "default_app/styles.css",
 | 
				
			||||||
@ -1,28 +0,0 @@
 | 
				
			|||||||
Patch-Source: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
 | 
					 | 
				
			||||||
From 9dd0503835dc875807ab63efb1f477bffed2a852 Mon Sep 17 00:00:00 2001
 | 
					 | 
				
			||||||
From: Stephan Hartmann <stha09@googlemail.com>
 | 
					 | 
				
			||||||
Date: Mon, 25 Apr 2022 23:18:30 +0000
 | 
					 | 
				
			||||||
Subject: [PATCH] IWYU: add utility for std::exchange
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
Bug: 957519
 | 
					 | 
				
			||||||
Change-Id: I307d520fdc34d2452018ed32a505e7e519739410
 | 
					 | 
				
			||||||
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3604643
 | 
					 | 
				
			||||||
Reviewed-by: Wez <wez@chromium.org>
 | 
					 | 
				
			||||||
Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
 | 
					 | 
				
			||||||
Cr-Commit-Position: refs/heads/main@{#995855}
 | 
					 | 
				
			||||||
---
 | 
					 | 
				
			||||||
 base/third_party/symbolize/symbolize.h | 1 +
 | 
					 | 
				
			||||||
 1 file changed, 1 insertion(+)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
diff --git a/base/third_party/symbolize/symbolize.h b/base/third_party/symbolize/symbolize.h
 | 
					 | 
				
			||||||
index 99029a968d5..278078f6071 100644
 | 
					 | 
				
			||||||
--- a/base/third_party/symbolize/symbolize.h
 | 
					 | 
				
			||||||
+++ b/base/third_party/symbolize/symbolize.h
 | 
					 | 
				
			||||||
@@ -61,6 +61,7 @@
 | 
					 | 
				
			||||||
 #ifdef HAVE_SYMBOLIZE
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 #include <algorithm>
 | 
					 | 
				
			||||||
+#include <utility>
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
 #if defined(__ELF__)  // defined by gcc
 | 
					 | 
				
			||||||
 #if defined(__OpenBSD__)
 | 
					 | 
				
			||||||
							
								
								
									
										39
									
								
								testing/electron/jsoncpp.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										39
									
								
								testing/electron/jsoncpp.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,39 @@
 | 
				
			|||||||
 | 
					Patch-Source: https://github.com/archlinux/svntogit-packages/blob/bf2401407df5bcc938382eb03748fbef41e41c89/trunk/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
 | 
				
			||||||
 | 
					From ed8d931e35f81d8566835a579caf7d61368f85b7 Mon Sep 17 00:00:00 2001
 | 
				
			||||||
 | 
					From: Evangelos Foutras <evangelos@foutrelis.com>
 | 
				
			||||||
 | 
					Date: Tue, 27 Sep 2022 22:20:41 +0000
 | 
				
			||||||
 | 
					Subject: [PATCH] unbundle/jsoncpp: avoid CFI faults with is_cfi=true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Ensure jsoncpp symbols have public visibility and are thus excluded from
 | 
				
			||||||
 | 
					CFI checks and whole-program optimization. This is achieved by defining
 | 
				
			||||||
 | 
					JSON_DLL_BUILD which in turn causes json/config.h to define JSON_API as
 | 
				
			||||||
 | 
					__attribute__((visibility("default"))). The latter macro is used to tag
 | 
				
			||||||
 | 
					jsoncpp classes and namespace functions throughout jsoncpp's headers.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					BUG=1365218
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Change-Id: I56277737b7d9ecaeb5e17c8d21a2e55f3d5d5bc9
 | 
				
			||||||
 | 
					Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3919652
 | 
				
			||||||
 | 
					Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
 | 
				
			||||||
 | 
					Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
 | 
				
			||||||
 | 
					Cr-Commit-Position: refs/heads/main@{#1052077}
 | 
				
			||||||
 | 
					---
 | 
				
			||||||
 | 
					 build/linux/unbundle/jsoncpp.gn | 5 +++++
 | 
				
			||||||
 | 
					 1 file changed, 5 insertions(+)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					diff --git a/build/linux/unbundle/jsoncpp.gn b/build/linux/unbundle/jsoncpp.gn
 | 
				
			||||||
 | 
					index 544f9d13c9..e84a0ef27a 100644
 | 
				
			||||||
 | 
					--- a/build/linux/unbundle/jsoncpp.gn
 | 
				
			||||||
 | 
					+++ b/build/linux/unbundle/jsoncpp.gn
 | 
				
			||||||
 | 
					@@ -3,6 +3,11 @@ import("//build/shim_headers.gni")
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 pkg_config("jsoncpp_config") {
 | 
				
			||||||
 | 
					   packages = [ "jsoncpp" ]
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+  # Defining JSON_DLL_BUILD applies public visibility to jsoncpp classes
 | 
				
			||||||
 | 
					+  # thus deactivating CFI checks for them. This avoids CFI violations in
 | 
				
			||||||
 | 
					+  # virtual calls to system jsoncpp library (https://crbug.com/1365218).
 | 
				
			||||||
 | 
					+  defines = [ "JSON_DLL_BUILD" ]
 | 
				
			||||||
 | 
					 }
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 shim_headers("jsoncpp_shim") {
 | 
				
			||||||
@ -1,11 +0,0 @@
 | 
				
			|||||||
Patch-Source: https://chromium-review.googlesource.com/c/chromium/src/+/3488058
 | 
					 | 
				
			||||||
--- a/build/linux/unbundle/libxml.gn
 | 
					 | 
				
			||||||
+++ b/build/linux/unbundle/libxml.gn
 | 
					 | 
				
			||||||
@@ -19,6 +19,7 @@ static_library("libxml_utils") {
 | 
					 | 
				
			||||||
     ":xml_reader",
 | 
					 | 
				
			||||||
     ":xml_writer",
 | 
					 | 
				
			||||||
     "//base/test:test_support",
 | 
					 | 
				
			||||||
+    "//services/data_decoder:lib",
 | 
					 | 
				
			||||||
     "//services/data_decoder:xml_parser_fuzzer_deps",
 | 
					 | 
				
			||||||
   ]
 | 
					 | 
				
			||||||
   sources = [
 | 
					 | 
				
			||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
--- ./base/allocator/partition_allocator/tagging.cc.orig
 | 
					--- a/base/allocator/partition_allocator/tagging.cc
 | 
				
			||||||
+++ ./base/allocator/partition_allocator/tagging.cc
 | 
					+++ b/base/allocator/partition_allocator/tagging.cc
 | 
				
			||||||
@@ -19,15 +19,6 @@
 | 
					@@ -19,15 +19,6 @@
 | 
				
			||||||
 #define PR_GET_TAGGED_ADDR_CTRL 56
 | 
					 #define PR_GET_TAGGED_ADDR_CTRL 56
 | 
				
			||||||
 #define PR_TAGGED_ADDR_ENABLE (1UL << 0)
 | 
					 #define PR_TAGGED_ADDR_ENABLE (1UL << 0)
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 | 
					diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 | 
				
			||||||
index ff5a1c0..da56b9b 100644
 | 
					index ff5a1c0..da56b9b 100644
 | 
				
			||||||
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 | 
					--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 | 
				
			||||||
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 | 
					+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 | 
				
			||||||
@@ -139,21 +139,11 @@ namespace sandbox {
 | 
					@@ -139,21 +139,11 @@ namespace sandbox {
 | 
				
			||||||
 // present (as in newer versions of posix_spawn).
 | 
					 // present (as in newer versions of posix_spawn).
 | 
				
			||||||
 ResultExpr RestrictCloneToThreadsAndEPERMFork() {
 | 
					 ResultExpr RestrictCloneToThreadsAndEPERMFork() {
 | 
				
			||||||
@ -41,7 +41,7 @@ index ff5a1c0..da56b9b 100644
 | 
				
			|||||||
diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 | 
					diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 | 
				
			||||||
index d9d1882..0567557 100644
 | 
					index d9d1882..0567557 100644
 | 
				
			||||||
--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 | 
					--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 | 
				
			||||||
+++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 | 
					+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 | 
				
			||||||
@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
 | 
					@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
 | 
				
			||||||
 #if defined(__i386__)
 | 
					 #if defined(__i386__)
 | 
				
			||||||
     case __NR_waitpid:
 | 
					     case __NR_waitpid:
 | 
				
			||||||
@ -78,7 +78,7 @@ index d9d1882..0567557 100644
 | 
				
			|||||||
diff --git a/sandbox/linux/system_headers/linux_syscalls.h ./sandbox/linux/system_headers/linux_syscalls.h
 | 
					diff --git a/sandbox/linux/system_headers/linux_syscalls.h ./sandbox/linux/system_headers/linux_syscalls.h
 | 
				
			||||||
index 2b78a0c..b6fedb5 100644
 | 
					index 2b78a0c..b6fedb5 100644
 | 
				
			||||||
--- a/sandbox/linux/system_headers/linux_syscalls.h
 | 
					--- a/sandbox/linux/system_headers/linux_syscalls.h
 | 
				
			||||||
+++ ./sandbox/linux/system_headers/linux_syscalls.h
 | 
					+++ b/sandbox/linux/system_headers/linux_syscalls.h
 | 
				
			||||||
@@ -10,6 +10,7 @@
 | 
					@@ -10,6 +10,7 @@
 | 
				
			||||||
 #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
 | 
					 #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@ -90,11 +90,11 @@ index 2b78a0c..b6fedb5 100644
 | 
				
			|||||||
diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
 | 
					diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
 | 
				
			||||||
index a85c0ea..715aa1e 100644
 | 
					index a85c0ea..715aa1e 100644
 | 
				
			||||||
--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
 | 
					--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
 | 
				
			||||||
+++ ./sandbox/policy/linux/bpf_renderer_policy_linux.cc
 | 
					+++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc
 | 
				
			||||||
@@ -93,11 +93,11 @@
 | 
					@@ -102,11 +102,11 @@
 | 
				
			||||||
     case __NR_sysinfo:
 | 
					 #if defined(__arm__) || defined(__aarch64__)
 | 
				
			||||||
     case __NR_times:
 | 
					     case __NR_getcpu:
 | 
				
			||||||
     case __NR_uname:
 | 
					 #endif
 | 
				
			||||||
-      return Allow();
 | 
					-      return Allow();
 | 
				
			||||||
-    case __NR_sched_getaffinity:
 | 
					-    case __NR_sched_getaffinity:
 | 
				
			||||||
     case __NR_sched_getparam:
 | 
					     case __NR_sched_getparam:
 | 
				
			||||||
@ -105,4 +105,3 @@ index a85c0ea..715aa1e 100644
 | 
				
			|||||||
       return RestrictSchedTarget(GetPolicyPid(), sysno);
 | 
					       return RestrictSchedTarget(GetPolicyPid(), sysno);
 | 
				
			||||||
     case __NR_prlimit64:
 | 
					     case __NR_prlimit64:
 | 
				
			||||||
       // See crbug.com/662450 and setrlimit comment above.
 | 
					       // See crbug.com/662450 and setrlimit comment above.
 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
--- ./sandbox/linux/services/namespace_sandbox.cc.orig
 | 
					--- a/sandbox/linux/services/namespace_sandbox.cc
 | 
				
			||||||
+++ ./sandbox/linux/services/namespace_sandbox.cc
 | 
					+++ b/sandbox/linux/services/namespace_sandbox.cc
 | 
				
			||||||
@@ -209,6 +209,70 @@
 | 
					@@ -209,6 +209,70 @@
 | 
				
			||||||
   return base::LaunchProcess(argv, launch_options_copy);
 | 
					   return base::LaunchProcess(argv, launch_options_copy);
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
Use monotonic clock for pthread_cond_timedwait with musl too.
 | 
					Use monotonic clock for pthread_cond_timedwait with musl too.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
--- ./v8/src/base/platform/condition-variable.cc
 | 
					--- a/v8/src/base/platform/condition-variable.cc
 | 
				
			||||||
+++ ./v8/src/base/platform/condition-variable.cc
 | 
					+++ b/v8/src/base/platform/condition-variable.cc
 | 
				
			||||||
@@ -16,7 +16,7 @@
 | 
					@@ -16,7 +16,7 @@
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 ConditionVariable::ConditionVariable() {
 | 
					 ConditionVariable::ConditionVariable() {
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,5 @@
 | 
				
			|||||||
this can be linked to, but is entirely useless
 | 
					--- a/base/debug/stack_trace_posix.cc
 | 
				
			||||||
--- ./base/debug/stack_trace_posix.cc
 | 
					+++ b/base/debug/stack_trace_posix.cc
 | 
				
			||||||
+++ ./base/debug/stack_trace_posix.cc
 | 
					 | 
				
			||||||
@@ -27,7 +27,7 @@
 | 
					@@ -27,7 +27,7 @@
 | 
				
			||||||
 #if !defined(USE_SYMBOLIZE)
 | 
					 #if !defined(USE_SYMBOLIZE)
 | 
				
			||||||
 #include <cxxabi.h>
 | 
					 #include <cxxabi.h>
 | 
				
			||||||
@ -53,8 +52,8 @@ this can be linked to, but is entirely useless
 | 
				
			|||||||
 void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
 | 
					 void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
 | 
				
			||||||
                                           const char* prefix_string) const {
 | 
					                                           const char* prefix_string) const {
 | 
				
			||||||
   StreamBacktraceOutputHandler handler(os);
 | 
					   StreamBacktraceOutputHandler handler(os);
 | 
				
			||||||
--- ./v8/src/codegen/external-reference-table.cc.orig
 | 
					--- a/v8/src/codegen/external-reference-table.cc
 | 
				
			||||||
+++ ./v8/src/codegen/external-reference-table.cc
 | 
					+++ b/v8/src/codegen/external-reference-table.cc
 | 
				
			||||||
@@ -11,7 +11,9 @@
 | 
					@@ -11,7 +11,9 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
 | 
					 #if defined(DEBUG) && defined(V8_OS_LINUX) && !defined(V8_OS_ANDROID)
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,3 @@
 | 
				
			|||||||
did you know linux is glibc?
 | 
					 | 
				
			||||||
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 | 
					--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 | 
				
			||||||
+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 | 
					+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
 | 
				
			||||||
@@ -61,7 +61,6 @@
 | 
					@@ -61,7 +61,6 @@
 | 
				
			||||||
 | 
				
			|||||||
@ -25,8 +25,8 @@
 | 
				
			|||||||
   ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
 | 
					   ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size,
 | 
				
			||||||
                       &allocated_objects_size, &allocated_objects_count);
 | 
					                       &allocated_objects_size, &allocated_objects_count);
 | 
				
			||||||
 #endif
 | 
					 #endif
 | 
				
			||||||
--- ./base/process/process_metrics_posix.cc.orig
 | 
					--- a/base/process/process_metrics_posix.cc
 | 
				
			||||||
+++ ./base/process/process_metrics_posix.cc
 | 
					+++ b/base/process/process_metrics_posix.cc
 | 
				
			||||||
@@ -105,7 +105,7 @@
 | 
					@@ -105,7 +105,7 @@
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 #endif  // !BUILDFLAG(IS_FUCHSIA)
 | 
					 #endif  // !BUILDFLAG(IS_FUCHSIA)
 | 
				
			||||||
@ -57,8 +57,8 @@
 | 
				
			|||||||
   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
 | 
					   // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
 | 
				
			||||||
   return 0;
 | 
					   return 0;
 | 
				
			||||||
 #endif
 | 
					 #endif
 | 
				
			||||||
--- ./third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc.orig
 | 
					--- a/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
 | 
				
			||||||
+++ ./third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
 | 
					+++ b/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
 | 
				
			||||||
@@ -35,7 +35,7 @@
 | 
					@@ -35,7 +35,7 @@
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 MemoryUsage GetMemoryUsage() {
 | 
					 MemoryUsage GetMemoryUsage() {
 | 
				
			||||||
@ -68,8 +68,8 @@
 | 
				
			|||||||
   rusage res;
 | 
					   rusage res;
 | 
				
			||||||
   if (getrusage(RUSAGE_SELF, &res) == 0) {
 | 
					   if (getrusage(RUSAGE_SELF, &res) == 0) {
 | 
				
			||||||
     result.max_rss_kb = res.ru_maxrss;
 | 
					     result.max_rss_kb = res.ru_maxrss;
 | 
				
			||||||
--- ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
 | 
					--- a/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
 | 
				
			||||||
+++ ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
 | 
					+++ b/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
 | 
				
			||||||
@@ -86,11 +86,11 @@
 | 
					@@ -86,11 +86,11 @@
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -85,8 +85,8 @@
 | 
				
			|||||||
   mi = ::mallinfo();
 | 
					   mi = ::mallinfo();
 | 
				
			||||||
   return mi.uordblks;
 | 
					   return mi.uordblks;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
--- ./third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2019-09-30 13:03:42.556880537 -0400
 | 
					--- a/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
 | 
				
			||||||
+++ ./third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h	2019-09-30 13:07:27.989821227 -0400
 | 
					+++ b/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
 | 
				
			||||||
@@ -122,7 +122,9 @@
 | 
					@@ -122,7 +122,9 @@
 | 
				
			||||||
 /* #undef HAVE_MALLCTL */
 | 
					 /* #undef HAVE_MALLCTL */
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
--- ./net/dns/public/scoped_res_state.cc.orig
 | 
					--- a/net/dns/public/scoped_res_state.cc
 | 
				
			||||||
+++ ./net/dns/public/scoped_res_state.cc
 | 
					+++ b/net/dns/public/scoped_res_state.cc
 | 
				
			||||||
@@ -13,7 +13,7 @@
 | 
					@@ -13,7 +13,7 @@
 | 
				
			||||||
 namespace net {
 | 
					 namespace net {
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,4 @@
 | 
				
			|||||||
--- a/base/files/file.h.orig
 | 
					--- a/base/files/file.h
 | 
				
			||||||
+++ b/base/files/file.h
 | 
					+++ b/base/files/file.h
 | 
				
			||||||
@@ -19,7 +19,8 @@
 | 
					@@ -19,7 +19,8 @@
 | 
				
			||||||
 #include "build/build_config.h"
 | 
					 #include "build/build_config.h"
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										11
									
								
								testing/electron/nullptr-t.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								testing/electron/nullptr-t.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,11 @@
 | 
				
			|||||||
 | 
					--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
 | 
				
			||||||
 | 
					+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
 | 
				
			||||||
 | 
					@@ -178,7 +178,7 @@
 | 
				
			||||||
 | 
					   class AutofillPopupViewPtr {
 | 
				
			||||||
 | 
					    public:
 | 
				
			||||||
 | 
					     AutofillPopupViewPtr() = default;
 | 
				
			||||||
 | 
					-    AutofillPopupViewPtr(nullptr_t) : ptr_(nullptr) {}
 | 
				
			||||||
 | 
					+    AutofillPopupViewPtr(std::nullptr_t) : ptr_(nullptr) {}
 | 
				
			||||||
 | 
					     AutofillPopupViewPtr(AutofillPopupView* ptr) : ptr_(ptr) {}
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					     explicit operator bool() const { return ptr_; }
 | 
				
			||||||
@ -1,11 +0,0 @@
 | 
				
			|||||||
--- ./net/socket/udp_socket_posix.cc
 | 
					 | 
				
			||||||
+++ ./net/socket/udp_socket_posix.cc
 | 
					 | 
				
			||||||
@@ -1191,7 +1191,7 @@
 | 
					 | 
				
			||||||
     msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()});
 | 
					 | 
				
			||||||
   msgvec->reserve(buffers.size());
 | 
					 | 
				
			||||||
   for (size_t j = 0; j < buffers.size(); j++)
 | 
					 | 
				
			||||||
-    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0});
 | 
					 | 
				
			||||||
+    msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0});
 | 
					 | 
				
			||||||
   int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0));
 | 
					 | 
				
			||||||
   SendResult send_result(0, 0, std::move(buffers));
 | 
					 | 
				
			||||||
   if (result < 0) {
 | 
					 | 
				
			||||||
@ -1,10 +1,10 @@
 | 
				
			|||||||
--- ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
 | 
					--- a/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
 | 
				
			||||||
+++ ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
 | 
					+++ b/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
 | 
				
			||||||
@@ -69,7 +69,7 @@
 | 
					@@ -69,7 +69,7 @@
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 // QuicConnections currently use around 1KB of polymorphic types which would
 | 
					 // QuicConnections currently use around 1KB of polymorphic types which would
 | 
				
			||||||
 // ordinarily be on the heap. Instead, store them inline in an arena.
 | 
					 // ordinarily be on the heap. Instead, store them inline in an arena.
 | 
				
			||||||
-using QuicConnectionArena = QuicOneBlockArena<1152>;
 | 
					-using QuicConnectionArena = QuicOneBlockArena<1280>;
 | 
				
			||||||
+using QuicConnectionArena = QuicOneBlockArena<1504>;
 | 
					+using QuicConnectionArena = QuicOneBlockArena<1504>;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 }  // namespace quic
 | 
					 }  // namespace quic
 | 
				
			||||||
 | 
				
			|||||||
@ -1,20 +0,0 @@
 | 
				
			|||||||
Patch-Source: https://github.com/archlinux/svntogit-packages/blob/f3225f99b900e11ac900725992ea883142d7309c/trunk/remove-no-opaque-pointers-flag.patch
 | 
					 | 
				
			||||||
not needed with clang 15
 | 
					 | 
				
			||||||
--- chromium-102.0.5005.61/build/config/compiler/BUILD.gn.orig	2022-05-19 10:35:52.991415777 +0000
 | 
					 | 
				
			||||||
+++ chromium-102.0.5005.61/build/config/compiler/BUILD.gn	2022-05-19 10:36:11.102017131 +0000
 | 
					 | 
				
			||||||
@@ -1538,15 +1538,6 @@ config("default_warnings") {
 | 
					 | 
				
			||||||
         cflags += [ "-Wno-deprecated-non-prototype" ]
 | 
					 | 
				
			||||||
       }
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
-      if (!is_nacl && !(is_chromeos ||
 | 
					 | 
				
			||||||
-                        default_toolchain == "//build/toolchain/cros:target")) {
 | 
					 | 
				
			||||||
-        # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out
 | 
					 | 
				
			||||||
-        cflags += [
 | 
					 | 
				
			||||||
-          "-Xclang",
 | 
					 | 
				
			||||||
-          "-no-opaque-pointers",
 | 
					 | 
				
			||||||
-        ]
 | 
					 | 
				
			||||||
-      }
 | 
					 | 
				
			||||||
-
 | 
					 | 
				
			||||||
       if (is_fuchsia) {
 | 
					 | 
				
			||||||
         # TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383)
 | 
					 | 
				
			||||||
         cflags += [ "-Wno-deprecated-copy" ]
 | 
					 | 
				
			||||||
							
								
								
									
										15
									
								
								testing/electron/roll-src-third_party-ffmpeg-106.patch
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								testing/electron/roll-src-third_party-ffmpeg-106.patch
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,15 @@
 | 
				
			|||||||
 | 
					--- a/media/filters/audio_file_reader.cc
 | 
				
			||||||
 | 
					+++ b/media/filters/audio_file_reader.cc
 | 
				
			||||||
 | 
					@@ -243,10 +243,10 @@
 | 
				
			||||||
 | 
					   // silence from being output. In the case where we are also discarding some
 | 
				
			||||||
 | 
					   // portion of the packet (as indicated by a negative pts), we further want to
 | 
				
			||||||
 | 
					   // adjust the duration downward by however much exists before zero.
 | 
				
			||||||
 | 
					-  if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
 | 
				
			||||||
 | 
					+  if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
 | 
				
			||||||
 | 
					     const base::TimeDelta pkt_duration = ConvertFromTimeBase(
 | 
				
			||||||
 | 
					         glue_->format_context()->streams[stream_index_]->time_base,
 | 
				
			||||||
 | 
					-        frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
 | 
				
			||||||
 | 
					+        frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
 | 
				
			||||||
 | 
					     const base::TimeDelta frame_duration =
 | 
				
			||||||
 | 
					         base::Seconds(frames_read / static_cast<double>(sample_rate_));
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
@ -2,8 +2,8 @@ for some reason this breaks and the fd returned after close() after a few
 | 
				
			|||||||
cycles is still in the lock array
 | 
					cycles is still in the lock array
 | 
				
			||||||
 | 
					
 | 
				
			||||||
so, just don't enforce or wrap anything.
 | 
					so, just don't enforce or wrap anything.
 | 
				
			||||||
--- ./base/files/scoped_file_linux.cc.orig
 | 
					--- a/base/files/scoped_file_linux.cc
 | 
				
			||||||
+++ ./base/files/scoped_file_linux.cc
 | 
					+++ b/base/files/scoped_file_linux.cc
 | 
				
			||||||
@@ -77,15 +77,3 @@
 | 
					@@ -77,15 +77,3 @@
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 | 
				
			|||||||
@ -1,6 +1,6 @@
 | 
				
			|||||||
random glibc macro
 | 
					random glibc macro
 | 
				
			||||||
--- ./sandbox/linux/suid/process_util.h
 | 
					--- a/sandbox/linux/suid/process_util.h
 | 
				
			||||||
+++ ./sandbox/linux/suid/process_util.h
 | 
					+++ b/sandbox/linux/suid/process_util.h
 | 
				
			||||||
@@ -11,6 +11,14 @@
 | 
					@@ -11,6 +11,14 @@
 | 
				
			||||||
 #include <stdbool.h>
 | 
					 #include <stdbool.h>
 | 
				
			||||||
 #include <sys/types.h>
 | 
					 #include <sys/types.h>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user