summaryrefslogtreecommitdiff
path: root/libre/icecat
diff options
context:
space:
mode:
Diffstat (limited to 'libre/icecat')
-rw-r--r--libre/icecat/PKGBUILD20
-rw-r--r--libre/icecat/icecat-install-dir.patch4
-rw-r--r--libre/icecat/libre.patch79
-rw-r--r--libre/icecat/mozilla-8904705.patch147
-rw-r--r--libre/icecat/mozilla-8909448.patch43
-rw-r--r--libre/icecat/no-crmf.diff10
6 files changed, 30 insertions, 273 deletions
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 674d91d6d..d795911c2 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -19,9 +19,9 @@
_pkgname=firefox
pkgname=icecat
-_pkgver=52.3.0-gnu1
+_pkgver=52.6.0-gnu1
pkgver=${_pkgver//-/_}
-pkgrel=9
+pkgrel=1
pkgdesc="GNU Icecat - a libre standalone web browser based on Mozilla Firefox."
arch=(x86_64 i686 armv7h)
license=(MPL GPL LGPL)
@@ -43,23 +43,20 @@ source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{
$pkgname.desktop
$pkgname-install-dir.patch no-crmf.diff
$pkgname-fixed-loading-icon.png
- mozilla-8904705.patch mozilla-8909448.patch
disable-crypto-hardening-settings.patch
disable-spoofSource-referer.patch
gnu_headshadow.png
libre.patch)
-sha256sums=('699ab2b41d4428ef5e360f3f33d98bc52723315cedac20bb03619846ca895302'
+sha256sums=('0a0cf3acb2067e0580204b44bb5a02fab2033c6bbf7c0b47522a3c4c1f29d625'
'SKIP'
'52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745'
- '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47'
- 'cf224d69e89f37f92202061669014b99fbf7b1fec38fd8ba9f957711fa095729'
+ 'a7755c929fed4bc2008319dacad92b543db71168294b124855c5d3a19e46ae8a'
+ 'd5f0279bcefb5c846ac86c487d540dfc75a5ee45af08e40651e50e778c65f2c0'
'68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213'
- 'dc4feddbf22ea11ae2513c68b7f3fc9047850d055a7f30d31a7ee94d7d5de12a'
- '8ed42e75b577d57e4b07f1d70137cb8e82f757abb616f1cfea694a041ad5679e'
'bb1fc90d117c4a7810e202d23ff44a2dac11b675336533054b5a70dd8606df38'
'c50043266e69f5844e6dce9ea7193af79587dcaa66806932d7867281a176f03e'
'93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd'
- '76a657a90371e637e7c4b371b71a15c85acafcece6277455e9ede84ffe104d3e')
+ 'd32f97e812c536efd9bdc7043efd6f9472a1edd9f814b453805c7c10ffea25a6')
validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez
prepare() {
@@ -130,7 +127,6 @@ END
install -m644 "$srcdir/gnu_headshadow.png" \
browser/base/content/abouthome
-
# Patch and remove anything that's left
patch -Np1 -i "$srcdir/libre.patch"
rm -v browser/base/content/abouthome/snippet*.png || true
@@ -146,10 +142,6 @@ END
rm -rv browser/locales/searchplugins
cp -av /usr/lib/mozilla/searchplugins browser/locales
- # fix broken glyphs
- patch -Np1 -i "$srcdir/mozilla-8904705.patch"
- patch -Np1 -i "$srcdir/mozilla-8909448.patch"
-
# Disable crypto hardening settings for now
# https://lists.parabola.nu/pipermail/assist/2015-October/000534.html
# https://labs.parabola.nu/issues/842
diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch
index e15bf0b68..8df2b9c8a 100644
--- a/libre/icecat/icecat-install-dir.patch
+++ b/libre/icecat/icecat-install-dir.patch
@@ -8,5 +8,5 @@ diff -Nur a/config/baseconfig.mk c/config/baseconfig.mk
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)
sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
- ifndef TOP_DIST
- TOP_DIST = dist
+ ifeq (.,$(DEPTH))
+ DIST = dist
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 7698a34e1..0ca3668f4 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -680,7 +680,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 334358c..44148fd 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -32,6 +32,7 @@ browser.jar:
+@@ -31,6 +31,7 @@ browser.jar:
content/browser/abouthome/settings.png (content/abouthome/settings.png)
content/browser/abouthome/restore.png (content/abouthome/restore.png)
content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png)
@@ -765,7 +765,7 @@ diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales
index e8460a4..374bf61 100644
--- a/browser/locales/generic/profile/bookmarks.html.in
+++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -11,8 +11,20 @@
+@@ -12,8 +12,20 @@
<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
<DL><p>
<HR>
@@ -802,7 +802,7 @@ index bcb7d1c..f902aac 100644
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Components.utils.import("resource://gre/modules/Services.jsm");
-@@ -22,68 +22,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
+@@ -24,68 +24,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts",
XPCOMUtils.defineLazyModuleGetter(this, "Promise",
"resource://gre/modules/Promise.jsm");
@@ -871,7 +871,7 @@ index bcb7d1c..f902aac 100644
/**
* This code provides services to the about:home page. Whenever
* about:home needs to do something chrome-privileged, it sends a
-@@ -162,17 +100,8 @@ var AboutHome = {
+@@ -169,17 +107,8 @@ var AboutHome = {
ss.promiseInitialized.then(function() {
let data = {
showRestoreLastSession: ss.canRestoreLastSession,
@@ -903,7 +903,7 @@ index eff09189b..6d76d20f0 100644
# the following files are browser-specific overrides
--- a/browser/locales/search/list.json
+++ b/browser/locales/search/list.json
-@@ -1,176 +1,176 @@
+@@ -1,840 +1,830 @@
{
"default": {
"visibleDefaultEngines": [
@@ -916,24 +916,11 @@ index eff09189b..6d76d20f0 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo", "amazondotcom", "bing", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "US": {
- "visibleDefaultEngines": [
-- "yahoo", "google-nocodes", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "CA": {
- "visibleDefaultEngines": [
-- "google-nocodes", "yahoo", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "experimental-hidden": {
- "visibleDefaultEngines": [
-- "yahoo-en-CA", "yandex-en"
+- ]
+- },
+- "experimental-hidden": {
+- "visibleDefaultEngines": [
+- "yahoo-en-CA", "yandex-en", "google-2018"
+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
]
}
@@ -1102,11 +1089,15 @@ index eff09189b..6d76d20f0 100644
"default": {
"visibleDefaultEngines": [
- "google", "yahoo-en-GB", "bing", "amazon-en-GB", "chambers-en-GB", "ddg", "twitter", "wikipedia"
+- ]
+- },
+- "experimental-hidden": {
+- "visibleDefaultEngines": [
+- "yandex-en"
+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
]
- },
- "experimental-hidden": {
-@@ -182,699 +182,699 @@
+ }
+ },
"en-ZA": {
"default": {
"visibleDefaultEngines": [
@@ -1840,30 +1831,6 @@ index eff09189b..6d76d20f0 100644
+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
]
},
- "TW": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "HK": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "US": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "CA": {
- "visibleDefaultEngines": [
-- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
"KZ": {
"visibleDefaultEngines": [
- "baidu", "google-nocodes", "bing", "ddg", "wikipedia-zh-CN", "amazondotcn"
@@ -1901,17 +1868,5 @@ index eff09189b..6d76d20f0 100644
- "yahoo-zh-TW", "google", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
]
- },
- "TW": {
- "visibleDefaultEngines": [
-- "yahoo-zh-TW", "google-nocodes", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW-HK", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
- },
- "HK": {
- "visibleDefaultEngines": [
-- "yahoo-zh-TW-HK", "google-nocodes", "ddg", "findbook-zh-TW", "wikipedia-zh-TW", "yahoo-zh-TW", "yahoo-bid-zh-TW", "yahoo-answer-zh-TW"
-+ "duckduckgo-html", "duckduckgo-lite", "internet-archive", "parabola-packages", "parabola-wiki-en", "searx", "seeks", "wikipedia-en", "yacy"
- ]
}
}
diff --git a/libre/icecat/mozilla-8904705.patch b/libre/icecat/mozilla-8904705.patch
deleted file mode 100644
index deecd1251..000000000
--- a/libre/icecat/mozilla-8904705.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1504640559 14400
-# Tue Sep 05 15:42:39 2017 -0400
-# Node ID 923246286b9858fb103e100f886c03714b97b5ec
-# Parent 3fff2b174212af40a7b7ba75a047db431f81c780
-clip FreeType glyph bitmap to mask in Skia (52 ESR)
-
-diff --git a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
---- a/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
-+++ b/gfx/skia/skia/src/ports/SkFontHost_FreeType_common.cpp
-@@ -350,58 +350,118 @@ void SkScalerContext_FreeType_Base::gene
- const SkMatrix& bitmapTransform)
- {
- const bool doBGR = SkToBool(fRec.fFlags & SkScalerContext::kLCD_BGROrder_Flag);
- const bool doVert = SkToBool(fRec.fFlags & SkScalerContext::kLCD_Vertical_Flag);
-
- switch ( face->glyph->format ) {
- case FT_GLYPH_FORMAT_OUTLINE: {
- FT_Outline* outline = &face->glyph->outline;
-- FT_BBox bbox;
-- FT_Bitmap target;
-
- int dx = 0, dy = 0;
- if (fRec.fFlags & SkScalerContext::kSubpixelPositioning_Flag) {
- dx = SkFixedToFDot6(glyph.getSubXFixed());
- dy = SkFixedToFDot6(glyph.getSubYFixed());
- // negate dy since freetype-y-goes-up and skia-y-goes-down
- dy = -dy;
- }
-- FT_Outline_Get_CBox(outline, &bbox);
-- /*
-- what we really want to do for subpixel is
-- offset(dx, dy)
-- compute_bounds
-- offset(bbox & !63)
-- but that is two calls to offset, so we do the following, which
-- achieves the same thing with only one offset call.
-- */
-- FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63),
-- dy - ((bbox.yMin + dy) & ~63));
-+ memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight);
-
- if (SkMask::kLCD16_Format == glyph.fMaskFormat) {
-- FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V : FT_RENDER_MODE_LCD);
-+ FT_Outline_Translate(outline, dx, dy);
-+ FT_Error err = FT_Render_Glyph(face->glyph, doVert ? FT_RENDER_MODE_LCD_V : FT_RENDER_MODE_LCD);
-+ if (err) {
-+ return;
-+ }
-+
- SkMask mask;
- glyph.toMask(&mask);
-+
-+ FT_GlyphSlotRec& ftGlyph = *face->glyph;
-+
-+ if (!SkIRect::Intersects(mask.fBounds,
-+ SkIRect::MakeXYWH( ftGlyph.bitmap_left,
-+ -ftGlyph.bitmap_top,
-+ ftGlyph.bitmap.width,
-+ ftGlyph.bitmap.rows)))
-+ {
-+ return;
-+ }
-+
-+ // If the FT_Bitmap extent is larger, discard bits of the bitmap outside the mask.
-+ // If the SkMask extent is larger, shrink mask to fit bitmap (clearing discarded).
-+ unsigned char* origBuffer = ftGlyph.bitmap.buffer;
-+ // First align the top left (origin).
-+ if (-ftGlyph.bitmap_top < mask.fBounds.fTop) {
-+ int32_t topDiff = mask.fBounds.fTop - (-ftGlyph.bitmap_top);
-+ ftGlyph.bitmap.buffer += ftGlyph.bitmap.pitch * topDiff;
-+ ftGlyph.bitmap.rows -= topDiff;
-+ ftGlyph.bitmap_top = -mask.fBounds.fTop;
-+ }
-+ if (ftGlyph.bitmap_left < mask.fBounds.fLeft) {
-+ int32_t leftDiff = mask.fBounds.fLeft - ftGlyph.bitmap_left;
-+ ftGlyph.bitmap.buffer += leftDiff;
-+ ftGlyph.bitmap.width -= leftDiff;
-+ ftGlyph.bitmap_left = mask.fBounds.fLeft;
-+ }
-+ if (mask.fBounds.fTop < -ftGlyph.bitmap_top) {
-+ mask.fImage += mask.fRowBytes * (-ftGlyph.bitmap_top - mask.fBounds.fTop);
-+ mask.fBounds.fTop = -ftGlyph.bitmap_top;
-+ }
-+ if (mask.fBounds.fLeft < ftGlyph.bitmap_left) {
-+ mask.fImage += sizeof(uint16_t) * (ftGlyph.bitmap_left - mask.fBounds.fLeft);
-+ mask.fBounds.fLeft = ftGlyph.bitmap_left;
-+ }
-+ // Origins aligned, clean up the width and height.
-+ int ftVertScale = (doVert ? 3 : 1);
-+ int ftHoriScale = (doVert ? 1 : 3);
-+ if (mask.fBounds.height() * ftVertScale < SkToInt(ftGlyph.bitmap.rows)) {
-+ ftGlyph.bitmap.rows = mask.fBounds.height() * ftVertScale;
-+ }
-+ if (mask.fBounds.width() * ftHoriScale < SkToInt(ftGlyph.bitmap.width)) {
-+ ftGlyph.bitmap.width = mask.fBounds.width() * ftHoriScale;
-+ }
-+ if (SkToInt(ftGlyph.bitmap.rows) < mask.fBounds.height() * ftVertScale) {
-+ mask.fBounds.fBottom = mask.fBounds.fTop + ftGlyph.bitmap.rows / ftVertScale;
-+ }
-+ if (SkToInt(ftGlyph.bitmap.width) < mask.fBounds.width() * ftHoriScale) {
-+ mask.fBounds.fRight = mask.fBounds.fLeft + ftGlyph.bitmap.width / ftHoriScale;
-+ }
-+
- if (fPreBlend.isApplicable()) {
-- copyFT2LCD16<true>(face->glyph->bitmap, mask, doBGR,
-+ copyFT2LCD16<true>(ftGlyph.bitmap, mask, doBGR,
- fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
- } else {
-- copyFT2LCD16<false>(face->glyph->bitmap, mask, doBGR,
-+ copyFT2LCD16<false>(ftGlyph.bitmap, mask, doBGR,
- fPreBlend.fR, fPreBlend.fG, fPreBlend.fB);
- }
-+ // Restore the buffer pointer so FreeType can properly free it.
-+ ftGlyph.bitmap.buffer = origBuffer;
- } else {
-+ FT_BBox bbox;
-+ FT_Bitmap target;
-+ FT_Outline_Get_CBox(outline, &bbox);
-+ /*
-+ what we really want to do for subpixel is
-+ offset(dx, dy)
-+ compute_bounds
-+ offset(bbox & !63)
-+ but that is two calls to offset, so we do the following, which
-+ achieves the same thing with only one offset call.
-+ */
-+ FT_Outline_Translate(outline, dx - ((bbox.xMin + dx) & ~63),
-+ dy - ((bbox.yMin + dy) & ~63));
-+
- target.width = glyph.fWidth;
- target.rows = glyph.fHeight;
- target.pitch = glyph.rowBytes();
- target.buffer = reinterpret_cast<uint8_t*>(glyph.fImage);
- target.pixel_mode = compute_pixel_mode( (SkMask::Format)fRec.fMaskFormat);
- target.num_grays = 256;
-
-- memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight);
- FT_Outline_Get_Bitmap(face->glyph->library, outline, &target);
- }
- } break;
-
- case FT_GLYPH_FORMAT_BITMAP: {
- FT_Pixel_Mode pixel_mode = static_cast<FT_Pixel_Mode>(face->glyph->bitmap.pixel_mode);
- SkMask::Format maskFormat = static_cast<SkMask::Format>(glyph.fMaskFormat);
-
diff --git a/libre/icecat/mozilla-8909448.patch b/libre/icecat/mozilla-8909448.patch
deleted file mode 100644
index 22f2e17af..000000000
--- a/libre/icecat/mozilla-8909448.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-# HG changeset patch
-# User Lee Salzman <lsalzman@mozilla.com>
-# Date 1505762237 14400
-# Mon Sep 18 15:17:17 2017 -0400
-# Node ID b48346dc7742fbbc8284a907983098856503a4f1
-# Parent 60baec2de6577d8a109e417545ad1b6542481068
-fix Skia's glyph LCD filter padding for FreeType 2.8.1
-
-MozReview-Commit-ID: JFvnANsTS0r
-
-diff --git a/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp b/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
---- a/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
-+++ b/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
-@@ -661,20 +661,25 @@ void SkScalerContext_CairoFT::generateMe
- bbox.yMin &= ~63;
- bbox.xMax = (bbox.xMax + 63) & ~63;
- bbox.yMax = (bbox.yMax + 63) & ~63;
- glyph->fWidth = SkToU16(SkFDot6Floor(bbox.xMax - bbox.xMin));
- glyph->fHeight = SkToU16(SkFDot6Floor(bbox.yMax - bbox.yMin));
- glyph->fTop = -SkToS16(SkFDot6Floor(bbox.yMax));
- glyph->fLeft = SkToS16(SkFDot6Floor(bbox.xMin));
-
-- if (isLCD(fRec) &&
-- gSetLcdFilter &&
-- (fLcdFilter == FT_LCD_FILTER_DEFAULT ||
-- fLcdFilter == FT_LCD_FILTER_LIGHT)) {
-+ if (isLCD(fRec)) {
-+ // In FreeType < 2.8.1, LCD filtering, if explicitly used, may
-+ // add padding to the glyph. When not used, there is no padding.
-+ // As of 2.8.1, LCD filtering is now always supported and may
-+ // add padding even if an LCD filter is not explicitly set.
-+ // Regardless, if no LCD filtering is used, or if LCD filtering
-+ // doesn't add padding, it is safe to modify the glyph's bounds
-+ // here. generateGlyphImage will detect if the mask is smaller
-+ // than the bounds and clip things appropriately.
- if (fRec.fFlags & kLCD_Vertical_Flag) {
- glyph->fTop -= 1;
- glyph->fHeight += 2;
- } else {
- glyph->fLeft -= 1;
- glyph->fWidth += 2;
- }
- }
diff --git a/libre/icecat/no-crmf.diff b/libre/icecat/no-crmf.diff
index 3edb053ef..0d9d46590 100644
--- a/libre/icecat/no-crmf.diff
+++ b/libre/icecat/no-crmf.diff
@@ -2,8 +2,8 @@ diff --git i/old-configure.in w/old-configure.in
index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
--- i/old-configure.in
+++ w/old-configure.in
-@@ -2020,9 +2020,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
- AM_PATH_NSS(3.31, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
+@@ -2126,9 +2126,7 @@ if test -n "$_USE_SYSTEM_NSS"; then
+ AM_PATH_NSS(3.28.6, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
fi
-if test -n "$MOZ_SYSTEM_NSS"; then
@@ -11,15 +11,15 @@ index 0a06e470d2085922..d41c8e9d5dd2dbfb 100644
-else
+if test -z "$MOZ_SYSTEM_NSS"; then
NSS_CFLAGS="-I${DIST}/include/nss"
- case "${OS_ARCH}" in
- # Only few platforms have been tested with GYP
+ fi
+
diff --git a/config/external/nss/crmf/moz.build b/config/external/nss/crmf/moz.build
index 9b8005f..4bfcc81 100644
--- a/config/external/nss/crmf/moz.build
+++ b/config/external/nss/crmf/moz.build
@@ -8,7 +8,6 @@ Library('crmf')
- if CONFIG['MOZ_NATIVE_NSS']:
+ if CONFIG['MOZ_SYSTEM_NSS']:
OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
- OS_LIBS += ['-lcrmf']
else:
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 00:08:07 +0000