diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | glibc236.patch | 53 |
3 files changed, 77 insertions, 14 deletions
@@ -1,7 +1,7 @@ pkgbase = librewolf pkgdesc = Community-maintained fork of Firefox, focused on privacy, security and freedom. - pkgver = 103.0 - pkgrel = 3 + pkgver = 103.0.1 + pkgrel = 1 url = https://librewolf.net/ install = librewolf.install arch = x86_64 @@ -57,16 +57,17 @@ pkgbase = librewolf options = !debug backup = usr/lib/librewolf/librewolf.cfg backup = usr/lib/librewolf/distribution/policies.json - source = https://archive.mozilla.org/pub/firefox/releases/103.0/source/firefox-103.0.source.tar.xz - source = https://archive.mozilla.org/pub/firefox/releases/103.0/source/firefox-103.0.source.tar.xz.asc + source = https://archive.mozilla.org/pub/firefox/releases/103.0.1/source/firefox-103.0.1.source.tar.xz + source = https://archive.mozilla.org/pub/firefox/releases/103.0.1/source/firefox-103.0.1.source.tar.xz.asc source = https://raw.githubusercontent.com/archlinux/svntogit-packages/1f6f9abcdcb2a03f259602b4671208b15cc6d4b9/trunk/zstandard-0.18.0.diff source = librewolf.desktop - source = git+https://gitlab.com/librewolf-community/browser/source.git#tag=103.0-3 - source = git+https://gitlab.com/librewolf-community/settings.git#commit=02212c3f44e7aa68b22c8febd9158580d7e4b74f + source = git+https://gitlab.com/librewolf-community/browser/source.git#tag=103.0.1-1 + source = git+https://gitlab.com/librewolf-community/settings.git#tag=6.7 source = default192x192.png source = 0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch + source = glibc236.patch validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353 - sha256sums = acc41d050560db4c4177ea86e2d00e47d74229041fea4c02c0e9e87e64093773 + sha256sums = b2db4df5fae0801e6406686876e8115d9529fb93a01566f22548908ca6c2cf82 sha256sums = SKIP sha256sums = a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be sha256sums = 21054a5f41f38a017f3e1050ccc433d8e59304864021bef6b99f0d0642ccbe93 @@ -74,5 +75,6 @@ pkgbase = librewolf sha256sums = SKIP sha256sums = 959c94c68cab8d5a8cff185ddf4dca92e84c18dccc6dc7c8fe11c78549cdc2f1 sha256sums = 1d713370fe5a8788aa1723ca291ae2f96635b92bc3cb80aea85d21847c59ed6d + sha256sums = 7c6277d6ac1d31b0733d2e04600e2304545cede8810afc691142a94c0a517bd1 pkgname = librewolf @@ -2,8 +2,8 @@ pkgname=librewolf _pkgname=LibreWolf -pkgver=103.0 -pkgrel=3 +pkgver=103.0.1 +pkgrel=1 pkgdesc="Community-maintained fork of Firefox, focused on privacy, security and freedom." arch=(x86_64 aarch64) license=(MPL GPL LGPL) @@ -25,26 +25,28 @@ options=(!emptydirs !makeflags !strip !lto !debug) _arch_git=https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/firefox/trunk _source_tag="${pkgver}-${pkgrel}" # _source_commit='328f531b1b18ca0ba4f96483db89eeb129c41c4c' # not 'stable', but current source head -# _settings_tag='6.7' -_settings_commit='02212c3f44e7aa68b22c8febd9158580d7e4b74f' +_settings_tag='6.7' +# _settings_commit='02212c3f44e7aa68b22c8febd9158580d7e4b74f' install='librewolf.install' source=(https://archive.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.xz{,.asc} https://raw.githubusercontent.com/archlinux/svntogit-packages/1f6f9abcdcb2a03f259602b4671208b15cc6d4b9/trunk/zstandard-0.18.0.diff $pkgname.desktop "git+https://gitlab.com/${pkgname}-community/browser/source.git#tag=${_source_tag}" - "git+https://gitlab.com/${pkgname}-community/settings.git#commit=${_settings_commit}" + "git+https://gitlab.com/${pkgname}-community/settings.git#tag=${_settings_tag}" "default192x192.png" "0018-bmo-1516081-Disable-watchdog-during-PGO-builds.patch" + "glibc236.patch" ) # source_aarch64=() -sha256sums=('acc41d050560db4c4177ea86e2d00e47d74229041fea4c02c0e9e87e64093773' +sha256sums=('b2db4df5fae0801e6406686876e8115d9529fb93a01566f22548908ca6c2cf82' 'SKIP' 'a6857ad2f2e2091c6c4fdcde21a59fbeb0138914c0e126df64b50a5af5ff63be' '21054a5f41f38a017f3e1050ccc433d8e59304864021bef6b99f0d0642ccbe93' 'SKIP' 'SKIP' '959c94c68cab8d5a8cff185ddf4dca92e84c18dccc6dc7c8fe11c78549cdc2f1' - '1d713370fe5a8788aa1723ca291ae2f96635b92bc3cb80aea85d21847c59ed6d') + '1d713370fe5a8788aa1723ca291ae2f96635b92bc3cb80aea85d21847c59ed6d' + '7c6277d6ac1d31b0733d2e04600e2304545cede8810afc691142a94c0a517bd1') # sha256sums_aarch64=() validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software Releases <release@mozilla.com> @@ -148,6 +150,12 @@ fi # https://bugzilla.mozilla.org/show_bug.cgi?id=1530052 # patch -Np1 -i ${srcdir}/0001-Use-remoting-name-for-GDK-application-names.patch + # temporary workaround to build with glibc-2.36 + # this is not beautiful + local _glibc_minor=$(pacman -Qi glibc | grep Version | sed -e 's/Version[[:space:]]*:[[:space:]][0-9]\.\(.*\)-[0-9]/\1/') + if [ "${_glibc_minor}" -gt 35 ]; then + patch -Np1 -i ../glibc236.patch + fi # Unbreak build with python-zstandard 0.18.0 patch -Np1 -i ../zstandard-0.18.0.diff diff --git a/glibc236.patch b/glibc236.patch new file mode 100644 index 000000000000..c89b6bde21b5 --- /dev/null +++ b/glibc236.patch @@ -0,0 +1,53 @@ +diff --git a/ipc/chromium/src/third_party/libevent/README.mozilla b/ipc/chromium/src/third_party/libevent/README.mozilla +index c2fcb5a1f424..3518aa6ee534 100644 +--- a/ipc/chromium/src/third_party/libevent/README.mozilla ++++ b/ipc/chromium/src/third_party/libevent/README.mozilla +@@ -22,6 +22,10 @@ distinguish the two cases. If you get something wrong, the CHECK_EVENT_SIZEOF + static assertions in message_pump_libevent.cc will fail. If a new constant is + added, also add a static assertion for it to message_pump_libevent.cc. + ++You also need to modify the EVENT__HAVE_ARC4RANDOM and EVENT__HAVE_ARC4RANDOM_BUF ++constants in the generated Linux header to account for the results of the arc4random ++and arc4random_buf configure checks. ++ + 2. No additional patches are needed at this time, but be careful to avoid + clobbering changes to the various event-config.h files which have been customized + over time to avoid various build bustages. +diff --git a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h +index 101d39d45510..49864f74006f 100644 +--- a/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h ++++ b/ipc/chromium/src/third_party/libevent/linux/event2/event-config.h +@@ -29,14 +29,18 @@ + /* Define to 1 if you have the <afunix.h> header file. */ + /* #undef EVENT__HAVE_AFUNIX_H 1 */ + ++#ifdef HAVE_ARC4RANDOM + /* Define to 1 if you have the `arc4random' function. */ +-/* #undef EVENT__HAVE_ARC4RANDOM */ ++#define EVENT__HAVE_ARC4RANDOM 1 ++#endif + + /* Define to 1 if you have the `arc4random_addrandom' function. */ + /* #undef EVENT__HAVE_ARC4RANDOM_ADDRANDOM */ + ++#ifdef HAVE_ARC4RANDOM_BUF + /* Define to 1 if you have the `arc4random_buf' function. */ +-/* #undef EVENT__HAVE_ARC4RANDOM_BUF */ ++#define EVENT__HAVE_ARC4RANDOM_BUF 1 ++#endif + + /* Define to 1 if you have the <arpa/inet.h> header file. */ + #define EVENT__HAVE_ARPA_INET_H 1 +diff --git a/toolkit/crashreporter/client/ping.cpp b/toolkit/crashreporter/client/ping.cpp +index 49c6e2b7361c..0d803841987d 100644 +--- a/toolkit/crashreporter/client/ping.cpp ++++ b/toolkit/crashreporter/client/ping.cpp +@@ -53,7 +53,7 @@ static string GenerateUUID() { + + CFRelease(uuid); + #elif defined(HAVE_ARC4RANDOM_BUF) // Android, BSD, ... +- arc4random_buf(id, sizeof(UUID)); ++ arc4random_buf(&id, sizeof(UUID)); + #else // Linux + int fd = open("/dev/urandom", O_RDONLY); + |