[patch] firefox-68.0.1-nsbrowser_plugins_directory.patch

firefox-68.0.1-nsbrowser_plugins_directory.patch (text/plain), 1.46 KB, created by Arfrever Frehtes Taifersar Arahesis on 2019-07-19 17:10:11 UTC

--- /xpcom/io/nsAppFileLocationProvider.cpp
+++ /xpcom/io/nsAppFileLocationProvider.cpp
@@ -50,6 +50,7 @@
 #  define NS_MACOSX_LOCAL_PLUGIN_DIR "OSXLocalPlugins"
 #elif XP_UNIX
 #  define NS_SYSTEM_PLUGINS_DIR "SysPlugins"
+#  define NS_SYSTEM_NSBROWSER_PLUGINS_DIR "SysNsBrowserPlugins"
 #endif
 
 #define DEFAULTS_DIR_NAME NS_LITERAL_CSTRING("defaults")
@@ -187,6 +188,21 @@
 #    else
     rv = NS_ERROR_FAILURE;
 #    endif
+  } else if (nsCRT::strcmp(aProp, NS_SYSTEM_NSBROWSER_PLUGINS_DIR) == 0) {
+#    ifdef ENABLE_SYSTEM_EXTENSION_DIRS
+    static const char* const sysLPlgDir =
+#      if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__)
+        "/usr/lib64/nsbrowser/plugins";
+#      elif defined(__OpenBSD__) || defined(__FreeBSD__)
+        "/usr/local/lib/nsbrowser/plugins";
+#      else
+        "/usr/lib/nsbrowser/plugins";
+#      endif
+    rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir), false,
+                               getter_AddRefs(localFile));
+#    else
+    rv = NS_ERROR_FAILURE;
+#    endif
   }
 #  endif
 #endif
@@ -501,7 +517,7 @@
 #  ifdef XP_UNIX
     static const char* keys[] = {nullptr, NS_USER_PLUGINS_DIR,
                                  NS_APP_PLUGINS_DIR, NS_SYSTEM_PLUGINS_DIR,
-                                 nullptr};
+                                 NS_SYSTEM_NSBROWSER_PLUGINS_DIR, nullptr};
 #  else
     static const char* keys[] = {nullptr, NS_USER_PLUGINS_DIR,
                                  NS_APP_PLUGINS_DIR, nullptr};