MoonchildProductions#1251 - Part 21: Fix Flash player and some extensions being incompatible.

https://github.com/oracle/solaris-userland/blob/82dd4adb0eca729372074d62435e00a783d95b1f/components/desktop/firefox/patches/firefox-49-npapi.patch

The first fix was something I found on Oracle's patchset and allowed me to use the last Flash Player compiled for Solaris, from all the way back in 2012. Still works with most Flash content.

The second is an evolution of what I had to do to get Interlink to compile. For Interlink, I basically had to copy the contents of any boolean values from confvars.sh into the empty moz.configure file, otherwise nothing would get configured. I decided to test whether Pale Moon had the same issue, and it turned out that it wasn't as bad as on Interlink, but it was still pure luck that the browser component built at all, because MOZ_PHOENIX and other important flags were apparently not being defined at all, hence why I couldn't get half the extensions to be compatible at first.

I don't know why this is the case, but apparently configure.in isn't able to import values from confvars.sh. old-configure.in seems immune to the problem that application-specific configure.in files were experiencing, though. confvars.sh itself seems to work fine with values that aren't passed along via configure.in, though. So it's the interface between those two files that is messed up.

2 files changed, 51 insertions, 2 deletions

diff --git a/application/palemoon/moz.configure b/application/palemoon/moz.configure
index 72236254f..30ad4bfe5 100644
--- a/application/palemoon/moz.configure
+++ b/application/palemoon/moz.configure
@@ -5,3 +5,49 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include('../../toolkit/moz.configure')
+
+# configure.in is unreliable on Solaris. The build system only picks up about 
+# half the boolean values defined there. Doing this instead 
+# works consistently. Most of the ones that use AC_DEFINE without a 
+# MOZ_ARG_BOOL in this directory's configure.in fail, but all the ones in 
+# old-configure.in work just fine and say there's a duplicate if I try and
+# define them here.
+
+if target_is_solaris:
+
+    set_define('HAVE_SIDEBAR', True)
+    set_config('HAVE_SIDEBAR', True)
+
+    set_define('MC_PALEMOON', True)
+    set_config('MC_PALEMOON', True)
+    
+    set_define('MOZ_PHOENIX', True)
+    set_config('MOZ_PHOENIX', True)
+    
+    set_define('MOZ_PERSONAS', True)
+    set_config('MOZ_PERSONAS', True)
+
+#    set_define('MOZ_DEVTOOLS', True)
+#    set_config('MOZ_DEVTOOLS', True)
+
+    set_define('MOZ_PHOENIX_EXTENSIONS', True)
+    set_config('MOZ_PHOENIX_EXTENSIONS', True)
+
+    set_define('MOZ_SERVICES_COMMON', True)
+    set_config('MOZ_SERVICES_COMMON', True)
+
+#    set_define('MOZ_SERVICES_SYNC', True)
+#    set_config('MOZ_SERVICES_SYNC', True)
+
+#    set_define('MOZ_JSDOWNLOADS', True)
+#    set_config('MOZ_JSDOWNLOADS', True)
+
+#    set_define('MOZ_WEBGL_CONFORMANT', True)
+#    set_config('MOZ_WEBGL_CONFORMANT', True)
+
+#    set_define('MOZ_ADDON_SIGNING', False)
+#    set_config('MOZ_ADDON_SIGNING', False)
+
+#    set_define('MOZ_REQUIRE_SIGNING', False)
+#    set_config('MOZ_REQUIRE_SIGNING', False) 
+
diff --git a/dom/plugins/base/npapi.h b/dom/plugins/base/npapi.h
index 12ac635c7..e554aaabc 100644
--- a/dom/plugins/base/npapi.h
+++ b/dom/plugins/base/npapi.h
@@ -327,9 +327,12 @@ typedef enum {
 #define NP_ABI_GCC3_MASK  0x10000000
 /*
  *   gcc 3.x generated vtables on UNIX and OSX are incompatible with
- *   previous compilers.
+ *   previous compilers. Flash plugin binaries for Solaris were compiled
+ *   with Sun Studio, so this has to be false to make things work. This may
+ *   become a problem in the future when/if new plugins are compiled with 
+ *   GCC, however.
  */
-#if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3))
+#if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3) && !defined(XP_SOLARIS))
 #define _NP_ABI_MIXIN_FOR_GCC3 NP_ABI_GCC3_MASK
 #else
 #define _NP_ABI_MIXIN_FOR_GCC3 0