From 71d828dfd0d36c98d2bad63d065e89ebcaa1e93a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 3 Jun 2021 18:22:37 -0300 Subject: [PATCH 1/3] nspr: update common/shlibs entry. Firefox can work with multiple versions of this library, but it can break in weird ways if the version is too old. This way, we force people updating the firefox package to update to the nspr version used to build it. --- common/shlibs | 6 +++--- srcpkgs/nspr/template | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index ba589537b1f3..a4a19ed18506 100644 --- a/common/shlibs +++ b/common/shlibs @@ -348,9 +348,9 @@ libtcl8.6.so tcl-8.6.0_1 libtk8.6.so tk-8.6.1_3 libsqlite3.so.0 sqlite-3.31.1_3 libIDL-2.so.0 libIDL-0.8.13_1 -libnspr4.so nspr-4.8_1 -libplc4.so nspr-4.8_1 -libplds4.so nspr-4.8_1 +libnspr4.so nspr-4.31_1 +libplc4.so nspr-4.31_1 +libplds4.so nspr-4.31_1 libsoftokn3.so nss-3.12.4_1 libssl3.so nss-3.12.4_1 libnssutil3.so nss-3.12.4_1 diff --git a/srcpkgs/nspr/template b/srcpkgs/nspr/template index 2873d90183a6..cefe1481cd46 100644 --- a/srcpkgs/nspr/template +++ b/srcpkgs/nspr/template @@ -1,4 +1,5 @@ # Template file for 'nspr' +# WARNING: always update common/shlibs entry to avoid weird issues pkgname=nspr version=4.31 revision=1 From 1c0572477a17c049d341ec135a53e389a328e172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 3 Jun 2021 18:27:03 -0300 Subject: [PATCH 2/3] nss: update common/shlibs entry. Firefox can work with multiple versions of this library, but it can break in weird ways if the version is too old. This way, we force people updating the firefox package to update to the nss version used to build it. Since nspr's shlibs entry was also fixed, we no longer need an explicit version in depends=. --- common/shlibs | 16 ++++++++-------- srcpkgs/nss/template | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/common/shlibs b/common/shlibs index a4a19ed18506..f1598d123cfe 100644 --- a/common/shlibs +++ b/common/shlibs @@ -351,14 +351,14 @@ libIDL-2.so.0 libIDL-0.8.13_1 libnspr4.so nspr-4.31_1 libplc4.so nspr-4.31_1 libplds4.so nspr-4.31_1 -libsoftokn3.so nss-3.12.4_1 -libssl3.so nss-3.12.4_1 -libnssutil3.so nss-3.12.4_1 -libsmime3.so nss-3.12.4_1 -libfreebl3.so nss-3.12.4_1 -libnssdbm3.so nss-3.12.4_1 -libnssckbi.so nss-3.12.4_1 -libnss3.so nss-3.12.4_1 +libsoftokn3.so nss-3.66_1 +libssl3.so nss-3.66_1 +libnssutil3.so nss-3.66_1 +libsmime3.so nss-3.66_1 +libfreebl3.so nss-3.66_1 +libnssdbm3.so nss-3.66_1 +libnssckbi.so nss-3.66_1 +libnss3.so nss-3.66_1 libcurl.so.4 libcurl-7.75.0_2 libdaemon.so.0 libdaemon-0.14_1 libavahi-common.so.3 avahi-libs-0.6.25_1 diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 24da85cec752..ced64aca2d02 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -1,4 +1,5 @@ # Template file for 'nss' +# WARNING: always update common/shlibs entry to avoid weird issues _nsprver=4.30 @@ -7,7 +8,6 @@ version=3.66 revision=1 hostmakedepends="perl" makedepends="nspr-devel sqlite-devel zlib-devel" -depends="nspr>=${_nsprver}" short_desc="Mozilla Network Security Services" maintainer="Đoàn Trần Công Danh " license="MPL-2.0" @@ -169,7 +169,7 @@ do_install() { } nss-devel_package() { - depends="nspr-devel>=${_nsprver} nss>=${version}_${revision}" + depends="nspr-devel nss>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/bin/nss-config From dc20373201c9a7bcb5a249847f12895addbfb908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Nogueira?= Date: Thu, 3 Jun 2021 18:30:12 -0300 Subject: [PATCH 3/3] firefox: rebuild to pick up proper nss dependency. Since this was fixed via common/shlibs, we don't need the explicit nss version in depends= anymore. --- srcpkgs/firefox/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index 3ce8a92ecbb0..1a887e8a0c7b 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -4,7 +4,7 @@ # pkgname=firefox version=89.0 -revision=1 +revision=2 build_helper="rust" short_desc="Mozilla Firefox web browser" maintainer="Johannes " @@ -24,7 +24,7 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel $(vopt_if dbus dbus-glib-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)" -depends="nss>=3.60 desktop-file-utils hicolor-icon-theme" +depends="desktop-file-utils hicolor-icon-theme" conflicts="firefox-esr>=0" build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"