mirror of
https://gitdl.cn/https://github.com/chakralinux/gtk.git
synced 2025-01-25 02:22:13 +08:00
Merge branch 'master' of ssh://git.chakralinux.org/gtk
This commit is contained in:
Jeff Huang
commit
713169a98c
@ -1,5 +1,5 @@
|
|||||||
pkgname=firefox-i18n
|
pkgname=firefox-i18n
|
||||||
pkgver=56.0.2
|
pkgver=57.0
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Language pack for Firefox"
|
pkgdesc="Language pack for Firefox"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
@ -134,95 +134,95 @@ _package() {
|
|||||||
"$pkgdir/usr/lib/firefox/browser/extensions/langpack-$1@firefox.mozilla.org.xpi"
|
"$pkgdir/usr/lib/firefox/browser/extensions/langpack-$1@firefox.mozilla.org.xpi"
|
||||||
}
|
}
|
||||||
|
|
||||||
sha256sums=('d0817e6ca84df88384122e7b7d671bf09a226bb0482427a5097c4a92f7b5060f'
|
sha256sums=('000d31d272ec1dcf94fb47cd006c96ac74c0109ad78ff3c2b66eb7b1db1d3c74'
|
||||||
'7aa54ef5db5825ab3bc9522861b6e34869ccce018785ef633a04c0c261b1af4f'
|
'a3e1aff345f6ffb1e82ba55c04e91ac6da0ae02f8d9146c963c7cec812a788d5'
|
||||||
'8b216d6f4c23263814a7ca8593bc8cef3bae76ffe1b772f1b7944f8c7104a19c'
|
'a8708b1a8b07161e1bbdda9594ae3c17be59916c17fabbb857a51c093f4ae814'
|
||||||
'11b19a35d960bc62f18b78368ee9e4cb3c78fc51f0d4a4f5f486016080da5db0'
|
'8d2ef26e5fb1f2f15585ac1a6af22300f4e9a99caf64f10bb4f9f8d5f4fa6bad'
|
||||||
'63f7105a97ba3bb6c89b470a93ae3ec23a8f3b076cfc08d920ffb655e1d8c870'
|
'1ba6874911e21bc052fafdeae0637a59d05cbcf9602cf7007a685d4b35363525'
|
||||||
'1cf5c2b43b3f9215868a0646b621afaaeb305df74ce1f4895577ff999af700c2'
|
'2bc6b317ae7d4c433e21ba2ebd1d72bf9587edfc9347ca9924cd12fcdd157426'
|
||||||
'790c9de690ea41d65d0826a0b87df8d7954cf0436421536e3a84ccc39ae098ac'
|
'3a60286c17bc34e05550e69b744a27fb0f6e9960cc3aba4c4796150f2bab2bad'
|
||||||
'231085b01e3786c384bd0a2d99ec218369eb0a277386dc18abd889d7cca2cce1'
|
'13db806a1213fb759f4489f6931a9c9309ad7fe3e6f9baeb55796efc9f60f358'
|
||||||
'79770e1cd025e33bb0f4455b6a9ac61affe6643b9e9c76986f53406e9463a4b9'
|
'3ccca355b507383473799481468f366c5d9634034863bdd519ab733867d17851'
|
||||||
'b0f3cdb6e5f027db26408a323ab871a77cbc172d88896ab230bf2c1aab200fde'
|
'0c27d535c64640fd1a1571295257867bda0d637f0559c62ce6637478bcdc38ab'
|
||||||
'8ff63363a0096d71022469b905ec245d2bea7c9c316ca3a31136f155d26c73b1'
|
'1fa26a6217a90f22ac169e065237e94cbc290d75a42cfbe48f4635cc51be1412'
|
||||||
'630623d5f86256c516f36f197781dc770bde150288a00ddd1e66de192f01dcb1'
|
'4cd909d163eee151735133ea95e1fe84717faf3ce1a8080a12bb1f3dac1eea03'
|
||||||
'ff5cd8c7a8e95c3573e267e6b02eee92b7dade158a3986a5bbb489b0ab856cd7'
|
'5f2cc97712cbf62111cab6491d4bfe771aecebf5a3cc908bc3888da1098b2061'
|
||||||
'4b2f4f90afc26813d92efd1cb4144e0afdee4db61567afa6a3346445bc2ef3db'
|
'e424f912ca1a20f81fb431743eda49df3bc606ae8cd97b606e439731fea3502f'
|
||||||
'60885a8816e8d78ad6b1b464e1951756a9a054aab9d135a3ddb8d69454eaa7ab'
|
'6be7c22952f9fd2a9ea366514851666351560bde940d925ee0887a5b0bebb38f'
|
||||||
'c005c7c5cdec2d4eb96187d95e1a0e274427c1c38a0115afdae761395a0f1c7f'
|
'b38844f23dec6eb91ce3a39e1b1011326b337f7196f14711e0b2bcf8a6af4c8e'
|
||||||
'700653cae68d7d455066d9e99b934ebfe537d7ff24ce7862c836266655817a60'
|
'0efd0ae87321a8debe51964367c9d037f863585842b97cae16e6358e0c96f833'
|
||||||
'2442762289d22566ef013dd29e8342004c7d635d9e8398055c8dfdbe110c1fec'
|
'd77316afaacf861a82584138bd45c97c5caca45f08dc7150b2ab45dad93d1861'
|
||||||
'ef857f33908b205a109746f68ac7cbda75ffa532427a4f9949726bcf8b611d9e'
|
'06506d93eb70c3421cee089fe11dbd9ec98b768e3cd27524221a777cea94e11d'
|
||||||
'438744a069181ece415ae9c64c03ffcf62d9f0026307decc3c9845bfbf37f1b0'
|
'7dffebb5f774086c6c2b06a1b31bf72090342882cea93982506448e7115752de'
|
||||||
'618f390c9a36aed65860d6ad20444c9c6224471d0a394de92a21262291327ff2'
|
'ac8b76c6ad2f10b62c784cb97b30b7c8cf0b466102a3732199a2ce5f355aa0db'
|
||||||
'225f5fccd35ad0992f6ff326178a4541624494f1539c7391a78247f2aeaaadf9'
|
'002ab3c4a68c97edb3c1a9c14ebd33e36089f20dbd05d7287cbce2d874aa9b5e'
|
||||||
'6f04c2318e32e84645dcdf5eb183265a293b0093dc047253afdb37af929ae2ac'
|
'd955820a9f8cc45357a73465f99b2ef7ec9c52def3f91d86b6c96d7d7b681b36'
|
||||||
'413250f4f044d57d5501b56333e0ac43beb4ea99e55f0543c9df3e6b486ec606'
|
'38510cb43907ffaa51ef7c561edc591fcbed6fa2964d4af441c341e3a83b22c3'
|
||||||
'2225d7b80ee44a76914acf7b0cdb660c5d7f966764ec774edc1e2a4d2b838098'
|
'a016bcb97ba15d3ed7be5687c0304deb5c8cb0b3b66f4dda9257ea479ef905f2'
|
||||||
'8136621a736ef72c33c6ddbea3d4d661d59e66a5342d86870b0c9dd578f2fc10'
|
'dcbed2cae03babd17d915887deed8105d54d29b42e9d948a56cd4ac79e7d48cb'
|
||||||
'7feef7afee45eb366ba8c885a9b09a5708323bec2e39302e1bdf1a99d355bf67'
|
'89b622ab51acbd5344ef7ba41183a633b2f9c30f2eee46270454b6ff6845c705'
|
||||||
'81a3f544305c02cd0b866a5175ba803672a75e5a0e94f2e9b4dcfa8d63fddb7b'
|
'aa3e3b5d6394a703caadc0edf143bd3f426e6b7602228a20eeee1dfa0c90dcd9'
|
||||||
'b44b98577b188a911792e139bbcc60b1b11301bbf158857772bdead139520005'
|
'e3b4cdff9951a1794ca7b58d66f1fa8f54a821d288b9fa562758cffb0eed90a1'
|
||||||
'91b6ab3bbff0f4e2c2913b2202cb56de6a8c1ec1ece15af2cc4e853e82d4a79e'
|
'ea79eec0ab147b1adad6c822fc2d143376554bd7571637aedc6be183937f5e23'
|
||||||
'1de771a70a98fb3042f3c0c9c3f9b2a9bad37365c7cc77de7739b0f0d6a2eed2'
|
'f6f39dba4b8526bbd78cc8cee7268a8d9e894d9942177aba4f3c2862435f2370'
|
||||||
'172194ee9b74b765e728d65d98b8faef04c9cf8c73740760597f33351e020656'
|
'64268c589750469ff57cbff54c7f7c5c6b5a816b8ef96675adfdf5c848962865'
|
||||||
'57d1e00d269723302e5787e1e4bf971d1253536f44055abc6762dfd478cd2a05'
|
'9763da205a835bb4217e36ff3ef4d6bdcf341a46be44c43a430576ca694b2ae1'
|
||||||
'0c3f3fcebdc3f3f05979b9aea40f3e6b22fcd03a09af163082887da6274cc2bc'
|
'998a1f5ff2ab5b85e29ecc39b082d9c0f6a9bbdda6010d9da68cc89496446eb9'
|
||||||
'bccd24c6d010d820947e8f0b6ba3c31430fc4dfff22ac80a3f14edb35f67ebf6'
|
'7c964990d19f9487b4421fafad0cc535974fe8edcce51aaebba90919ef20cde4'
|
||||||
'87719a7ade64fb3c98969c116a2fd2c17d8ae95627f69c8d9a358dc997d3b57c'
|
'b0a6fd154dfdb4378b7749ec8535d6e59ec47142dda4be1fda08573c5aebc38e'
|
||||||
'2368cff53b1ea55e1614acd13680465815abdafd558b49588e864e3ec87f2b17'
|
'ab1699b8727aa79e80f4c47b20e5355fb0fecb68c8e27f71791a1cbdc3d8d1ca'
|
||||||
'cea63fc3f9a5c8ffaa1bcab1831e7c3d8af9c449b04eee34edce531edeebc200'
|
'659fd0c6cb77443c38781ddd04039627e725be55536e6f78031c7387bf935574'
|
||||||
'dc1fd0ee6ee55c9c16aa8ea2c5206450e37f44615cf45d66d6f135bcec03b7e1'
|
'0b3145eb603e6216a2319362d56d849a23f60113efe006f2d365a069ae94e43f'
|
||||||
'81dd74079f6e27a36c722570e3849bb36aad5586a8d7e04d99dac8044a90c265'
|
'd7d45cd393fdbc2868cdbacb1dc63958164f561dcfc08603c0decfe83fae7c2f'
|
||||||
'a39b80be8f20245c6a51e9e5609291289777ae715ec78eb8b8b17c3de5c63446'
|
'e9b8f7e973660f2a9574769286cb72a963847fd765a6ba1f3192cdd3139d4d92'
|
||||||
'44783b10ef1aac42d77fa6ac2d9123eb4776916d6ff77dc23fb1dfec97c872f5'
|
'7a10f3862dbbf8b894b6fa5e2af16f576a596621ce0d39dd0c7ffa94bf87f544'
|
||||||
'923c9a94a02ca35f984b1d015ab85e4cfce95f3d4a776e2ad26e7c01a9bbce63'
|
'ebe04b126b79b28865c4596f664ad903ab22773f84f9b0075d498a0d5d467b2a'
|
||||||
'aacc64246c82d9e9e3902c20b4d25ad27a2638565cbb66d9cb8532b4b35167aa'
|
'6c0ebfe0d4f636eee3c4bbe487c65716e4dcade9534e20feb30372b259a13c51'
|
||||||
'c875800738c4ac874d3c5919a99f97b54f3d1367194829b5521fe64cf6e8524f'
|
'd90ffb70c9e5996b97d723999396724ffc9afd9cfc1b8c9992887c23edae447d'
|
||||||
'31f6d4e046ae9b4b68898fb297f1260dc893997c3870ee25d7722d771d9600f7'
|
'55d92e6a196d9aef1476d3d8b28cd1994291c9597b9bf3316f2d7071e3112869'
|
||||||
'9683dc3ce339bc32c22d7418469bc446aeb7185a5fdbbf2cf230f2f2a8ab87ba'
|
'86d8c8b15371d46f41c2e7981690619bd580150b06a2aa200b1e7559fae9fd88'
|
||||||
'e5c2bf9a6a54b7931565635569dc6110e170fec5b8649e2d65bddd1950853598'
|
'47b5a89a66bec891a3713d322b2340b04c4e0f76b438e2be8c9c8c5466c5ca2a'
|
||||||
'5346df648c2f6461dbafba41415e18b2f7fa6aad3fb01847536c0c3aa9cc8d7f'
|
'cf34bea1bbb439bf46eca14ff9455b48be2fec8c4690c96a5d8861af16edd2ba'
|
||||||
'dd875ea1e97f047c8911f42fc71cfe2a47c078515027eb783e128564901793a4'
|
'2dc030e237efbb3a436dfb62d605d4a58e9e4fc74bf8be656bafca29bb47b9c9'
|
||||||
'2c8ca09454919121bba2ece7e8e10e880b3136056fc172c72263c828a0d3e30b'
|
'024896231e76f2a968c2c9ef04f54122baf8be9dd4a891721131b240410a59ca'
|
||||||
'9493d170fd86662b79f435378ddef746309c54c4cab442891f93c74742b625d4'
|
'11111923544044362aa00684df45188aafe2384f8eada7b11aff3095cc5724bf'
|
||||||
'b30eb0af62074ce07db872767523b84caeb34d5c2af6a6a459e8d26fac3e5eab'
|
'1892498318bbf5b9078584903d1917a3887209f27a345fd3f55ede014fca8795'
|
||||||
'32bbdbd4ac73ba701b7a6c0cb4a258c8d3bf84523ae9ea09e76788c72ac369a3'
|
'1aa48ebce8d3a0f5347075e77d5e653932a974fb6a6d9fbd0e20fc9811044508'
|
||||||
'a9c844837b5d56050460b2aa1a85942329dc0a1b6c7e1ab7cf027405761a2773'
|
'fe0495d787aef4501ef9002edaca4b8eec33b653312dc20ee7ad59d3b341824f'
|
||||||
'be74d19b1147eec728d7ba94a2263a7a591a00f85b7db354416eabbe12d250e2'
|
'f1da6436210d15bdf7879167251349bea247baeb33726f64a6d805963ca254d6'
|
||||||
'af413c17b8b2e78c181fb01e4606f613e065b80c90eb3595d87d60019c1b179d'
|
'2fdee372f748540d1caf6a90f3a0cc499e461db9c6e31223cd87da42e96b7754'
|
||||||
'8810ae2a9cc69603c787c1005b7ec79b462ccc624ceefc45770817367193dee6'
|
'8adee1a6343b194effe99b350fa00ab0d4bc43cace5ce2b9f95204aa2a05f6de'
|
||||||
'305bbc719110a54f62ade09507f0ee8d63776b202657cede738c0276ca3d68be'
|
'c76710d9315e89f647cbee0d9eeb198c648c46f18396d936a0097b83494bc638'
|
||||||
'ea064e967b98ae0c2be63a2c8420205b0f6cc7b4f8a09bb5efc2667e5f975695'
|
'1631b239f8ef4594da88801477136fb21124e24889a9d40513486fe513a20e10'
|
||||||
'336024d9736c1c91f1e26c78f1674ca0d87ff2a525d0e98198f44644d09a6708'
|
'3d13ecdf3b894c07b10efe9cb749bab20b78b5528595939892747e7cdafbaefe'
|
||||||
'7ae1c53779714a6d13d51cbe524d72d2560ed75edd6f98bd712d3afd4267876f'
|
'3d647e05560f7156d46b9402a51f21839c497f75aa724d9b351246d43f268cd3'
|
||||||
'd97ff1043dc743bf08664909e93c0e0e6888ac378ff84960fc3eef0b6e7e3154'
|
'39f17884ee2654a8574dc6fb69763fd1d214267fd68fca6af97528255519bc7c'
|
||||||
'5819eeaa1c11e95bd3f0bb077da2370cb82445f893f4b5e7609cc10c367f9b9e'
|
'595fd3d7fa1fb42a63587e99b51b1b24768c38bd6dfaee73d3f9d566797742ec'
|
||||||
'4fbf09e876d1149efff2c94596c5df4e33075fa8f13959b3d584d1cec86810ef'
|
'5ee5297864a542837638c889e6b7a3f548b26ac1d1ac0e2a760d57ca3688b9cc'
|
||||||
'ce35e5b4a54d1bcf958bfaae91c812e44c9fcc2b1c4e78ea22be743ab46e3cea'
|
'76829da5fe24ae3d7d4755f3a6a5ac9722a3363f38b3d09dd5e8c50685edc60f'
|
||||||
'941755d7380c5a14499d0d3d29a2aecfb1fdf1dbeaed31413adbfe9c1725fa1a'
|
'fe36dbd4af9cdf507ad09436abd0a4d1ef93ec0eaa8996afbe5f5aa7437995bc'
|
||||||
'19d3f44ab0108ae7cc2cca69edae09f098825b3398d83e689b0249ac8dfcfb36'
|
'6125cfdb8006bbe755cd8bfdbb81d81d3d3e63e64a95a337469f793ed57bdacc'
|
||||||
'd0010245aa56349913e6402f050edfaf5bc407f134f7ea69f2eac8c7614a1106'
|
'e321b16dea5d23d3875309e9c84293c0cebcce6633a21d18e9d1f7ddb33108c6'
|
||||||
'2480c38b2135ba3085fb838663c1147c204ca332669fa77241909188234df5e0'
|
'ad78266695c1d7ac8738a6206905747bbe818e09c960c65cdc4a622a5a5551f3'
|
||||||
'eca60aa65591f472fe4bc7ec9f100c11768d2e1fbeba17baeb2842c21d893fea'
|
'016a9139bbe373d8e27051f1d4d975132fcc0cb8eb9688380dc164ade190f28e'
|
||||||
'aa3037a3e761bcbfb04a932c16e02db69b5ec16f89493859d9f71f1c3f9c0705'
|
'c6dfd9804797430bbb8f645b25daa0fd0fbf87b9dbe2e869c17f94634da6f098'
|
||||||
'45debcf780622cbcc344e5416844f148918c2ed69e1d81b34d9879fd23a9a950'
|
'4138f1d73b9f2c76d4131cf0e5093791b5e48c3b46f3f09fd3f2302e30da1cde'
|
||||||
'fac6ab423542dfd06a9625cd67e5129c4158b8b4466a7c76b0bfde16c36d44fb'
|
'9d76a50318f27534e14f375379664ee9d8593f4262342216dc86562359d7cbb1'
|
||||||
'a07c61f277c63770f3bf9bdf80cc03f755bbb6d1d941cdda4e598593b58d45bf'
|
'3cda042089cac1a6bed41edab346607649af8c00c9c3993c94e8bc65455b69e6'
|
||||||
'64ce92914c7ee8620c71cfa68b04049563b143e9e0845dc9fe30cf848d975a85'
|
'ca9a8442f5175a3a5e9ad2edbe5a71dc70f5052df3f9d90bf79f369e9a995e53'
|
||||||
'702864bff96ba64c89b80bc82b7a39206415ab8ca41aa26ffb72432d5cdd2f2a'
|
'4769085da20ecaf20e9bc84c99edac5b46ef950324eab9eed34719918d28ca49'
|
||||||
'9a53a263fff54f5f6be085f7447cb2729dfdd0c2847aa324e3060d79f03d45f5'
|
'7e55303212ec089d95a04232462af7769da798591f068a07bc78c92e939768d4'
|
||||||
'bb3eaae8ee775421ddab620b044e587e09fc62863f91ee4a9238344754f68dfa'
|
'0842ca455879824b7ec033b85f2dfb17d11ff39c8cb39223a737f47b1bb02465'
|
||||||
'dc67b5ac78ef1457b3cca25325dd39895e74bd9039004d00cb0c7be909c575f1'
|
'6c0fd2f5d38a98f81b904d0fc57d9ed5ff09ab5155b51d23a587ff1da8ac0a14'
|
||||||
'ac97235b392fe6ffd66099751569b5ca072888fd72f57f0dd84b4c0f2697dc61'
|
'809940be22c381f0de7ba942f217f5ba85ffbf5d58245cf51504be8af06c078e'
|
||||||
'e3186a302c3b8303b0a342fcb52fb07bcbf58f7e0a38c974a9600092f89fc605'
|
'74595b842dd69a7b729881763efedecd13d955107e2a5c4678bb3339e400b414'
|
||||||
'd0f895780cbffbc06e4152bef05cf3f8b2be1426f5ebd0d03d7a139db0e4ced7'
|
'5f926aea491b4f1f7efe60318b14499d06ceb9b7c5d28b29f1795fe6aaf6819b'
|
||||||
'dccbe38897003940ffb072ad401a17ddb546b2507fdf992d6fb50c6841a03b9a'
|
'b5c3d978f79fa9c2d5bd30d8b4fd0247b15c3200f0299d6ef653332821cf4d55'
|
||||||
'9883b8d737439aa213ea2633d4ca4fafa6e5071ca054efbaca645de83480ba70'
|
'f53c558e435e7d5cdba0c3d5e061e42c9b9a8d049e7d3fbc4aaf90c9a2978fd0'
|
||||||
'd2331b224e20d7cd639dc0fad3f3fdbc5f7463b110c2b565340f21f4b7fb669a'
|
'ef7e0ef46b5cba65fa8485ca8ef402e8ee3c77185b829aeea8f2c74ed60c2e1c'
|
||||||
'888a01fcf242133897875b7b48794dad85f5eff776f063c7e83049517ec55314'
|
'e5a8c42179d380abbcbd4f4272ee10b6d1e84b378b37cdc6601c045ee14af4f7'
|
||||||
'5385265d1d851343a056d7fe27a83992ff3ed4e261a9a6c087669c8d2b4549a4'
|
'b2afc5e222e9d2e88af51066f040d6f33075cd1e184d73bba915c79817daa2d3'
|
||||||
'506742794f7d0fd1646abd2de39b34bacd833996a9e9828d0a40b7664ad3f392'
|
'70c806f58b947b816d349bc582f021a854b48eb1144eeb8199deec295274fe1b'
|
||||||
'ed533f9d6f911a49f949b4970a7efa4851e32fa55e4252fc54341f1b4dc1068e'
|
'4bd0bb7111a9e4ad9cf85138d84a291da6d420e7719179c0c487045c1448481f'
|
||||||
'391cff569f3e057fd3af51edebccc0a2aa5389923f3da48f789a162eab9fde5e'
|
'86cb61bf0efd1abe0b8030712db6db44e1cfef23f89c934e0fa97a466f0ebf2b'
|
||||||
'9174e66c2eaced95ae6691a7c58b98e77390efca4d2558fcf58e248418b836a5')
|
'afeaa67e6dbb954b098234a021351d5130a529c7ceb65adddf13ad4177ddebd9')
|
||||||
|
|||||||
@ -1,117 +0,0 @@
|
|||||||
From 2874ecd82e9671f774bdfda41fe0857fcb916c13 Mon Sep 17 00:00:00 2001
|
|
||||||
Message-Id: <2874ecd82e9671f774bdfda41fe0857fcb916c13.1506634385.git.jan.steffens@gmail.com>
|
|
||||||
From: Mike Hommey <mh+mozilla@glandium.org>
|
|
||||||
Date: Wed, 16 Aug 2017 13:16:16 +0900
|
|
||||||
Subject: [PATCH] Bug 1384062 - Make SystemResourceMonitor.stop more resilient
|
|
||||||
to errors. r=ahal,gps
|
|
||||||
|
|
||||||
The poll() call in SystemResourceMonitor.stop might fail even though
|
|
||||||
there is something to read from the pipe, in some corner cases, and
|
|
||||||
python won't let us know about it. In that case, an exception is thrown,
|
|
||||||
leaving the SystemResourceMonitor (and its callers) in a weird state. In
|
|
||||||
practice, this leads BuildMonitor.__exit__ to recall stop, which then
|
|
||||||
fails.
|
|
||||||
|
|
||||||
So when poll() throws an exception, we pretend there's still something
|
|
||||||
to read, and we try to read anyways. If there is something to read,
|
|
||||||
recv() will return it, otherwise, it will throw an exception of its own,
|
|
||||||
which we catch, pretending we're done.
|
|
||||||
|
|
||||||
Furthermore, when there is nothing to read from the pipe, poll() simply
|
|
||||||
returns False, and our loop never sets `done` to True, and we then hit
|
|
||||||
an assert, which doesn't have its place here, so we remove it.
|
|
||||||
|
|
||||||
Finally, the other end of the pipe might have died at any time, making
|
|
||||||
sending over the pipe fail, so we also protect against that.
|
|
||||||
|
|
||||||
With all these changes, it feels like the reason to backout bug 1239939
|
|
||||||
in bug 1272782 should have been dealt with, and we can drop the timeout
|
|
||||||
again.
|
|
||||||
|
|
||||||
--HG--
|
|
||||||
extra : rebase_source : ac72dd5b2602cf3ffddfb429f95e02380f939893
|
|
||||||
---
|
|
||||||
.../mozsystemmonitor/resourcemonitor.py | 38 +++++++++++++++-------
|
|
||||||
1 file changed, 26 insertions(+), 12 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
|
|
||||||
index 8f2ac95cbe505540..38f9bc986ac2a120 100644
|
|
||||||
--- a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
|
|
||||||
+++ b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py
|
|
||||||
@@ -289,47 +289,61 @@ class SystemResourceMonitor(object):
|
|
||||||
assert self._running
|
|
||||||
assert not self._stopped
|
|
||||||
|
|
||||||
- self._pipe.send(('terminate',))
|
|
||||||
+ try:
|
|
||||||
+ self._pipe.send(('terminate',))
|
|
||||||
+ except Exception:
|
|
||||||
+ pass
|
|
||||||
self._running = False
|
|
||||||
self._stopped = True
|
|
||||||
|
|
||||||
self.measurements = []
|
|
||||||
|
|
||||||
- done = False
|
|
||||||
-
|
|
||||||
# The child process will send each data sample over the pipe
|
|
||||||
# as a separate data structure. When it has finished sending
|
|
||||||
# samples, it sends a special "done" message to indicate it
|
|
||||||
# is finished.
|
|
||||||
- while self._pipe.poll(1.0):
|
|
||||||
- start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \
|
|
||||||
- swap_mem = self._pipe.recv()
|
|
||||||
+
|
|
||||||
+ # multiprocessing.Pipe is not actually a pipe on at least Linux. that
|
|
||||||
+ # has an effect on the expected outcome of reading from it when the
|
|
||||||
+ # other end of the pipe dies, leading to possibly hanging on revc()
|
|
||||||
+ # below. So we must poll().
|
|
||||||
+ def poll():
|
|
||||||
+ try:
|
|
||||||
+ return self._pipe.poll(0.1)
|
|
||||||
+ except Exception:
|
|
||||||
+ # Poll might throw an exception even though there's still
|
|
||||||
+ # data to read. That happens when the underlying system call
|
|
||||||
+ # returns both POLLERR and POLLIN, but python doesn't tell us
|
|
||||||
+ # about it. So assume there is something to read, and we'll
|
|
||||||
+ # get an exception when trying to read the data.
|
|
||||||
+ return True
|
|
||||||
+ while poll():
|
|
||||||
+ try:
|
|
||||||
+ start_time, end_time, io_diff, cpu_diff, cpu_percent, virt_mem, \
|
|
||||||
+ swap_mem = self._pipe.recv()
|
|
||||||
+ except Exception:
|
|
||||||
+ # Let's assume we're done here
|
|
||||||
+ break
|
|
||||||
|
|
||||||
# There should be nothing after the "done" message so
|
|
||||||
# terminate.
|
|
||||||
if start_time == 'done':
|
|
||||||
- done = True
|
|
||||||
break
|
|
||||||
|
|
||||||
io = self._io_type(*io_diff)
|
|
||||||
virt = self._virt_type(*virt_mem)
|
|
||||||
swap = self._swap_type(*swap_mem)
|
|
||||||
cpu_times = [self._cpu_times_type(*v) for v in cpu_diff]
|
|
||||||
|
|
||||||
self.measurements.append(SystemResourceUsage(start_time, end_time,
|
|
||||||
cpu_times, cpu_percent, io, virt, swap))
|
|
||||||
|
|
||||||
# We establish a timeout so we don't hang forever if the child
|
|
||||||
# process has crashed.
|
|
||||||
self._process.join(10)
|
|
||||||
if self._process.is_alive():
|
|
||||||
self._process.terminate()
|
|
||||||
self._process.join(10)
|
|
||||||
- else:
|
|
||||||
- # We should have received a "done" message from the
|
|
||||||
- # child indicating it shut down properly. This only
|
|
||||||
- # happens if the child shuts down cleanly.
|
|
||||||
- assert done
|
|
||||||
|
|
||||||
if len(self.measurements):
|
|
||||||
self.start_time = self.measurements[0].start
|
|
||||||
--
|
|
||||||
2.14.2
|
|
||||||
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
|
|
||||||
# HG changeset patch
|
|
||||||
# User Mike Hommey <mh+mozilla@glandium.org>
|
|
||||||
# Date 1502455819 -32400
|
|
||||||
# Node ID 97dae871389b7f22a7096a020781b07a5a61de58
|
|
||||||
# Parent c73f64ef71d2d87f36008f5ff661f4050692bd06
|
|
||||||
Bug 1389436 - Explicitly instantiate gfxFont::GetShapedWord<uint8_t> for its use in gfxTextRun.cpp. r=jfkthame
|
|
||||||
|
|
||||||
diff --git a/gfx/thebes/gfxFont.cpp b/gfx/thebes/gfxFont.cpp
|
|
||||||
--- a/gfx/thebes/gfxFont.cpp
|
|
||||||
+++ b/gfx/thebes/gfxFont.cpp
|
|
||||||
@@ -2634,16 +2634,28 @@ gfxFont::GetShapedWord(DrawTarget *aDraw
|
|
||||||
ShapeText(aDrawTarget, aText, 0, aLength, aRunScript, aVertical,
|
|
||||||
aRounding, sw);
|
|
||||||
|
|
||||||
NS_WARNING_ASSERTION(ok, "failed to shape word - expect garbled text");
|
|
||||||
|
|
||||||
return sw;
|
|
||||||
}
|
|
||||||
|
|
||||||
+template gfxShapedWord*
|
|
||||||
+gfxFont::GetShapedWord(DrawTarget *aDrawTarget,
|
|
||||||
+ const uint8_t *aText,
|
|
||||||
+ uint32_t aLength,
|
|
||||||
+ uint32_t aHash,
|
|
||||||
+ Script aRunScript,
|
|
||||||
+ bool aVertical,
|
|
||||||
+ int32_t aAppUnitsPerDevUnit,
|
|
||||||
+ gfx::ShapedTextFlags aFlags,
|
|
||||||
+ RoundingFlags aRounding,
|
|
||||||
+ gfxTextPerfMetrics *aTextPerf);
|
|
||||||
+
|
|
||||||
bool
|
|
||||||
gfxFont::CacheHashEntry::KeyEquals(const KeyTypePointer aKey) const
|
|
||||||
{
|
|
||||||
const gfxShapedWord* sw = mShapedWord.get();
|
|
||||||
if (!sw) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (sw->GetLength() != aKey->mLength ||
|
|
||||||
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
diff -up firefox-56.0/layout/style/bindgen.toml.in.old firefox-56.0/layout/style/bindgen.toml.in
|
|
||||||
--- firefox-56.0/layout/style/bindgen.toml.in.old 2017-09-27 16:30:14.518213900 +0200
|
|
||||||
+++ firefox-56.0/layout/style/bindgen.toml.in 2017-09-27 16:30:38.089179153 +0200
|
|
||||||
@@ -1,4 +1,5 @@
|
|
||||||
[build]
|
|
||||||
args = [
|
|
||||||
+ "/usr/include",
|
|
||||||
@BINDGEN_CFLAGS@
|
|
||||||
]
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
pkgname=firefox-kde
|
pkgname=firefox-kde
|
||||||
pkgver=57.0
|
pkgver=57.0
|
||||||
pkgrel=0.98
|
pkgrel=1
|
||||||
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
|
pkgdesc="Standalone web browser from mozilla.org with OpenSUSE patch, integrate better with KDE"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
license=('MPL' 'GPL' 'LGPL')
|
license=('MPL' 'GPL' 'LGPL')
|
||||||
@ -35,11 +35,10 @@ install=firefox.install
|
|||||||
#
|
#
|
||||||
# Usually, we also port non-openSUSE specific patch together.
|
# Usually, we also port non-openSUSE specific patch together.
|
||||||
#
|
#
|
||||||
_patchrev=65e317e42eff
|
_patchrev=77c890186192
|
||||||
_kmozillahelper_commit=47e708e
|
_kmozillahelper_commit=47e708e
|
||||||
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
|
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
|
||||||
#source=("https://download-installer.cdn.mozilla.net/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz"
|
source=("https://download-installer.cdn.mozilla.net/pub/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.xz"
|
||||||
source=(https://download-installer.cdn.mozilla.net/pub/firefox/candidates/57.0-candidates/build3/source/firefox-57.0.source.tar.xz
|
|
||||||
"git://github.com/openSUSE/kmozillahelper#commit=${_kmozillahelper_commit}"
|
"git://github.com/openSUSE/kmozillahelper#commit=${_kmozillahelper_commit}"
|
||||||
'firefox.desktop'
|
'firefox.desktop'
|
||||||
'firefox-install-dir.patch'
|
'firefox-install-dir.patch'
|
||||||
@ -60,6 +59,7 @@ source=(https://download-installer.cdn.mozilla.net/pub/firefox/candidates/57.0-c
|
|||||||
"$_patchurl/mozilla-kde.patch"
|
"$_patchurl/mozilla-kde.patch"
|
||||||
'ddg-branding.patch'
|
'ddg-branding.patch'
|
||||||
"$_patchurl/mozilla-openaes-decl.patch"
|
"$_patchurl/mozilla-openaes-decl.patch"
|
||||||
|
"$_patchurl/mozilla-bindgen-systemlibs.patch"
|
||||||
|
|
||||||
# Useless patchset
|
# Useless patchset
|
||||||
#"$_patchurl/gecko-lockdown.patch"
|
#"$_patchurl/gecko-lockdown.patch"
|
||||||
@ -72,7 +72,7 @@ source=(https://download-installer.cdn.mozilla.net/pub/firefox/candidates/57.0-c
|
|||||||
#"$_patchurl/mozilla-prefer_plugin_pref.patch" removed from opensuse. reason: dropped mozilla-prefer_plugin_pref.patch as this feature is likely not worth maintaining further
|
#"$_patchurl/mozilla-prefer_plugin_pref.patch" removed from opensuse. reason: dropped mozilla-prefer_plugin_pref.patch as this feature is likely not worth maintaining further
|
||||||
#"$_patchurl/mozilla-shared-nss-db.patch" shared by default now
|
#"$_patchurl/mozilla-shared-nss-db.patch" shared by default now
|
||||||
)
|
)
|
||||||
sha1sums=('deecd675681105b2618933c080559017f4bb1974'
|
sha1sums=('ce4fb33c451a2fbd0ed24d5f4b2c3c2e4ea22f33'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'1a8ecc6d2cfd97791d8182882a74929f2a7289e9'
|
'1a8ecc6d2cfd97791d8182882a74929f2a7289e9'
|
||||||
'693b54b9206ad854e4d75cbbf393029b77e82153'
|
'693b54b9206ad854e4d75cbbf393029b77e82153'
|
||||||
@ -88,7 +88,8 @@ sha1sums=('deecd675681105b2618933c080559017f4bb1974'
|
|||||||
'1cb412a081404db6ee50dd20438b96857dcfe58f'
|
'1cb412a081404db6ee50dd20438b96857dcfe58f'
|
||||||
'bfd2254e261e232053cbf5eae6db1a2e8f8c4e3d'
|
'bfd2254e261e232053cbf5eae6db1a2e8f8c4e3d'
|
||||||
'9cf8c5a03bcc97b66d97d62d72c325ddb14102cb'
|
'9cf8c5a03bcc97b66d97d62d72c325ddb14102cb'
|
||||||
'ef73665d3eb3e39d4f005e38e6f0d0dc2baad2e8')
|
'ef73665d3eb3e39d4f005e38e6f0d0dc2baad2e8'
|
||||||
|
'edecd379e327956f21b5e873ad213ac4ddf185f0')
|
||||||
|
|
||||||
|
|
||||||
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
|
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
|
||||||
@ -117,7 +118,7 @@ prepare() {
|
|||||||
patch -Np1 -i ../wifi-fix-interface.patch
|
patch -Np1 -i ../wifi-fix-interface.patch
|
||||||
|
|
||||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1341234
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=1341234
|
||||||
patch -Np1 -i ../0003-Added-stylo-nspr-build.patch
|
patch -Np1 -i ../mozilla-bindgen-systemlibs.patch
|
||||||
|
|
||||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
|
# https://bugzilla.mozilla.org/show_bug.cgi?id=1382942
|
||||||
patch -Np1 -i ../no-plt.diff
|
patch -Np1 -i ../no-plt.diff
|
||||||
@ -151,7 +152,7 @@ ac_add_options --enable-gold
|
|||||||
ac_add_options --enable-optimize="-O2"
|
ac_add_options --enable-optimize="-O2"
|
||||||
ac_add_options --enable-jemalloc
|
ac_add_options --enable-jemalloc
|
||||||
ac_add_options --enable-pthreads
|
ac_add_options --enable-pthreads
|
||||||
ac_add_options --disable-stylo
|
ac_add_options --enable-stylo
|
||||||
|
|
||||||
# Release branding
|
# Release branding
|
||||||
ac_add_options --enable-application=browser
|
ac_add_options --enable-application=browser
|
||||||
@ -209,11 +210,6 @@ END
|
|||||||
patch -Np1 -i "$srcdir/ddg-branding.patch"
|
patch -Np1 -i "$srcdir/ddg-branding.patch"
|
||||||
patch -Np1 -i "$srcdir"/pgo-fix-missing-kdejs.patch
|
patch -Np1 -i "$srcdir"/pgo-fix-missing-kdejs.patch
|
||||||
patch -Np1 -i "$srcdir/firefox-no-default-ualocale.patch"
|
patch -Np1 -i "$srcdir/firefox-no-default-ualocale.patch"
|
||||||
|
|
||||||
mkdir -vp "$srcdir/path"
|
|
||||||
|
|
||||||
# WebRTC build tries to execute "python" and expects Python 2
|
|
||||||
ln -sf /usr/bin/python2 "$srcdir/path/python"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
@ -245,8 +241,6 @@ build_firefox() {
|
|||||||
# GCC 6
|
# GCC 6
|
||||||
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
|
CXXFLAGS+=" -fno-delete-null-pointer-checks -fno-lifetime-dse -fno-schedule-insns2"
|
||||||
|
|
||||||
export PATH="$srcdir/path:$PATH"
|
|
||||||
export PYTHON="/usr/bin/python2"
|
|
||||||
export SHELL=/bin/bash
|
export SHELL=/bin/bash
|
||||||
|
|
||||||
# Do PGO
|
# Do PGO
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user