mirror of
https://gitdl.cn/https://github.com/chakralinux/gtk.git
synced 2025-02-03 21:47:14 +08:00
update firefox
This commit is contained in:
Weng Xuetian
parent
d4f43cf9ec
commit
eb1055f907
@ -1,5 +1,5 @@
|
|||||||
pkgname=firefox-i18n
|
pkgname=firefox-i18n
|
||||||
pkgver=31.0
|
pkgver=32.0
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Language pack for Firefox"
|
pkgdesc="Language pack for Firefox"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
@ -27,6 +27,7 @@ _languages=(
|
|||||||
'cy "Welsh"'
|
'cy "Welsh"'
|
||||||
'da "Danish"'
|
'da "Danish"'
|
||||||
'de "German"'
|
'de "German"'
|
||||||
|
'dsb "Dolnoserbski"'
|
||||||
'el "Greek"'
|
'el "Greek"'
|
||||||
'en-GB "English (British)"'
|
'en-GB "English (British)"'
|
||||||
'en-US "English (US)"'
|
'en-US "English (US)"'
|
||||||
@ -50,6 +51,7 @@ _languages=(
|
|||||||
'he "Hebrew"'
|
'he "Hebrew"'
|
||||||
'hi-IN "Hindi (India)"'
|
'hi-IN "Hindi (India)"'
|
||||||
'hr "Croatian"'
|
'hr "Croatian"'
|
||||||
|
'hsb "Upper Sorbian"'
|
||||||
'hu "Hungarian"'
|
'hu "Hungarian"'
|
||||||
'hy-AM "Armenian"'
|
'hy-AM "Armenian"'
|
||||||
'id "Indonesian"'
|
'id "Indonesian"'
|
||||||
@ -141,91 +143,93 @@ _package() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
md5sums=('e2718ded082cd15d9b15b8e281d0a17e'
|
md5sums=('40625b07a4a92e6e39906c74ff324800'
|
||||||
'a9ffe499245027a2d1cb5f80e8e66f99'
|
'34c212772968a8b59c18ba3259cbb881'
|
||||||
'66830ae7f4166db8e9775bd71be7922d'
|
'0803f68b85793edf7da016a562623a9a'
|
||||||
'b77e7bd6bc9729fca08965aa7bf6be80'
|
'6a041cad472819ecd1f65e8c870eef6a'
|
||||||
'5d1a82ea2711a50e0d40392c1b6dd200'
|
'b155cf76226542e559bc2f542368a9b1'
|
||||||
'a09ff9e835985f25347b9183998c1355'
|
'0e21747fb5fafadc8906a5170aa25938'
|
||||||
'4024ab01766c76e729fab83ce5846ff9'
|
'be61bcc2223da6dc99d58d3141636abe'
|
||||||
'5f0021b896e18b64cc743572cb5e97ba'
|
'5b529aee9edbae4b8a6177746b69d05e'
|
||||||
'243d6ccacdcf2b8c694f47c590e8078c'
|
'cfb220e6d23cd47b5b8a9bf93c1d61d8'
|
||||||
'c6d39f729b6cc436b54b83b20ad2e689'
|
'237e68e51ecdc7287edd920a10e2ad0d'
|
||||||
'6a17599f43144f573aeb61bc8e5cf855'
|
'540543fd34e444515ab5d7909a66005d'
|
||||||
'e1931fbf9b7d40601c04f64b73037cdf'
|
'48f8c886411a905c0e6ed67594b54ab2'
|
||||||
'c8a4fb43f6d4c364af886ce628ba078d'
|
'a682594150f0197973e34ae0590e6c7d'
|
||||||
'7105d689b9e398902f570fbaa4cfeb4d'
|
'e127d1ecbd5dcb3a4c995332f4c775b2'
|
||||||
'7cca3d57502826bc92dc0e899ffd7d62'
|
'ee840aca3c573629dd133890dbfa9ad2'
|
||||||
'ed1e104d61bb99ec7b238f43deb48c8f'
|
'737c0e7bfbeb5594e0fae7219575f0a1'
|
||||||
'3c5b0dd90a991a2676345b17740cc7f3'
|
'8e7e0ad74768b26e702f96148d6b1b5b'
|
||||||
'c87ec769317b7fce06914170cccf327d'
|
'539e2dc0f0ec4ea0c5d0b705082def9d'
|
||||||
'362ce94943f03eaf87218db1fef01e1e'
|
'cf1dc269da15ea45d5095132745f88e7'
|
||||||
'93bbdda759407866a2a3f879713ebc4a'
|
'7a5f1881a94d4c529ae40f4c7c2323ca'
|
||||||
'660806aa23f8e784c7a5091ce91628c4'
|
'70446b151101930beeb1416da176b753'
|
||||||
'0bcdbc3b305165899bc8ffd3bc6d3e84'
|
'fbeab7775318ad6f96d988252ddb04c3'
|
||||||
'6992a4ab03e281dc495628fed0528ecf'
|
'ab51445ffa86f893a8e297012d87ab69'
|
||||||
'12785f54f0acf27dc67f8ecd92f28f56'
|
'6e109ed290b9575c3f275c0a1c00c2a3'
|
||||||
'40d42dddeaaa5f1f6d4edeb24d2df660'
|
'587c18b4c0aa8eeeaf1a74e3528b153f'
|
||||||
'd197bdd4d982ff62b7a6a0133d2d817c'
|
'edf87b6297ccdfd711847fecda885e9a'
|
||||||
'b062180f86346b7d8160cd948bc253d2'
|
'8c8f67bf000cde6798ab22cdf777515c'
|
||||||
'27a2b19897a9d812b890eddc6cb14f69'
|
'1061f5bb1eaf45a34854d218bcc53b53'
|
||||||
'8fb589caf5f0a39c4786b1ea3966e1fb'
|
'7cc7536f24f9b6d444eb37543e0cc66a'
|
||||||
'c8513ac2733fcaef2aa4afbe6fb87d20'
|
'2d8bd3434d30bf44f286ee5167bc274b'
|
||||||
'657af0fa3f0618f0afd3c889ff82153e'
|
'ed5b96c49aafe6596ed432f0161c21e9'
|
||||||
'59c9ccdbf7bf93dd3ad135c9a225afca'
|
'da2d95642a73b1f609f0a8ae33045e9f'
|
||||||
'ad153baa32844829de3f6824360aea0d'
|
'74d02f2917b2b6b36ec8b1dfb9038e2a'
|
||||||
'1fc8f29afb5bfd56381a0cc6188cd658'
|
'242717187d72b4b6928462f52e289410'
|
||||||
'fbc803ae4bd7ab10da735827de4ce795'
|
'e4da5ed21794101c1fd6987d29856995'
|
||||||
'b70f48984d837d72c9094fdeec72c2ea'
|
'9e4d019d454400fa5a2d4b39295d7eb8'
|
||||||
'409316195127cf18a7e5415a2c257d81'
|
'eed29f1db1c570ffc072c0c8b56e118c'
|
||||||
'98732ab4db16189e8113af9440f6f50b'
|
'9b5633c4cb4b00742a635e34c6a27882'
|
||||||
'd091264ce24929a537a3f96960066fb4'
|
'4896ee3453794713bcc2f123d30fd611'
|
||||||
'b37fdbc51bdd558f52001c8822342099'
|
'2b82eb25a8f7d2fb0391addfcb7e49b4'
|
||||||
'448160bd6996a7f5b66738a88f824860'
|
'd3821030ca888bcf5ee01db60bdf23ad'
|
||||||
'f85cf3bc26b9a7ccb111361db8d80d40'
|
'5d91c91d81375481382ddc4c2f5686c4'
|
||||||
'65e15dd7dd6a8f1ef35c14b7c90e3c4a'
|
'ba69575bafd9a2cc5632febc5a9c4b93'
|
||||||
'07742e16a889961397a3d0a24f5fa310'
|
'0cc14e9528d67e81c18f29a14b2b8df4'
|
||||||
'c16edec207e0b4bd54804bc473a89d3e'
|
'2306e578ad9be37b5a0b3d55588b3e10'
|
||||||
'002a357780275ff25b9fd2ae8f24e4b1'
|
'f113b5ddc743779f8980f38069224559'
|
||||||
'8267d7cc0d35c9252974e7dc4fa8a1b8'
|
'e4fab5d9a164de455032d8071ffb54b7'
|
||||||
'a90e872b92a2c30e0253a7c19024425f'
|
'b7400195b117312d1d6f10d10e8745bc'
|
||||||
'7a2a7cb33c6ea4a0d42afacdcf78ccfb'
|
'd4220b672646607274016267c919bdc5'
|
||||||
'01581aed654bbb3f7c45a190d1d0e903'
|
'e22f6077675f5123dc91952a4bb4735e'
|
||||||
'4203db5b4ceebea78dfd324c28924dc4'
|
'd0d77d0196ebe665e94f1ef40272bb1d'
|
||||||
'd58410166595179bed22b84bcd0d5416'
|
'21cdd46327f67d6e9bd621a7769823ac'
|
||||||
'3abb6127359789f8a8c55390511f93e4'
|
'c5e098931b2a0b64079f65af5629d3df'
|
||||||
'03b4bd13ce8cd2006af0518cbfd00d95'
|
'0ed96c517c28bd22cd74db91fd0753a2'
|
||||||
'6d9d578c7b04ea0b5db0748e85b2c7d3'
|
'545125fedd25ae7053c25bc5b88ef894'
|
||||||
'fa6a7b4bfa67c1ffd44e732f205e4d50'
|
'7b9d08cf4515adb79c5556126c168e56'
|
||||||
'94d72ba9d5bc5d83a52a0293295cb3c3'
|
'ddf41e3f54d3f622ac04670713efaecd'
|
||||||
'36f1fb8c6950b65d7b309d2930d00806'
|
'5afbb51df563ae78e2b8bb37a6b69486'
|
||||||
'f24833168da365df768a1c817a788460'
|
'641cd1c998fe0f29b54ba8024fe6fc55'
|
||||||
'64a634d1aadbade6f097b2107deda439'
|
'9ef688a3356a84f3035cd576be877c63'
|
||||||
'c581d4e4ee415ff9e52c360a34d1625e'
|
'84f062a289076b6a3a9587d594b60436'
|
||||||
'7d13ac4c679f595326f03c62e7955d84'
|
'a201a270542b8a94a6713afb31cf19b6'
|
||||||
'925a0cbfe321ed25d96d648f8d381588'
|
'e6135981d358c7614a193e900367d524'
|
||||||
'34e5276c8c7deb8a582766df51798601'
|
'6de28890c5dff804131bc3fa5c67ba57'
|
||||||
'2510f2941b91f41bb205584781325785'
|
'e29a46de4264e3f85a27b7c6038d7d9c'
|
||||||
'40d05e711514a3aa3acdc8adcf2880e3'
|
'47f77444145b53ce0bf47cb8d5f211d1'
|
||||||
'f5b52d4d6e3dd9aa9dcd461c5e651dfb'
|
'd9b31f1663c0c09c13d69811843a505f'
|
||||||
'5dea637a1c65e02ead40f215b633860d'
|
'85d9574de660280c76614ab550ae81db'
|
||||||
'0f30ff96d08f820d71c4ae75cd788403'
|
'a37e9469804c16c3898b1c5b6c940452'
|
||||||
'afd1796c8f22d76549b9c326995bef45'
|
'a0f7ad23d3fcc9439cf8c9f64c8ba066'
|
||||||
'd8352668a3a99688960340f53eb470cf'
|
'a04eb0cf58ae72d7e42f689e4236a39c'
|
||||||
'8d203e2d3fc9d31a70cd5c73a6c2286f'
|
'545929390954502d9d680780b1585f71'
|
||||||
'da4a54839bf14b5140efefdbbcdca403'
|
'1cb7cbb4ea35174673d7ccf52853284d'
|
||||||
'68375369f5a4be7f0e637aea21d2dd5c'
|
'706dd7c4ed6c72ddcea0c02587ffcd08'
|
||||||
'85049cfedd4f99809ca5ab0733f62d2f'
|
'c2ef5b34a8fe61fa29f21482fd4b60c7'
|
||||||
'd9001726e01826619f8c9ca58f406f15'
|
'60dac8e3372d57fbf484d6e1bbf1dc11'
|
||||||
'7494bd35268a3e4f39c67df78c8a3ad9'
|
'803693b1bc2dbacc21a83657c16a0cf3'
|
||||||
'026f932deffd9113f1c4ab294ac97a83'
|
'ff69515c586f4e9f8b139b86ea951643'
|
||||||
'aa8035ddc5938159c466fa0dad5145ea'
|
'6fda53c5569e4d548600cb1030b2f8a5'
|
||||||
'73f3ceb92caa4b11de910dcf570423fe'
|
'89d7c5ee3063c7190af37ecd81bd223c'
|
||||||
'a69bffcf2019f15b6f47526e81028d82'
|
'3edd67cd2b6e3c39d72a3dda7f44e44f'
|
||||||
'ec94e171ed779ced99ff7daba1c9f173'
|
'd930ec0a3baea0da46a084cfabf3ada2'
|
||||||
'6c40afa8baedcc816ce2fb97f0d5cec3'
|
'3f60546f249f0af64894384bde154be7'
|
||||||
'cbb0b66e0e9084f0fe40fdfa870e44c9'
|
'b276c9fe63013e97efcc8b88d0b3d07e'
|
||||||
'6236941181c894adc423c43d8423863c'
|
'57c4097c782f66c4dceb7a6c5248cc69'
|
||||||
'0dd049e8422737260551f614dd1b69eb'
|
'114f818589fa7c5dab3162f71ed945d9'
|
||||||
'631fc264dfe55f6d677b86c72cb41aa6'
|
'ddb683964e89b2b1122d4bb7501392c5'
|
||||||
'52c7c71c8a4f534a76aec3f9075138f1')
|
'a5225554d91f5cc204078af5942ed355'
|
||||||
|
'44f8e4de851268d167ee4d351e261b10'
|
||||||
|
'5517f4b86d42453b387327f9b8dee5e2')
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
# Contributor: Weng Xuetian <wengxt@gmail.com>
|
# Contributor: Weng Xuetian <wengxt@gmail.com>
|
||||||
|
|
||||||
pkgname=firefox-kde
|
pkgname=firefox-kde
|
||||||
pkgver=31.0
|
pkgver=32.0
|
||||||
pkgrel=2
|
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"
|
||||||
_kmozillahelper_obsver=b88c72dfdc858f6209feb123227bd7df
|
_kmozillahelper_obsver=b88c72dfdc858f6209feb123227bd7df
|
||||||
_kmozillahelper_pkgname=kmozillahelper
|
_kmozillahelper_pkgname=kmozillahelper
|
||||||
@ -41,7 +41,7 @@ install=firefox.install
|
|||||||
#
|
#
|
||||||
# Usually, we also port non-openSUSE specific patch together.
|
# Usually, we also port non-openSUSE specific patch together.
|
||||||
#
|
#
|
||||||
_patchrev=5cbcc68b9429
|
_patchrev=b2ae89c6dea9
|
||||||
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
|
_patchurl=http://www.rosenauer.org/hg/mozilla/raw-file/$_patchrev
|
||||||
source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.bz2
|
source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/firefox-${pkgver}.source.tar.bz2
|
||||||
mozconfig
|
mozconfig
|
||||||
@ -53,6 +53,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/source/
|
|||||||
"kmozillahelper-0.6.4.tar.bz2::https://api.opensuse.org/public/source/mozilla:Factory/mozilla-kde4-integration/${_kmozillahelper_pkgname}-${_kmozillahelper_pkgver}.tar.bz2?rev=${_kmozillahelper_obsver}"
|
"kmozillahelper-0.6.4.tar.bz2::https://api.opensuse.org/public/source/mozilla:Factory/mozilla-kde4-integration/${_kmozillahelper_pkgname}-${_kmozillahelper_pkgver}.tar.bz2?rev=${_kmozillahelper_obsver}"
|
||||||
|
|
||||||
firefox-install-dir.patch
|
firefox-install-dir.patch
|
||||||
|
rhbz-966424.patch
|
||||||
# Firefox patchset
|
# Firefox patchset
|
||||||
$_patchurl/firefox-kde.patch
|
$_patchurl/firefox-kde.patch
|
||||||
$_patchurl/firefox-kde-114.patch
|
$_patchurl/firefox-kde-114.patch
|
||||||
@ -78,6 +79,7 @@ prepare() {
|
|||||||
|
|
||||||
cp ../mozconfig .mozconfig
|
cp ../mozconfig .mozconfig
|
||||||
patch -Np1 -i ../firefox-install-dir.patch
|
patch -Np1 -i ../firefox-install-dir.patch
|
||||||
|
patch -Np1 -i ../rhbz-966424.patch
|
||||||
|
|
||||||
echo -n "$_google_api_key" > google-api-key
|
echo -n "$_google_api_key" > google-api-key
|
||||||
echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
|
echo "ac_add_options --with-google-api-keyfile=\"$PWD/google-api-key\"" >>.mozconfig
|
||||||
@ -265,3 +267,22 @@ sha1sums=('a6c3e25ee3aeb7da42db2aaeb50a385d63532beb'
|
|||||||
'5f3a1c2ba4ffc3079b916af09e25a237244784c2'
|
'5f3a1c2ba4ffc3079b916af09e25a237244784c2'
|
||||||
'69170917d207096e532f24a83a55dc9d53fa268e'
|
'69170917d207096e532f24a83a55dc9d53fa268e'
|
||||||
'88b724543c5482dc8f94f141e4b87704bf60fff9')
|
'88b724543c5482dc8f94f141e4b87704bf60fff9')
|
||||||
|
sha1sums=('5cb7644af9741ebcdb3a21b777362913908c8f41'
|
||||||
|
'466e1de3c8419ca3f001f66bf526f2aa7f963900'
|
||||||
|
'86d6c2fe4ec2b3072a132e2afbc0ac798fd51e8f'
|
||||||
|
'ca77a08b296f8673828898d91b20cc6dd8742c2f'
|
||||||
|
'ce48f8e5065319e191a7389539ec663dc8a919d7'
|
||||||
|
'0c3900ffe21bfc3d96b80ade334613bc7e76fe27'
|
||||||
|
'e5c91178bc58f2ddc21bd1e4f35837d670d6a0c2'
|
||||||
|
'5543ea72a07fb6f3af19cfbb6d1683a5fddaa807'
|
||||||
|
'a87a6eb5cb86f63e39249c60eb53594ce225dea0'
|
||||||
|
'ad1f05abf477dbc5f7e72c06e37c180459eeffd4'
|
||||||
|
'fe71aa0d177931120bfe02f01e1ed594b7fec2cb'
|
||||||
|
'84e6e4eb614e86baf1ee565da9c2ac505940492a'
|
||||||
|
'35e89b7437a4e9d8d05d26b913a12d3219e34c12'
|
||||||
|
'c8db74154e28c8f7ca17ce9bebf3e5c0f66bba43'
|
||||||
|
'5a38d441d73647b12e1e13416de3fde822dfed18'
|
||||||
|
'05072b88a7707abca65f84cc6d1c4985c6874f6f'
|
||||||
|
'abf48083059246420bd24eba906a9dd7fdd0a1d8'
|
||||||
|
'69170917d207096e532f24a83a55dc9d53fa268e'
|
||||||
|
'88b724543c5482dc8f94f141e4b87704bf60fff9')
|
||||||
|
|||||||
23
firefox-kde/rhbz-966424.patch
Normal file
23
firefox-kde/rhbz-966424.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
--- a/toolkit/modules/CertUtils.jsm
|
||||||
|
+++ b/toolkit/modules/CertUtils.jsm
|
||||||
|
@@ -170,17 +170,19 @@ this.checkCert =
|
||||||
|
issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
|
||||||
|
var tokenNames = issuerCert.getAllTokenNames({});
|
||||||
|
|
||||||
|
if (!tokenNames || !tokenNames.some(isBuiltinToken))
|
||||||
|
throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
|
||||||
|
}
|
||||||
|
|
||||||
|
function isBuiltinToken(tokenName) {
|
||||||
|
- return tokenName == "Builtin Object Token";
|
||||||
|
+ return tokenName == "Builtin Object Token" ||
|
||||||
|
+ tokenName == "Default Trust" ||
|
||||||
|
+ tokenName == "System Trust";
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This class implements nsIBadCertListener. Its job is to prevent "bad cert"
|
||||||
|
* security dialogs from being shown to the user. It is better to simply fail
|
||||||
|
* if the certificate is bad. See bug 304286.
|
||||||
|
*
|
||||||
|
* @param aAllowNonBuiltInCerts (optional)
|
||||||
Loading…
Reference in New Issue
Block a user