Dubiousjim: 1 xulrunner, firefox: version bump to 22.0 4 files changed, 27 insertions(+), 24 deletions(-)
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.alpinelinux.org/~alpine/devel/patches/513/mbox | git am -3Learn more about email & git
* xulrunner: remove ns_min.patch * xulrunner: add no-stabs.patch --- main/firefox/APKBUILD | 8 ++++---- main/xulrunner/APKBUILD | 18 +++++++++--------- main/xulrunner/no-stabs.patch | 14 ++++++++++++++ main/xulrunner/ns_min.patch | 11 ----------- 4 files changed, 27 insertions(+), 24 deletions(-) create mode 100644 main/xulrunner/no-stabs.patch delete mode 100644 main/xulrunner/ns_min.patch Not sure if this will work, because my machine keeps running out of memory before the build completes. (Tried supplying "-j 1" to make, but not quitting X.) Anyway, it at least seems to get past the problem with: > #include <stab.h> > ^ albeit not in an especially graceful way.
Natanael Copa <ncopa@alpinelinux.org>it will fail here: chmod 644 mozilla-js.pc chmod 644 mozilla-plugin.pc Warning: Skipping xpcshell Warning: Skipping run-mozilla.sh Warning: Skipping js Warning: Skipping nsinstall Executing /home/ncopa/aports/main/xulrunner/src/mozilla-release/obj-x86_64-unknown-linux-uclibc/dist/bin/xpcshell -g /home/ncopa/aports/main/xulrunner/src/mozilla-release/obj-x86_64-unknown-linux-uclibc/dist/bin/ -a /home/ncopa/aports/main/xulrunner/src/mozilla-release/obj-x86_64-unknown-linux-uclibc/dist/bin/ -f /home/ncopa/aports/main/xulrunner/src/mozilla-release/toolkit/mozapps/installer/precompile_cache.js -e precompile_startupcache("resource://gre/"); /home/ncopa/aports/main/xulrunner/src/mozilla-release/obj-x86_64-unknown-linux-uclibc/dist/bin/xpcshell: symbol 'NS_CStringToUTF16': can't resolve symbol Traceback (most recent call last): File "/home/ncopa/aports/main/xulrunner/src/mozilla-release/toolkit/mozapps/installer/packager.py", line 374, in <module> main() File "/home/ncopa/aports/main/xulrunner/src/mozilla-release/toolkit/mozapps/installer/packager.py", line 366, in main args.source, gre_path, base) File "/home/ncopa/aports/main/xulrunner/src/mozilla-release/toolkit/mozapps/installer/packager.py", line 147, in precompile_cache errors.fatal('Error while running startup cache precompilation') File "/home/ncopa/aports/main/xulrunner/src/mozilla-release/python/mozbuild/mozpack/errors.py", line 101, in fatal self._handle(self.FATAL, msg) File "/home/ncopa/aports/main/xulrunner/src/mozilla-release/python/mozbuild/mozpack/errors.py", line 96, in _handle raise ErrorMessage(msg) mozpack.errors.ErrorMessage: Error: Error while running startup cache precompilation make[2]: *** [stage-package] Error 1 make[2]: Leaving directory `/home/ncopa/aports/main/xulrunner/src/mozilla-release/obj-x86_64-unknown-linux-uclibc/xulrunner/installer' make[1]: *** [install] Error 2 make[1]: Leaving directory `/home/ncopa/aports/main/xulrunner/src/mozilla-release/obj-x86_64-unknown-linux-uclibc' make: *** [install] Error 2 -nc --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---
diff --git a/main/firefox/APKBUILD b/main/firefox/APKBUILD index 6774018..e3151dd 100644 --- a/main/firefox/APKBUILD +++ b/main/firefox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=firefox -pkgver=21.0 +pkgver=22.0 _pkgver=$pkgver _xulver=$pkgver pkgrel=0 @@ -131,21 +131,21 @@ pdfjs() { "$subpkgdir"/$_mozappdir/browser/chrome/ } -md5sums="6e2510e9466b280c367de0e4c05a8840 firefox-21.0.source.tar.bz2 +md5sums="4ffb6d1c1a04ca8e3dbca23df09626dd firefox-22.0.source.tar.bz2 98bcd8b2d33037f12ca513882fc5d831 mozconfig 2328df219e042f6aaec361cbf83cf9e9 firefox-5.0-asciidel.patch 7341e290faecd9a827c4d580142699a5 duckduckgo.patch 1515663477ce427cbdc42f04d8d5ca4e vendor.js ba96924ece1d77453e462429037a2ce5 firefox.desktop 6f38a5899034b7786cb1f75ad42032b8 firefox-safe.desktop" -sha256sums="3909031cb5d403b12c796afb7775b4950f0347786ffd06028761852a1074d91c firefox-21.0.source.tar.bz2 +sha256sums="040d4e7fb5076b6aa25f0d3851f8d98c2a2e72ef1599f4387f09f47f6096515e firefox-22.0.source.tar.bz2 0988b03a0532293fbacfd995cdc93df2a10b873cebf4912e1a96cb86f2321312 mozconfig e1e5b6ab3337a6af5c74be392d32fccfa315191191c622dac4f660157ebf4e7a firefox-5.0-asciidel.patch 034587def9ddd665cc67ebf03db1aae25749ed646e7e8d5758e1278fc75a0f8e duckduckgo.patch d72ca759792cc8c88efc664d30087a139fed7fc3d7d058e4cd9ab287bb80ea46 vendor.js b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda firefox.desktop 4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3 firefox-safe.desktop" -sha512sums="0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab69261e98b503ae6b5b47deac8ebbb982649729e3ed4d9e646f13073e0822 firefox-21.0.source.tar.bz2 +sha512sums="43c46ea0af6741b974d796d0589a879ff29f4489e6f72927ad12c394395321e2d11f78f6b24a145e7375be4cb2e4bec2c1f9c8c01a15d1b8f4eb0faa0504dcb5 firefox-22.0.source.tar.bz2 f5a3842a04d3fbf433f70fbbbefbf8ee2fce2f25fa041bf4920f99c8842c8a16e0aeaf44e64af14cffcb743c8816ba7aebbbe13e07d0b17ee6a50dbad8f7f645 mozconfig 9ccc74883fa4f3861a5ddde1af9c3c0d151fda8ff64df979ee0565ecd2013a875894e5670a0c1d0a28fbb81fb88759777ce7fcb196e582caeb903c760859a1b1 firefox-5.0-asciidel.patch d6907d87c14647e3670aef7d55140990e9132f852a097cdc82f4f6f3c6676f1cb6b4ec5aba40d6bec8e9ad45af5e90c9572c1d11c22f2e96bb1bbf3e1bbbefb0 duckduckgo.patch diff --git a/main/xulrunner/APKBUILD b/main/xulrunner/APKBUILD index 25e1f41..d41c654 100644 --- a/main/xulrunner/APKBUILD +++ b/main/xulrunner/APKBUILD @@ -1,9 +1,9 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=xulrunner -pkgver=21.0 +pkgver=22.0 _ffoxver=$pkgver -pkgrel=1 +pkgrel=0 pkgdesc="runtime environment for xul-based applications" url="http://developer.mozilla.org/en/XULRunner" arch="all" @@ -53,8 +53,8 @@ source="ftp://ftp.mozilla.org/pub/firefox/releases/$pkgver/source/firefox-$pkgve cairo.patch getchar.patch sysconf.patch - ns_min.patch stat.patch + no-stabs.patch moz-libc-filename.patch " # help our shared-object scanner to find the libs @@ -116,7 +116,7 @@ dev() { mv "${pkgdir}"/usr/include "${subpkgdir}"/usr/include } -md5sums="6e2510e9466b280c367de0e4c05a8840 firefox-21.0.source.tar.bz2 +md5sums="4ffb6d1c1a04ca8e3dbca23df09626dd firefox-22.0.source.tar.bz2 faf16153ed2cf1e5b163fed9168cb34f mozconfig f43c1f0ae57aa8289b130c6de8caf3ce 0002-Use-C99-math-isfinite.patch e8b3a22d670241bb5c038729ac49a975 0003-xulrunner-jemalloc-aslr.patch @@ -124,10 +124,10 @@ d3d1e831185da3a3e9ddf56c33449c70 uclibc-malloc_usable_size.patch 6a3942d96c7ce3c63251761cc12c8349 cairo.patch 507742325de8687529e4e81e31132ddf getchar.patch 760c05f196bb6f152d7f895742e6aa02 sysconf.patch -1555e753821d7dd1a731a33fcb1f741b ns_min.patch 623cd16618c57f037ab4132dfe8694b0 stat.patch +cb9c8a02dfff2421e8380eb0b2954eb6 no-stabs.patch 10600ca1b36ff177bf4e301056553cf4 moz-libc-filename.patch" -sha256sums="3909031cb5d403b12c796afb7775b4950f0347786ffd06028761852a1074d91c firefox-21.0.source.tar.bz2 +sha256sums="040d4e7fb5076b6aa25f0d3851f8d98c2a2e72ef1599f4387f09f47f6096515e firefox-22.0.source.tar.bz2 ccb0e3841188952b6f9a3e1766b31eec49534080e656ade029be97df6a8c9674 mozconfig 2f319883300f2aef180bfb80221151fcbb29344a5a0a086d6ad1d80005daf039 0002-Use-C99-math-isfinite.patch 324d5cd26858ad21bb4680db8635fb3fd014bf00a637bf9fb2b118c2925fc5e7 0003-xulrunner-jemalloc-aslr.patch @@ -135,10 +135,10 @@ ccb0e3841188952b6f9a3e1766b31eec49534080e656ade029be97df6a8c9674 mozconfig 519be436124cf9716d3df732e633f5d73c5c9da79bb48447e1d9724baf9b430f cairo.patch d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4 getchar.patch 2dacfceeb78d352321a62c950eb50837307c57720719ea6424681c3f5b0ed1fd sysconf.patch -6fc6f05dd45826ce550902ce4c8feb11abacae94ede413628c37ff03a285f859 ns_min.patch 41d55a1d807c84e624da8c258410e8689559d108a4dc56118c6c4755dee514df stat.patch +d51a7708188e59b59fa5df4cec60bdd87e7b25e19fe13cfae7c578218c44d773 no-stabs.patch b2f72d12a2df3bc84d2582d70ec9fc26099bc87c26c303ec5c08ac2e26fe35db moz-libc-filename.patch" -sha512sums="0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab69261e98b503ae6b5b47deac8ebbb982649729e3ed4d9e646f13073e0822 firefox-21.0.source.tar.bz2 +sha512sums="43c46ea0af6741b974d796d0589a879ff29f4489e6f72927ad12c394395321e2d11f78f6b24a145e7375be4cb2e4bec2c1f9c8c01a15d1b8f4eb0faa0504dcb5 firefox-22.0.source.tar.bz2 914e0dfc9a531f6fbff07a9e250e1146371cbffb5eed7fffaa2c5643f8e7759d62d314b3c2dbc5cf9031b66001bbf05892c9ae5aa2b9e77ffe704837a2938f12 mozconfig 9a6666a3b637549411ea562c9d0d6d617ed48327d0f9e4e64d27f43774c218e6c5cf5fa99d4b339a5a0f89b854a18079392eba0dafc3419adbd4cdd5d71d3f26 0002-Use-C99-math-isfinite.patch 46caf196a9f68614c42b793befc7dc85438d30ce47c06ccc925aae14728d67b0d29192edba430c0a6237192e6d51db26dfc6e6190bc01937a828effd8136f37b 0003-xulrunner-jemalloc-aslr.patch @@ -146,6 +146,6 @@ sha512sums="0607e587a03c7402b186bc6e254f79a6cc29dfdd1836d3857233a0175e0d7e9f03ab 66c6cb290153e4333ffda0407230a7801149864a69eac6adc130653e7cff28b1fbfd9f20cf0cfd4ee35ae3eb8b2dc6357a48024a8e7005218b44d58efbdcf483 cairo.patch 18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520 getchar.patch 0e8d21cd0cec34d7825e59f05669010f9f4bcfb94ca1f5788495cdbd25e9c845d4ca8fa028e599f3464bc4d7827a833708d4513c5082ffbcb5be423318048077 sysconf.patch -0020796ab970a3e6a207e5a5b93251cc075d749dc642175fd811c7af0618b722a7f7d80d00318edc205cac21d14f8fc0487cdb623a558c5f52e936ae873ce4bc ns_min.patch e975bc5a0f77e29a2afb848cd0c164f9c0edabf0d96472d6b23e2b08fa2bbe3b51ee63c16c986e7fc9bc243c666b23c37d0b939cbf4c258b9dce5c3ee77d6f55 stat.patch +22e3291aba71deac0fbfaee9f062daabaeb86d606aa3b8a010da51e4ad6d874960b6ad2b6cfbff8769c5ff1cda9d4f0e519c00c3d899fd7d6a3eb1d2be0fd594 no-stabs.patch 136e3fc82b77562f53b09e5aa1d81f9db43196b6a1a9bbf271651d022837cb565a6807ce62ce7e99cc40db87edbba2b8b6c198761ac6ebee091c0615e10067dd moz-libc-filename.patch" diff --git a/main/xulrunner/no-stabs.patch b/main/xulrunner/no-stabs.patch new file mode 100644 index 0000000..76ad5b6 --- /dev/null +++ b/main/xulrunner/no-stabs.patch @@ -0,0 +1,14 @@ +--- ./toolkit/crashreporter/google-breakpad/src/common/Makefile.in.orig 2013-07-18 13:40:27.554068574 -0400 ++++ ./toolkit/crashreporter/google-breakpad/src/common/Makefile.in 2013-07-18 13:45:20.217384653 -0400 +@@ -77,10 +77,7 @@ TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/ + DEFINES += -DNO_STABS_SUPPORT + else + ifneq (WINNT,$(OS_TARGET)) +-CPPSRCS += \ +- stabs_to_module.cc \ +- stabs_reader.cc \ +- $(NULL) ++DEFINES += -DNO_STABS_SUPPORT + endif + endif + diff --git a/main/xulrunner/ns_min.patch b/main/xulrunner/ns_min.patch deleted file mode 100644 index 826a18b..0000000 --- a/main/xulrunner/ns_min.patch @@ -1,11 +0,0 @@ ---- ./xpcom/io/nsMultiplexInputStream.cpp.orig 2013-04-16 09:33:36.246386974 +0000 -+++ ./xpcom/io/nsMultiplexInputStream.cpp 2013-04-16 09:34:21.240133225 +0000 -@@ -529,7 +529,7 @@ - rv = stream->Tell(&avail); - NS_ENSURE_SUCCESS(rv, rv); - -- int64_t newPos = streamPos + XPCOM_MIN(avail, std::abs(remaining)); -+ int64_t newPos = streamPos + XPCOM_MIN(avail, (int64_t)std::abs(remaining)); - - rv = stream->Seek(NS_SEEK_END, -newPos); - NS_ENSURE_SUCCESS(rv, rv); -- 1.8.3.3 --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---
Dubiousjim <lists+alpine-devel@jimpryor.net>Another Firefox issue I've noticed in 21.0 is that the search box no longer seems to execute any searches---the same problem described at this link: http://www.linuxquestions.org/questions/linux-from-scratch-13/blfs-xulrunner-firefox-21-0-and-search-4175462532/ This is even with fresh profile. Searching from the URL field on the other hand works fine. Perhaps the fix proposed at the above link may resolve the issue. I haven't been able to test this on Firefox 22.0, since as I explained before I can't yet get that to build. I tried to test it on 21.0 without rebuilding, by extracting the /usr/lib/firefox-21.0/browser/chrome/browser.jar file, making the edit, and then re-jarring. However for some reason I can't extract that file, using either fastjar nor unzip. I get error messages saying "Ick! 0" (from fastjar) or Archive: browser.jar unzip: invalid zip magic 00000000 However, `fastjar -tf ...` works ok. Strange. -- Dubiousjim dubiousjim@gmail.com --- Unsubscribe: alpine-devel+unsubscribe@lists.alpinelinux.org Help: alpine-devel+help@lists.alpinelinux.org ---