Skip to content

Commit

Permalink
cachy-browser: Add fixes for explicit-sync crash with new egl-wayland
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Jung <[email protected]>
  • Loading branch information
ptr1337 committed Jul 19, 2024
1 parent 47dc5c4 commit 5115b26
Show file tree
Hide file tree
Showing 3 changed files with 421 additions and 24 deletions.
32 changes: 12 additions & 20 deletions cachy-browser/.SRCINFO
Original file line number Diff line number Diff line change
@@ -1,32 +1,24 @@
pkgbase = cachy-browser
pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom.
pkgver = 127.0.2
pkgrel = 1
pkgver = 128.0
pkgrel = 3
install = cachy-browser.install
arch = x86_64
arch = x86_64_v3
groups = cachyos
license = GPL
license = LGPL
license = MPL
makedepends = cbindgen
makedepends = clang
makedepends = diffutils
makedepends = imake
makedepends = inetutils
makedepends = jack
makedepends = lld
makedepends = llvm
makedepends = mesa
makedepends = nasm
makedepends = nodejs
makedepends = python
makedepends = rust
makedepends = rustup
makedepends = unzip
makedepends = wasi-compiler-rt
makedepends = wasi-libc
makedepends = wasi-libc++
makedepends = wasi-libc++abi
makedepends = xorg-server-xvfb
makedepends = yasm
makedepends = zip
Expand Down Expand Up @@ -74,20 +66,20 @@ pkgbase = cachy-browser
options = !emptydirs
options = !lto
options = !makeflags
backup = usr/lib/cachy-browser/cachyos.cfg
backup = usr/lib/cachy-browser/distribution/policies.json
source = https://archive.mozilla.org/pub/firefox/releases/127.0.2/source/firefox-127.0.2.source.tar.xz
source = https://archive.mozilla.org/pub/firefox/releases/127.0.2/source/firefox-127.0.2.source.tar.xz.asc
source = https://archive.mozilla.org/pub/firefox/releases/128.0/source/firefox-128.0.source.tar.xz
source = https://archive.mozilla.org/pub/firefox/releases/128.0/source/firefox-128.0.source.tar.xz.asc
source = cachy-browser.desktop
source = git+https://github.com/cachyos/cachyos-browser-settings.git#commit=a77f5bada62a35114ff9ab2f79a78450fe8a5016
source = git+https://github.com/cachyos/cachyos-browser-common.git#commit=0424104cb046ec3159b4ee11a13c937b8a892bd2
source = git+https://github.com/cachyos/cachyos-browser-settings.git#commit=72b43a93b822ad06554d8dbe793b31fffef5aa74
source = git+https://github.com/cachyos/cachyos-browser-common.git#commit=8d73930b0634c66b2e9758b2db4bb8b2a7b765c1
source = match.patch
source = explicit-sync.patch
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
sha256sums = 0b7b2a8c3def52fcab13c48769645d0e963902ee916e4f3d2a0098796e73e3e8
sha256sums = 65271ffefb235ea1e162a081f2074a0f06fce27b2f613f573c126ba8eef95172
sha256sums = SKIP
sha256sums = de5c0deb9b6a4ebfaa933103cc6a65f1f43c9a456296d356cc54c7ca042d144c
sha256sums = 42447a25d530535cad8d2a453e0f92fa66d150bc687722d20d81779536c0d54a
sha256sums = bd98a30348733ada47377dd6faca9fec338f1e9133cd64e25e1ba364cf7d7798
sha256sums = 1975dba8663744e5757a7398899fe94dd50ba33adfe122d6cfb69d8480de9c3a
sha256sums = b41a51665e265ccaad7781f603c260ef49fb04daa24fcaecd0c75f55d7b1c189
sha256sums = 1fbb1971a1d0d4c875b1af0f9681601909cfbe4fe0cc2c2f42c523c84c934499
sha256sums = 740ba8d3942e231162039b5f2b02ff9106f2b99c41a809ed4ab8202644cf40de

pkgname = cachy-browser
15 changes: 11 additions & 4 deletions cachy-browser/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pkgname=cachy-browser
_pkgname=Cachy
__pkgname=cachy
pkgver=128.0
pkgrel=2
pkgrel=3
pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom."
arch=(x86_64)
license=(
Expand Down Expand Up @@ -101,13 +101,15 @@ source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-
$pkgname.desktop
"git+https://github.com/cachyos/cachyos-browser-settings.git#commit=${_settings_commit}"
"git+https://github.com/cachyos/cachyos-browser-common.git#commit=${_common_commit}"
"match.patch")
"match.patch"
"explicit-sync.patch")
sha256sums=('65271ffefb235ea1e162a081f2074a0f06fce27b2f613f573c126ba8eef95172'
'SKIP'
'c0786df2fd28409da59d0999083914a65e2097cda055c9c6c2a65825f156e29f'
'de5c0deb9b6a4ebfaa933103cc6a65f1f43c9a456296d356cc54c7ca042d144c'
'1975dba8663744e5757a7398899fe94dd50ba33adfe122d6cfb69d8480de9c3a'
'b41a51665e265ccaad7781f603c260ef49fb04daa24fcaecd0c75f55d7b1c189'
'1fbb1971a1d0d4c875b1af0f9681601909cfbe4fe0cc2c2f42c523c84c934499')
'1fbb1971a1d0d4c875b1af0f9681601909cfbe4fe0cc2c2f42c523c84c934499'
'740ba8d3942e231162039b5f2b02ff9106f2b99c41a809ed4ab8202644cf40de')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <[email protected]>

prepare() {
Expand Down Expand Up @@ -237,6 +239,11 @@ END
# msg2 "Match to system libs"
# patch -Np1 -i ../match.patch

# https://hg.mozilla.org/mozilla-central/raw-rev/f9323daf7abe
# https://hg.mozilla.org/mozilla-central/raw-rev/a264ff9e9f6f
# https://hg.mozilla.org/mozilla-central/raw-rev/eb230ecdf8eb
msg2 "Add fixes for explicit sync egl-wayland crashes"
patch -Np1 -i ../explicit-sync.patch
sed -i 's/releases\/mozilla-release",/mozilla-central",\n "integration\/autoland",/' python/mozbuild/mozbuild/artifacts.py

rm -f ${srcdir}/cachyos-browser-common/source_files/mozconfig
Expand Down
Loading

0 comments on commit 5115b26

Please sign in to comment.