# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1471260592 -7200
# Node ID 05d175c5957e9af46ac437d26b167f81843b11be
# Parent  199d5cf40e863b24fa2804acbb0849397d862ad3
added upstream patch so system plugins/extensions are correctly
loaded again on x86-64 (bmo#1282843)
(mozilla-old_configure-bmo1282843.patch)

diff -r 199d5cf40e86 -r 05d175c5957e MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Aug 03 07:04:14 2016 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Mon Aug 15 13:29:52 2016 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+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)
+
+-------------------------------------------------------------------
 Mon Aug  1 12:37:05 UTC 2016 - wr@rosenauer.org
 
 - update to Firefox 48.0 (boo#991809)
diff -r 199d5cf40e86 -r 05d175c5957e MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Aug 03 07:04:14 2016 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Aug 15 13:29:52 2016 +0200
@@ -149,6 +149,7 @@
 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
@@ -264,6 +265,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 # Firefox
 %patch101 -p1
 %patch102 -p1
@@ -320,6 +322,8 @@
 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 -r 199d5cf40e86 -r 05d175c5957e MozillaFirefox/mozilla-old_configure-bmo1282843.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-old_configure-bmo1282843.patch	Mon Aug 15 13:29:52 2016 +0200
@@ -0,0 +1,1 @@
+../mozilla-old_configure-bmo1282843.patch
\ No newline at end of file
diff -r 199d5cf40e86 -r 05d175c5957e mozilla-old_configure-bmo1282843.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-old_configure-bmo1282843.patch	Mon Aug 15 13:29:52 2016 +0200
@@ -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',
diff -r 199d5cf40e86 -r 05d175c5957e series
--- a/series	Wed Aug 03 07:04:14 2016 +0200
+++ b/series	Mon Aug 15 13:29:52 2016 +0200
@@ -14,6 +14,7 @@
 mozilla-exclude-nametablecpp.patch
 mozilla-aarch64-48bit-va.patch
 mozilla-binutils-visibility.patch
+mozilla-old_configure-bmo1282843.patch
 
 # Firefox patches
 firefox-kde.patch