main/firefox: set rpath so firefox binary finds the libs

3 files changed, 37 insertions, 12 deletions

diff --git a/testing/firefox/APKBUILD b/testing/firefox/APKBUILD
index 86f3d778628..4c7307e9ab5 100644
--- a/testing/firefox/APKBUILD
+++ b/testing/firefox/APKBUILD
@@ -4,7 +4,7 @@ pkgname=firefox
 pkgver=33.0
 _pkgver=$pkgver
 _xulver=$pkgver
-pkgrel=0
+pkgrel=1
 pkgdesc="Firefox web browser"
 url="http://www.firefox.com"
 arch="all"
@@ -66,11 +66,14 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve
 	stat.patch
 	stab.h
 
+	rhbz-966424.patch
+
 	firefox.desktop
 	firefox-safe.desktop"
 
 _builddir="${srcdir}/mozilla-release"
 _mozappdir=/usr/lib/firefox-$pkgver
+_mozappdirdev=/usr/lib/firefox-devel-$pkgver
 
 # help our shared-object scanner to find the libs
 ldpath="$_mozappdir"
@@ -88,12 +91,6 @@ prepare() {
 	cp "$srcdir"/stab.h toolkit/crashreporter/google-breakpad/src/
 
 	cp "${srcdir}/mozconfig" .mozconfig
-
-	# use our default cflags
-	echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> .mozconfig
-#	echo "ac_add_options --build=$CBUILD" >> .mozconfig
-#	echo "ac_add_options --host=$CHOST" >> .mozconfig
-
 }
 
 build() {
@@ -103,6 +100,9 @@ build() {
 	export CFLAGS="$(echo $CFLAGS | sed -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g')"
 	export CXXFLAGS="$CFLAGS"
 
+	# set rpath so linker finds the libs
+	export LDFLAGS="$LDFLAGS -Wl,-rpath,${_mozappdir}"
+
 	make -f client.mk build \
 		STRIP="/bin/true" \
 		|| return 1
@@ -153,16 +153,22 @@ __EOF__
 	# install our vendor prefs
 	install -d "$pkgdir"/$_mozappdir/browser/defaults/preferences
 	cat "$srcdir"/vendor.js >> "$pkgdir"/$_mozappdir/browser/defaults/preferences/firefox-branding.js
+
+	# remove copied, huge, libraries
+	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libmozjs.so 
+	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libmozalloc.so
+	rm -f "$pkgdir"/${_mozappdirdev}/sdk/lib/libxul.so
 }
 
 dev() {
-	mkdir -p "$subpkgdir"/usr/lib/
-	mv "$pkgdir"/usr/lib/firefox-devel* "$subpkgdir"/usr/lib/ || return 1
+	mkdir -p "$subpkgdir"/${_mozappdirdev%/*}
+	mv "$pkgdir"/${_mozappdirdev} "$subpkgdir"/${_mozappdirdev%/*} \
+		|| return 1
 	default_dev
 }
 
 md5sums="b0e793898bddf4f2bc46e42a331f3383  firefox-33.0.source.tar.bz2
-3419b00f4787fdb78a1b4b20cecb4f9e  mozconfig
+1f4c60e662ed93784431bd06c5141719  mozconfig
 1515663477ce427cbdc42f04d8d5ca4e  vendor.js
 6ab77b80c8c7d6fd07ab53c54561f4df  0002-Use-C99-math-isfinite.patch
 b18bd948aae828e5c8f5f63e440c96d6  fix-arm-atomics-grsec.patch
@@ -176,10 +182,11 @@ f8bc97333847f37597c0bac0dca64eb2  fix-media.patch
 308ba5b54116a035fe68d0d5c3974857  mozilla-build-arm.patch
 d9a2245b93a7f5855ee029b5fa44e4e9  stat.patch
 4383d038b8d8411ea46f4a109197c19e  stab.h
+15ebeeeb6823c185f4fed98e9bf1b786  rhbz-966424.patch
 ba96924ece1d77453e462429037a2ce5  firefox.desktop
 6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
 sha256sums="1018c2fae8c54c8a45f5a3ce348a2617a3f8039a789b09b7cfa5a27be069b229  firefox-33.0.source.tar.bz2
-2131b4888a1837d211c02afcbd8dacb91795fe66080c4c467a98961087b24deb  mozconfig
+23c2b4535ce83c92ba978e15ce328c9f140def155d12523c00df30baf41b98dc  mozconfig
 d72ca759792cc8c88efc664d30087a139fed7fc3d7d058e4cd9ab287bb80ea46  vendor.js
 080a55182b865471a86fa4b70a66ed9495f1e536f7fdc4060cb8c675b4749c6e  0002-Use-C99-math-isfinite.patch
 ff7cb3c9c4712e0517a6f11e3bf08e9b0d13dbe6384930bdc7f55b1ceed039b5  fix-arm-atomics-grsec.patch
@@ -193,10 +200,11 @@ d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
 6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3  mozilla-build-arm.patch
 a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc  stat.patch
 960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
+a50d15a640f230a2c66e1eb2afd2bed4117605d0f1591dcfec1ca30f0bc2352f  rhbz-966424.patch
 b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda  firefox.desktop
 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3  firefox-safe.desktop"
 sha512sums="856585bedb0c0cc2a5c8591a5a3d373dca66fd8c15dd2c04b09e17e9a2da2bf978e4bff872a814b42e1963c3a6def05ccc0b68d9a8f4e7c9152dca878cf17e51  firefox-33.0.source.tar.bz2
-ba25f4d16fb896edfdb7af882db562654bfc5c3f5f547abf224696836dc4e513b2da22dd35039dc967b441a1ff918e75c54b861d05e9fcb3f58463813c53306b  mozconfig
+e14b4a646230f7a752ef864b0e6a074fdac74d6c4abde2c31656eb10ac6f002a5c664d257bf3f4bd22544f10103e38d5fae49f84fcaae402b81940e72bcfe0e5  mozconfig
 93570f821e59af4d233fc4b1df85e1d145a5e041ad402fd72921987a5a2f5218538d7a13d59bbf0bda5e7df1d5281407674a3765625936340106d1185b15b5d8  vendor.js
 7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8  0002-Use-C99-math-isfinite.patch
 4311464ae52b6d2e2b02c789c6d5fca9b3c211888a983aa609a62c2f2554516fea735ea90673387c69b38a30aa8453ed79faa44b5163df4293880d40df676b2d  fix-arm-atomics-grsec.patch
@@ -210,5 +218,6 @@ f4d1b0814247cdfe1655a0f345def4f80bd66f37ae5b0edc2cd6b8358e39e9a1bcc0a4ed7d1c4074
 e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
 1a8754830dbbf5432a611504c957c4ff24fdc31dc1a5ee7cdd4240bc5c084baa26a24f18527ff398ec81e56a36aee31732138243cf22a6bab89703656ff463e7  stat.patch
 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
+06ededcd196af98b77991dcba3b710b0dfc061404adb4676fcc380be80410a2621f64d67257b0aefdf36f566e0ea1294b5405b7b4db43e83281a1c64d02da579  rhbz-966424.patch
 f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454  firefox.desktop
 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed  firefox-safe.desktop"
diff --git a/testing/firefox/mozconfig b/testing/firefox/mozconfig
index a46b0f71c32..8fbbf3d6e6d 100644
--- a/testing/firefox/mozconfig
+++ b/testing/firefox/mozconfig
@@ -26,6 +26,7 @@ ac_add_options --disable-install-strip
 
 ac_add_options --enable-gstreamer=1.0
 ac_add_options --enable-official-branding
+ac_add_options --enable-optimize="$CFLAGS"
 ac_add_options --enable-startup-notification
 
 ac_add_options --disable-cpp-exceptions
@@ -50,3 +51,4 @@ export USE_SHORT_LIBNAME=1
 mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options USE_SHORT_LIBNAME=1
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
diff --git a/testing/firefox/rhbz-966424.patch b/testing/firefox/rhbz-966424.patch
new file mode 100644
index 00000000000..2be9f931a60
--- /dev/null
+++ b/testing/firefox/rhbz-966424.patch
@@ -0,0 +1,14 @@
+diff -up firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm.966424 firefox-33.0/mozilla-release/toolkit/modules/CertUtils.jsm
+--- mozilla-release/toolkit/modules/CertUtils.jsm.966424	2014-10-14 08:12:14.358697255 +0200
++++ mozilla-release/toolkit/modules/CertUtils.jsm	2014-10-14 08:17:59.962181908 +0200
+@@ -174,7 +174,9 @@ this.checkCert =
+ }
+ 
+ function isBuiltinToken(tokenName) {
+-  return tokenName == "Builtin Object Token";
++  return tokenName == "Builtin Object Token" ||
++         tokenName == "Default Trust" ||
++         tokenName == "System Trust";
+ }
+ 
+ /**