From d47b90bddecc0aec6749eada6cb70e9f80cb24686ce94a7da4a074b47337847e Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Thu, 18 Aug 2016 06:59:29 +0000
Subject: [PATCH] - added upstream patch so system plugins/extensions are
 correctly   loaded again on x86-64 (bmo#1282843)  
 (mozilla-old_configure-bmo1282843.patch)

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=542
---
 MozillaFirefox.changes                 |  7 +++++++
 MozillaFirefox.spec                    |  6 +++++-
 mozilla-old_configure-bmo1282843.patch | 29 ++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 mozilla-old_configure-bmo1282843.patch

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 10e925f..42f68a1 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 15 11:24:00 UTC 2016 - wr@rosenauer.org
+
+- added upstream patch so system plugins/extensions are correctly
+  loaded again on x86-64 (bmo#1282843)
+  (mozilla-old_configure-bmo1282843.patch)
+
 -------------------------------------------------------------------
 Fri Aug  5 13:47:12 UTC 2016 - pcerny@suse.com
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 58187bc..4f7c3b3 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package MozillaFirefox
 #
-# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #               2006-2016 Wolfgang Rosenauer
 #
 # All modifications and additions to the file contributed by third parties
@@ -149,6 +149,7 @@ Patch13:        mozilla-check_return.patch
 Patch15:        mozilla-exclude-nametablecpp.patch
 Patch16:        mozilla-aarch64-48bit-va.patch
 Patch17:        mozilla-binutils-visibility.patch
+Patch18:        mozilla-old_configure-bmo1282843.patch
 # Firefox/browser
 Patch101:       firefox-kde.patch
 Patch102:       firefox-no-default-ualocale.patch
@@ -267,6 +268,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -324,6 +326,8 @@ mk_add_options MOZ_MAKE_FLAGS=%{?jobs:-j%jobs}
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
 . \$topsrcdir/browser/config/mozconfig
 ac_add_options --prefix=%{_prefix}
+ac_add_options --libdir=%{_libdir}
+ac_add_options --includedir=%{_includedir}
 ac_add_options --enable-release
 %if 0%{?firefox_use_gtk3}
 ac_add_options --enable-default-toolkit=cairo-gtk3
diff --git a/mozilla-old_configure-bmo1282843.patch b/mozilla-old_configure-bmo1282843.patch
new file mode 100644
index 0000000..f036c5f
--- /dev/null
+++ b/mozilla-old_configure-bmo1282843.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent  2a0e5188c796cb2addedd185aba6176405786854
+Bug 1282843 - configure.py doesn't parse global autoconf options like --libdir
+without assuming libdir during build we do not find plugins/extensions in the correct system directory
+
+diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
+--- a/build/moz.configure/old.configure
++++ b/build/moz.configure/old.configure
+@@ -149,16 +149,19 @@ def old_configure_options(*options):
+     def all_options(help):
+         return list(options)
+ 
+     return depends(prepare_configure, extra_old_configure_args, all_options,
+                    *options)
+ 
+ 
+ @old_configure_options(
++    '--libdir',
++    '--includedir',
++    '--datadir',
+     '--cache-file',
+     '--enable-accessibility',
+     '--enable-address-sanitizer',
+     '--enable-alsa',
+     '--enable-android-omx',
+     '--enable-android-resource-constrained',
+     '--enable-approximate-location',
+     '--enable-b2g-bt',