diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-09-09 05:10:25 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-09-09 17:59:48 +0200 |
| commit | f58aff2430624d43f64162ea66101f0ed804755f (patch) | |
| tree | c8f7b3c57c5060a52f3cd5579b61f028f9d3bb7a /source/xap/seamonkey/doinst.sh | |
| parent | 6a5556564a6558988a6df36b6523fc0f864b2528 (diff) | |
| download | current-f58aff2430624d43f64162ea66101f0ed804755f.tar.gz current-f58aff2430624d43f64162ea66101f0ed804755f.tar.xz | |
Mon Sep 9 05:10:25 UTC 201920190909051025
a/etc-15.0-x86_64-10.txz: Rebuilt.
Fix "include /etc/ld.so.conf.d/*.conf" repeats in /etc/ld.so.conf.
l/imagemagick-6.9.10_64-x86_64-1.txz: Upgraded.
l/seamonkey-solibs-2.49.5-x86_64-1.txz: Removed.
This package was included years ago to support a few things that needed
nss/nspr, but we've since included that in the mozilla-nss package.
Nothing should be using this anymore.
xap/seamonkey-2.49.5-x86_64-2.txz: Rebuilt.
Added additional options to more closely match the official build:
--enable-rust --enable-js-shell --enable-elf-hack --enable-release
--enable-calendar
Thanks to ljb643 for the bug report.
Removed /usr/lib{,64}/seamonkey from /etc/ld.so.conf.
Diffstat (limited to 'source/xap/seamonkey/doinst.sh')
| -rw-r--r-- | source/xap/seamonkey/doinst.sh | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/xap/seamonkey/doinst.sh b/source/xap/seamonkey/doinst.sh index c236bea5c..fe830f25a 100644 --- a/source/xap/seamonkey/doinst.sh +++ b/source/xap/seamonkey/doinst.sh @@ -1,11 +1,10 @@ -# If there's no mozilla here, then take over: -if [ ! -r usr/bin/mozilla ]; then - ( cd usr/bin ; ln -sf seamonkey mozilla ) -fi +# Removing /usr/lib/seamonkey from ld.so.conf. That was a hack that we did +# long ago before a standalone mozilla-nss package was shipped. # Hopefully this won't break everything. ;-) -if ! grep /usr/lib/seamonkey etc/ld.so.conf 1> /dev/null 2> /dev/null ; then - echo "/usr/lib/seamonkey" >> etc/ld.so.conf -fi +( cd etc + cat ld.so.conf | grep -v /usr/lib/seamonkey > ld.so.conf.new + mv ld.so.conf.new ld.so.conf +) if [ -x /sbin/ldconfig ]; then /sbin/ldconfig 2> /dev/null fi |