~alpine/aports

This thread contains a patchset. You're looking at the original emails, but you may wish to use the patch review UI. Review patch

[alpine-aports] [PATCH] community/firefox: upgrade to 38.5.0

Details
Message ID
<1450741367-1879-1-git-send-email-soeren+git@soeren-tempel.net>
Sender timestamp
1450741367
DKIM signature
missing
Download raw message
Patch: +5 -52
---
 community/firefox/APKBUILD      | 18 +++++-------------
 community/firefox/getchar.patch | 14 --------------
 community/firefox/stat.patch    | 25 -------------------------
 3 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100644 community/firefox/getchar.patch
 delete mode 100644 community/firefox/stat.patch

diff --git a/community/firefox/APKBUILD b/community/firefox/APKBUILD
index 3f1e6c2..eb18e08 100644
--- a/community/firefox/APKBUILD
+++ b/community/firefox/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=firefox
pkgver=38.3.0
pkgver=38.5.0
_pkgver=$pkgver
_xulver=$pkgver
pkgrel=1
pkgrel=0
pkgdesc="Firefox web browser"
url="https://www.mozilla.org/en-US/firefox/organizations/faq/"
arch="all"
@@ -62,9 +62,7 @@ source="http://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox-
	fix-toolkit.patch
	fix-tools.patch
	fix-linux-include.patch
	getchar.patch
	mozilla-build-arm.patch
	stat.patch
	stab.h

	rhbz-966424.patch
@@ -168,7 +166,7 @@ dev() {
	default_dev
}

md5sums="58f9b89c40555322e3aa10cc3531160c  firefox-38.3.0esr.source.tar.bz2
md5sums="5fbaac5168ae0302a3dd7f051f8d7849  firefox-38.5.0esr.source.tar.bz2
1f4c60e662ed93784431bd06c5141719  mozconfig
1515663477ce427cbdc42f04d8d5ca4e  vendor.js
6ab77b80c8c7d6fd07ab53c54561f4df  0002-Use-C99-math-isfinite.patch
@@ -179,16 +177,14 @@ f8bc97333847f37597c0bac0dca64eb2  fix-media.patch
296954be4c6d6bfcc24d0a46a2bd7d74  fix-toolkit.patch
2279c55a85013fc1c0d01427768edd4d  fix-tools.patch
2f0b995b1313884b10e4a61c2ce2cd01  fix-linux-include.patch
507742325de8687529e4e81e31132ddf  getchar.patch
308ba5b54116a035fe68d0d5c3974857  mozilla-build-arm.patch
d9a2245b93a7f5855ee029b5fa44e4e9  stat.patch
4383d038b8d8411ea46f4a109197c19e  stab.h
15ebeeeb6823c185f4fed98e9bf1b786  rhbz-966424.patch
f29e0036edc7b3a4158a82fa97bde500  fix-fortify-inline.patch
9aba3811121f113fe547947591802d2b  fix-fortify-system-wrappers.patch
ba96924ece1d77453e462429037a2ce5  firefox.desktop
6f38a5899034b7786cb1f75ad42032b8  firefox-safe.desktop"
sha256sums="809f65502d256568220c52bfe09646588f21653c8c487e8018b10ff87ca67f1c  firefox-38.3.0esr.source.tar.bz2
sha256sums="2a1f90cfe390ab20be88fed38cb9f61a18281cfbee47505c67e0254d339cdb20  firefox-38.5.0esr.source.tar.bz2
23c2b4535ce83c92ba978e15ce328c9f140def155d12523c00df30baf41b98dc  mozconfig
d72ca759792cc8c88efc664d30087a139fed7fc3d7d058e4cd9ab287bb80ea46  vendor.js
080a55182b865471a86fa4b70a66ed9495f1e536f7fdc4060cb8c675b4749c6e  0002-Use-C99-math-isfinite.patch
@@ -199,16 +195,14 @@ c1d0fbcf5e8610df9adc66ea956753e7d495e8ed2d1c1e06d183f4680c85db97  fix-media.patc
666883189dba3f4c7ba6b5bc85026c85bcb84477c2d5ba00d6414ddd0f744368  fix-toolkit.patch
60ed0870119480994c6c455034c52dd21b8482b7617c3a0032e3b2abf4467e4d  fix-tools.patch
a3a6291888819e0f10e3ca05b2979093b32c723c4bf67b19ea1ab14555085236  fix-linux-include.patch
d14357bf44f702d94b8d3ed79bdf81f6271370745c1ac8fa83522bd98be4adc4  getchar.patch
6f5f5e4d2a17182b72b248e896450235ccdaf63252fdb89a8deb55da8adc9be3  mozilla-build-arm.patch
a0f8a0fa9977ee43f3853b6c6bf5a506fdfabdfa32b4279e0ac3d7a3078f34cc  stat.patch
960d82bbfdc88c95f5cb4f2e1c1bf23dae7519b3b7203914d7b3ddbff1ba4c28  stab.h
a50d15a640f230a2c66e1eb2afd2bed4117605d0f1591dcfec1ca30f0bc2352f  rhbz-966424.patch
ecf808ef1bc2920f6f7a4786fafb46c74e8a2c3bc628f28f10d6e8e1a265e609  fix-fortify-inline.patch
cd19195cb4c316ad9f7d377cd8581218c888863b1bc4d112c97f48a4425fb946  fix-fortify-system-wrappers.patch
b571c4a49884a3c98806246c9cc3e60c73d5a8f4aeb7f96217db0be1d6210eda  firefox.desktop
4b6de45753856a890f4482055666e77f9b01bdfb7e0df08bafaa3a4d9937eed3  firefox-safe.desktop"
sha512sums="e3085663e0692b36cce38ed461d6d0a9b025f7e777aa58a9ee170d904aa1c2de3aa12c480d2d9e37f5d58d4c7d80ad33c913834efc0b350e60b59e55716b180c  firefox-38.3.0esr.source.tar.bz2
sha512sums="058b6a6c2fa9a9ec89253511db000188f1229d07b03e139750f2ee09c68896473eadb6f5042835d557c684a62b58af8a20f0818d6650e157b3fe62adb52f5e94  firefox-38.5.0esr.source.tar.bz2
e14b4a646230f7a752ef864b0e6a074fdac74d6c4abde2c31656eb10ac6f002a5c664d257bf3f4bd22544f10103e38d5fae49f84fcaae402b81940e72bcfe0e5  mozconfig
93570f821e59af4d233fc4b1df85e1d145a5e041ad402fd72921987a5a2f5218538d7a13d59bbf0bda5e7df1d5281407674a3765625936340106d1185b15b5d8  vendor.js
7e123144bc2b1efed149dfb41b255c447d43ea93a63ebe114d01945e6a6d69edc2f2a3c36980a93279106c1842355851b8b6c1d96679ee6be7b9b30513e0b1a8  0002-Use-C99-math-isfinite.patch
@@ -219,9 +213,7 @@ f4d1b0814247cdfe1655a0f345def4f80bd66f37ae5b0edc2cd6b8358e39e9a1bcc0a4ed7d1c4074
72459754016f254c58d56d9a8719897fa8da9cf969eaa498e1e755457942d3f0ac56e4abd3f6a66ef924c94aa034d0af18a1fb653926b2496f0c2615fdb24c5e  fix-toolkit.patch
426b57ce698de3eecd1b52f2998974c4e0b5922584b09b554d436c61fee039d1f86345e746fee067801ebbf50815c4d19b96266a2ed72a35ae5c3edbdb57bba1  fix-tools.patch
2c3319fd625c5d183e310ce6a27ec35e91caafd2206b7b992a539924f9bdb001b0340f1f4451650d4d968134ad35ba1f955cacfff10cb58980f27c42c90d280d  fix-linux-include.patch
18f0696bf4d032c83041110b83ae6531b48474a778fc1deade3b06ba2ae1bfcc9891059287bfb78317c2f5ddc88f5b7ce957312acdb63d4902a57e0b40eb6520  getchar.patch
e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18  mozilla-build-arm.patch
1a8754830dbbf5432a611504c957c4ff24fdc31dc1a5ee7cdd4240bc5c084baa26a24f18527ff398ec81e56a36aee31732138243cf22a6bab89703656ff463e7  stat.patch
0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127  stab.h
06ededcd196af98b77991dcba3b710b0dfc061404adb4676fcc380be80410a2621f64d67257b0aefdf36f566e0ea1294b5405b7b4db43e83281a1c64d02da579  rhbz-966424.patch
09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5  fix-fortify-inline.patch
diff --git a/community/firefox/getchar.patch b/community/firefox/getchar.patch
deleted file mode 100644
index 981206b..0000000
--- a/community/firefox/getchar.patch
@@ -1,14 +0,0 @@
--- ./media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp.orig
+++ ./media/webrtc/trunk/webrtc/system_wrappers/source/spreadsortlib/spreadsort.hpp
@@ -21,6 +21,11 @@
 #include "constants.hpp"
 #include <cstring>
 
