From eb864e519d068c6f12ec6f12461bcb05887b6ce6 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Tue, 14 Nov 2017 19:04:44 +0000 Subject: www/firefox: update to 57.0 (marketed as "Firefox Quantum") Not a MFH candidate due to POLA violation per redesigned UI, broken legacy addons and auto-reviewed new addons. Changes: https://www.mozilla.org/firefox/57.0/releasenotes/ PR: 222693 Tested by: pi, tobik, TrueOS --- www/firefox/files/patch-bug1401339 | 76 -------------------------------------- 1 file changed, 76 deletions(-) delete mode 100644 www/firefox/files/patch-bug1401339 (limited to 'www/firefox/files/patch-bug1401339') diff --git a/www/firefox/files/patch-bug1401339 b/www/firefox/files/patch-bug1401339 deleted file mode 100644 index 74ebcd724bb4..000000000000 --- a/www/firefox/files/patch-bug1401339 +++ /dev/null @@ -1,76 +0,0 @@ -commit 5d3c733f43dd -Author: Gabriele Svelto -Date: Fri Sep 22 15:06:22 2017 +0200 - - Bug 1401339 - Look for libcurl under platform-specific paths; r=Dexter a=sylvestre - - MozReview-Commit-ID: 6wijqLsar56 - - --HG-- - extra : source : ebd3c3b2d64442c2b5eb7ab3e87c4b423311f3f4 ---- - .../pingsender/pingsender_unix_common.cpp | 40 +++++++++++++++------- - 1 file changed, 28 insertions(+), 12 deletions(-) - -diff --git toolkit/components/telemetry/pingsender/pingsender_unix_common.cpp toolkit/components/telemetry/pingsender/pingsender_unix_common.cpp -index b1cea81f6288..ae20f4114193 100644 ---- toolkit/components/telemetry/pingsender/pingsender_unix_common.cpp -+++ toolkit/components/telemetry/pingsender/pingsender_unix_common.cpp -@@ -80,29 +80,45 @@ CurlWrapper::~CurlWrapper() - bool - CurlWrapper::Init() - { -- // libcurl might show up under different names, try them all until we find it -+ const char* libcurlPaths[] = { -+ "/usr/lib", -+#ifdef XP_LINUX -+ "/usr/lib32", -+ "/usr/lib64", -+ "/usr/lib/i386-linux-gnu", // Debian 32-bit x86 -+ "/usr/lib/x86_64-linux-gnu", // Debian 64-bit x86 -+#endif // XP_LINUX -+ }; -+ - const char* libcurlNames[] = { -+#ifdef XP_LINUX - "libcurl.so", - "libcurl.so.4", - // Debian gives libcurl a different name when it is built against GnuTLS -+ "libcurl-gnutls.so", - "libcurl-gnutls.so.4", -- // Older libcurl if we can't find anything better -+ // Older versions in case we find nothing better - "libcurl.so.3", --#ifndef HAVE_64BIT_BUILD -- // 32-bit versions on 64-bit hosts -- "/usr/lib32/libcurl.so", -- "/usr/lib32/libcurl.so.4", -- "/usr/lib32/libcurl-gnutls.so.4", -- "/usr/lib32/libcurl.so.3", --#endif -+ "libcurl-gnutls.so.3", // See above for Debian -+#elif defined(XP_MACOSX) - // macOS - "libcurl.dylib", - "libcurl.4.dylib", -- "libcurl.3.dylib" -+ "libcurl.3.dylib", -+#endif - }; - -- for (const char* libname : libcurlNames) { -- mLib = dlopen(libname, RTLD_NOW); -+ // libcurl might show up under different names, try them all until we find it -+ -+ for (const char* libpath : libcurlPaths) { -+ for (const char* libname : libcurlNames) { -+ string fullpath = string(libpath) + "/" + libname; -+ mLib = dlopen(fullpath.c_str(), RTLD_NOW); -+ -+ if (mLib) { -+ break; -+ } -+ } - - if (mLib) { - break; -- cgit v1.2.3