+/* prevent the getchar macro from stdio to take preference over the local var */
+#if defined(__UCLIBC__)
+#undef getchar
+#endif
+
 namespace boost {
   namespace detail {
   	//This only works on unsigned data types
diff --git a/community/firefox/stat.patch b/community/firefox/stat.patch
deleted file mode 100644
index ed7dc00..0000000
--- a/community/firefox/stat.patch
@@ -1,25 +0,0 @@
--- ./dom/system/OSFileConstants.cpp.orig	2013-04-17 06:17:29.798371189 +0000
+++ ./dom/system/OSFileConstants.cpp	2013-04-17 06:30:30.032285977 +0000
@@ -509,6 +509,11 @@
   INT_CONSTANT(_STAT_VER),
 #endif // defined(_STAT_VER)
 
+  // glibc's stat/lstat/fstat are macros while uclibc's are not
+#if defined(__GLIBC__) && !defined(__UCLIBC__)
+   { "OSFILE_STAT_MACROS", INT_TO_JSVAL(1) },
+#endif // defined(stat)
+
   PROP_END
 };
 
--- ./toolkit/components/osfile/modules/osfile_unix_back.jsm.orig	2014-04-03 13:08:26.686409787 +0000
+++ ./toolkit/components/osfile/modules/osfile_unix_back.jsm	2014-04-03 13:34:14.101716259 +0000
@@ -512,7 +512,7 @@
                       /*path*/   Type.fd,
                       /*buf*/    Type.stat.out_ptr
                      );
-       } else if (Const._STAT_VER != undefined) {
+       } else if (Const.OSFILE_STAT_MACROS != undefined) {
          const ver = Const._STAT_VER;
          let xstat_name, lxstat_name, fxstat_name;
          if (OS.Constants.Sys.Name == "SunOS") {
-- 
2.6.4



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)