diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/icecat-l10n/PKGBUILD | 224 | ||||
-rw-r--r-- | libre/icecat-l10n/brand.dtd | 9 | ||||
-rw-r--r-- | libre/icecat-l10n/brand.properties | 16 | ||||
-rw-r--r-- | libre/icecat-l10n/browserconfig.properties | 6 | ||||
-rw-r--r-- | libre/icecat-theme-adwaita/PKGBUILD | 10 | ||||
-rw-r--r-- | libre/icecat/PKGBUILD | 60 | ||||
-rw-r--r-- | libre/icecat/fixing_nullptr_31.7.0.patch | 174 | ||||
-rw-r--r-- | libre/icecat/libre.patch | 43 | ||||
-rw-r--r-- | libre/icecat/mozconfig | 3 | ||||
-rw-r--r-- | libre/icecat/mozconfig.pgo | 3 | ||||
-rw-r--r-- | libre/icecat/remove-google-play-services-support.patch | 64 | ||||
-rw-r--r-- | libre/icecat/rhbz-966424.patch | 14 | ||||
-rw-r--r-- | libre/iceweasel/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/iceweasel/vendor.js | 4 | ||||
-rw-r--r-- | libre/lesspipe/PKGBUILD | 24 | ||||
-rw-r--r-- | libre/lesspipe/libarchive.patch | 100 |
16 files changed, 289 insertions, 469 deletions
diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD index b176d542a..bc15d0f2e 100644 --- a/libre/icecat-l10n/PKGBUILD +++ b/libre/icecat-l10n/PKGBUILD @@ -6,9 +6,9 @@ _pkgbase=icecat pkgbase=$_pkgbase-l10n -_pkgver=31.8.0 -pkgver=31.8.0_gnu1 -pkgrel=2 +_pkgver=38.2.0 +pkgver=38.2.0_gnu1 +pkgrel=1 pkgdesc="Language pack for GNU IceCat." arch=('any') url="http://www.gnu.org/software/gnuzilla/" @@ -22,17 +22,22 @@ _languages=( 'an "Aragonese"' 'ar "Arabic"' 'as "Assamese"' + 'ast "Asturian"' + 'az "Azerbaijani"' 'be "Belarusian"' 'bg "Bulgarian"' 'bn-BD "Bengali (Bangladesh)"' + 'bn-IN "Bengali (India)"' 'br "Breton"' 'bs "Bosnian"' + 'ca "Catalan"' 'cs "Czech"' - 'csb "Kashubian"' 'cy "Welsh"' 'da "Danish"' 'de "German"' + 'dsb "Lower Sorbian"' 'el "Greek"' + 'en-GB "English (British)"' # 'en-US "English (US)"' 'en-ZA "English (South African)"' 'eo "Esperanto"' @@ -43,57 +48,79 @@ _languages=( 'et "Estonian"' 'eu "Basque"' 'fa "Persian"' + 'ff "Fulah"' 'fi "Finnish"' 'fr "French"' 'fy-NL "Frisian"' + 'ga-IE "Irish"' 'gd "Gaelic (Scotland)"' 'gl "Galician"' 'gu-IN "Gujarati (India)"' 'he "Hebrew"' + 'hi-IN "Hindi (India)"' 'hr "Croatian"' + 'hsb "Upper Sorbian"' + 'hu "Hungarian"' 'hy-AM "Armenian"' 'id "Indonesian"' + 'is "Icelandic"' 'it "Italian"' + 'ja "Japanese"' 'kk "Kazakh"' 'km "Khmer"' 'kn "Kannada"' - 'ku "Kurdish"' + 'ko "Korean"' 'lij "Ligurian"' 'lt "Lithuanian"' 'lv "Latvian"' 'mai "Maithili"' + 'mk "Macedonian"' 'ml "Malayalam"' 'mr "Marathi"' 'ms "Malay"' 'nb-NO "Norwegian (Bokmål)"' 'nl "Dutch"' + 'nn-NO "Norwegian (Nynorsk)"' + 'or "Oriya"' 'pa-IN "Punjabi (India)"' 'pl "Polish"' 'pt-BR "Portuguese (Brazilian)"' + 'pt-PT "Portuguese (Portugal)"' 'rm "Romansh"' 'ro "Romanian"' 'ru "Russian"' 'si "Sinhala"' + 'sk "Slovak"' 'sl "Slovenian"' 'son "Songhai"' 'sq "Albanian"' + 'sr "Serbian"' + 'sv-SE "Swedish"' 'ta "Tamil"' 'te "Telugu"' + 'th "Thai"' + 'tr "Turkish"' 'uk "Ukrainian"' + 'uz "Uzbek"' + 'vi "Vietnamese"' + 'xh "Xhosa"' + 'zh-CN "Chinese (Simplified)"' 'zh-TW "Chinese (Traditional)"' - 'zu "Zulu"' ) pkgname=() -source=('region.properties') -_url=http://ftp.gnu.org/gnu/gnuzilla/$_pkgver/langpacks +#source=('region.properties') +#_url=http://ftp.gnu.org/gnu/gnuzilla/$_pkgver/langpacks +source=('brand.dtd' 'brand.properties' 'browserconfig.properties' 'region.properties') +_url=http://download.cdn.mozilla.net/pub/firefox/releases/${_pkgver}esr/linux-i686/xpi for _lang in "${_languages[@]}"; do _locale=${_lang%% *} _pkgname=$pkgbase-${_locale,,} pkgname+=($_pkgname) - source+=("$_url/$_pkgbase-$_pkgver.$_locale.langpack.xpi") +# source+=("$_url/$_pkgbase-$_pkgver.$_locale.langpack.xpi") + source+=("$_pkgbase-$_pkgver.$_locale.langpack.xpi::$_url/$_locale.xpi") eval "package_$_pkgname() { _package $_lang }" @@ -109,8 +136,19 @@ _package() { unzip icecat-$_pkgver.$1.langpack.xpi -d $1 rm -v icecat-$_pkgver.$1.langpack.xpi + install -vDm644 $srcdir/brand.dtd $1/browser/chrome/$1/locale/branding/ + install -vDm644 $srcdir/brand.properties $1/browser/chrome/$1/locale/branding/ + install -vDm644 $srcdir/browserconfig.properties $1/browser/chrome/$1/locale/branding/ + mv $1/browser/defaults/preferences/{firefox,icecat}-l10n.js + sed -i '\|firefox-l10n|d' $1/browser/defaults/preferences/icecat-l10n.js install -vDm644 $srcdir/region.properties $1/browser/chrome/$1/locale/browser-region + sed -i 's|Firefox|IceCat| + ' $1/browser/chrome/$1/locale/browser/devtools/sourceeditor.properties \ + $1/browser/chrome/$1/locale/browser/devtools/toolbox.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.dtd \ + $1/browser/chrome/$1/locale/browser/devtools/webide.properties rm -rv $1/{browser/{chrome/.mkdir.done,searchplugins},chrome/{.mkdir.done,$1/locale/$1/global-platform/{mac,win}}} + sed -i -e 's/firefox/icecat/' $1/install.rdf cd $1 zip -r langpack-$1@icecat.mozilla.org.xpi . mv -v langpack-$1@icecat.mozilla.org.xpi $srcdir @@ -119,81 +157,97 @@ _package() { install -vDm644 langpack-$1@icecat.mozilla.org.xpi \ "$pkgdir/usr/lib/icecat/browser/extensions/langpack-$1@icecat.mozilla.org.xpi" - - # Fix a few broken langpacks - # https://bugzilla.mozilla.org/show_bug.cgi?id=832060 - if in_array $1 bg csb; then - pushd "$pkgdir/usr/lib/icecat/browser/extensions" >/dev/null - unzip langpack-$1@icecat.mozilla.org.xpi install.rdf >/dev/null - sed -i '/./,$!d' install.rdf - zip -u langpack-$1@icecat.mozilla.org.xpi install.rdf >/dev/null - rm -v install.rdf - popd >/dev/null - fi } -sha256sums=('fc301f3ce1f7d7cd995c7920af18f638e7dd40ade90318567c2bdb922d9cd11a' - '75ad3b6f73afc0186046b042fdbea35962e0da5d621f308783b7cc4b6bab4797' - '3a142028e90b4d10ce2458753a3a1d22aaf540edc4dc3fec1fa8eb3daf8214c7' - '954346d995584eaed081f758ff310480662ea6baaa3a913867f2a2c3dcb82271' - 'fae24a79b1a76379e651f14825ebf40a91c19712a8d267f5bd474650162877de' - 'aeb33ce69aeeeb8b2d0058899bd074177bedbf765156c4d751185edad306b5a5' - '2b0401a81f61f1fd900536a38c30d9d7f2ee0a6709f58e9281e12e48b8bb20b3' - '6e926d054be858e15c313eb812dbe74c5a75aa3257ca693f255a0ee624bf6a01' - 'e29fe7286beeeadced4bb644b748c638ad32f3f791d223aebaf83d0ac2a4abe2' - '2e7d5ce6e316eaa82506e221e27ba2b785772233011ba1dcc25ff5b693bde9dd' - 'f44e2efa9e8314affd24e29f7f639368fe43e91458be0433dd1121b1dfbc27b1' - '72aea1b22dd86d09db2647a334c0619efb77774a17bed51f862b60a753ac2e65' - '125f09b878ae949ac1db0f6686fc534fc2e52f410aee8538b3497c751ba24ac3' - '52092eee647f47e2ccd7bdaf17fb0fdedce141e4419a45a09601e57a3bc1f4cf' - '027bfa25fbda15af04e5c2965b229ec42d4cb30e203108113aff3895cfcd2d60' - '214d9fbd76ce5e4bf247938761e52219ba6370ef23504467d35ee72ab27118d7' - '554386360ed78f128b8f9e5d781decdc22c43f0b2da2eca51a12017a9575e8c3' - '60f5d85b1b6036654b5e141c019e23073e49d95e117cd3e48a83c35a45e0bea5' - '6ec862fd24b66d0e1adb3afac2304f6fa3bb2d2ccf7ce98ed96908f7125cabd1' - '087d7c85e46825e459569d161646cce867e58accbbfe097cc3296084c29d7a69' - '60b86ff5c57c57aa941347278c7a52307241d50bac72f862f68a7b118b47d524' - '70d67287ac89a539af34e7e88e9fcae80b678e4a919d9dbc772d7711712de313' - 'c405258d7fe875ebf8c9486cc7144863d2bc42f382b91a900e9be0a500f7092d' - '0358cabd6c25674981e0f1f564bbe7491bd8b47834703b1afdc9e52be8bf7c44' - '6f6d83d62c7e9b5135b0dd85e33fb0657a638009281e9932c88f1780dc67a24b' - 'e9e781536b446ac6c801dfb00139d682be3f05f9c14280107fbbdffb4ccd942e' - '1d2fb1b81338ac6fc7a552ff809f587a8c5268c74b1c495e06e65be86045393d' - '8a564feec6669fe79d6cec92bb2f07b3e92ea0d718e58b5e40237e20c117057d' - '2aee274220f409b3210d42d955a9c00811a93513f2e1d9707d82f7a04472024c' - 'bb5d3e3381e0339141f0c0bf57cd18d7b59da905412cc44d730a546ff6388928' - 'bc8d1837532c4b5ca62d251113bffbb166cb3a6a8b9218bf168a9efe2234a760' - '31eb7b0305c50788a2a744d936d5644277d9dcb2c4bd7c4a25bbacf4165f73c3' - 'b0274ad9951e13908b811c09048b48e96f1a0486044b8b6bc7f344d41a9d1112' - 'a6307333f1918be9c1985a25a768d533c2d9417088729d967842141afb83d08b' - 'f4b5a3099f7d507ef70f0537450ba4f0d1f383c9c7a99675606b914387e22c93' - 'e310c7a68283a3160b705bac8c64f59257e3cf552d0755e1ebb2694d551912f8' - '404626f0cf706db523426ea65e7cc2e101d25c859ba31b4faf23a5d191817156' - '0b343af40d361ea6209a4399e6ead0b250126aec42bd3befad0e5dadf4d55ea9' - 'e88473d92936c4b4c86988af32ea8ac2f6132ab1e9335920a6cc11b03bf728c1' - '460fe08777455232e020b699f0da51511e9b62575082cd2ddcf5b934fcd99c2e' - 'bc5ddabeeaaa960f4e9a8a2ce0a33e656bf7a6e158c830e38e2c72260297c6b8' - 'ddd71a5a90525242eaec80ed426a4d2c7c1577cd7db2eb3edac07acb85b0a89c' - '7e9039fa356260ab2e2fbb5ae73f6503cb102f46ccd70c1922cca1ce495b0b94' - '45443c64b216b476d7fb9bd0a03aa4069718e93b093dd6cf0e3090b600704249' - '3da5559ec7f5ffaf7b9e8e1e62f234fc63916a6be35ca8d5efa7857332c2ab8f' - '97c1e100777099c38daae913d87c567554bac1494c588d478ec1fd03d37adde5' - 'd7fbd96680a31480a70fc1fcfb7f84836dad45fa57ede24d2ad93df2e26e9bad' - 'a9fc5ed350a417c38ecda39623502f2901a095377c3f8995a28dfe55ce21ab52' - 'fdf75ce2838af444dc737508e5262fd8575579d5d73b0467408d1e0dfebdbf41' - 'e2f03f67cde25c89d25ca5fa5c565a91f5ebbbe912642adc4edb955b1acc7849' - '1d5797102d9610ec4faf05d6cfb7f05106286f172a44436cdbfcc4c4c7d90759' - '3a7caa3a58af708135c996603fa35a46b3f7d12a397bdda971963b8ee37f14af' - '1319e8db747e517af71c63f7e80b4ee55137c362f38477c30fb9bb3734a1e2c1' - 'aa990edb911c633f09a73e797cff60d2a5bd3b227292cd6acb6b36f80e67721d' - '868a8497cfe0e4a1bee49a9cc02a2854b4f79c956d2aebf08265bd929a479045' - 'e34ea94c89892b41493d3806cf9e689aa302dde4d0a8041041a14fd8137c0904' - 'a152e417463079522db77332b3e54cede90cb737955e1ce3d507e2e6e36f0e6e' - '6b13d79a8b3e1b6b875359aa968bded50c2f6fb68eb6dbfb895900f8071ea732' - '0b8f105e853159e035dfd5eadceb822bdc33db403b57ea1bdc20f9705bf904ca' - 'b417b141277402d55f32bc48b27911d08a381b7c68381dcd9de3ab3e80a10369' - 'a5b0fd320a65b7c58080d92e184c8ce33e3e706001f68045d09ff6051fd51f7f' - '695700e5485182d1dc56287245bf9815dafab8e8024b1c3147319ee8c42530a9' - 'dedc2d4bd1ac97bbd4070024c1a4a061e914fae755fac8069881669cc46095e9' - 'ac7ed07c661e21ddc39095da7b74bab6254031020bc42c30cd1dbca24242139d' - '767fc108f5d963e80bdc551773d54384c6ea02ecda6956fca97f23b65cc2af46') +sha256sums=('c57f9d372f056d79b074976a70d3f8b99ec9379eedd9b7a4ec33608b002b9af9' + 'ce4530dc72a4c01db088b46e7018a29a87fb8b719e6a640c4c97ee0793d8190a' + '9f9a8b54932b3138d15fb050a6b04e574fc018d6acb2b7f23b1a9425513d416f' + 'fc301f3ce1f7d7cd995c7920af18f638e7dd40ade90318567c2bdb922d9cd11a' + '80f2d65db6ba7c1079e36d4540c5364dadf50ee5cc00cdd1f4fe505915b12ef9' + '4d822352bd0dbaa73dd547602e20ccdccb62b3ef9bdeccc03f172511e18b41ed' + 'c58525c2b8bca44c5242e15a3597d3c5af89cbd227a2f37dec0cc64b777eaa2c' + '5e5e573f9cf9bb050ac9e94311887b83684c9933c8ba36021010b093b69c667b' + '690987405cf31ba44a2bc52a040f79e07bdca5e1a68bccb65a94f608dd32a168' + '81ad42dce9d9525aa2d4339e928d5675d4f069b46deffed0c1afa7c29f7b4586' + 'bb1b9b3e7ee14cf447780807ecda9789d696e83a6ceaa83a3f455025462976b0' + 'f025e13585be2126f1f805f431a2aab6f92064970a5d3ecf8e458fb35fcf1b04' + 'd566656889a8922a88bab1a06fcf6e49f1131cc7ebc53aa19ea9b177314a7003' + '1d8a734901cfc8f4a3372ae7586e6615a044757faaa43d0102d687465a7d8646' + '7a6e05c0eab890318718b014402168f30e2593a63cbd639b1dec9bbf88e74b30' + 'e5bc879e345784c9b4d9228a3e8900b4ffa4e643f01546db80cb4d9e11049a34' + '0bf5d0e162a33a5ef6ac3059a5b713d88fff367f7384ad56a594ec07aafce358' + 'd2aaebad9dd838e9cb6aa4d5fcc45cfb2105cd655671455fd5a360ca43302842' + 'd3f1fe4b368d1f30cf93f6dba98af57491f2f23df1754edfc896aa7aef7bab8d' + '7ab25f18ca0e267fcbc30503f47162319a5c1c08e1bc03518bab04c2c8fe59c2' + '23147921fc13063f39818bc2d563d4b07b0a5ab466000d9405fd9b9249e67663' + '6d4cdaa88f41cc5feaae869db51684d85b1b1d6026ba9309c0572261828f8c1b' + 'ff71942cac9c2548caa8f12df7005b5b9f91264f5b7da7360a99a088c4528440' + '24226e706875c0f1c1b18c4f2f55fb83e5963c3e22061a2af436d92e8b66ae29' + '2824d85c15ff1a0ee6bd69228dec418481c9a7c4565beb5b45d0428e0b6f127b' + '7b103f2e7472388b6fea50c602a5950404e9d297a8ede752e04e93fecce4cc1a' + '7c41dc63256b9ae615206cecd5bf008879443791b03269e1d4dfcbb0b6e73fb9' + 'fede8e15d08da232349fd180b17d208d556de12fcb37a98a59362773e67ceca1' + '5957a2f6db01d593b6d82149f1ecd6b129e5322f74a254ac46d07503719e61c9' + '2da47c5401a9e60c84859bd28635cac8bd03d07cfc0d25ffd2fed66819d060bb' + '0d396f5f5ea77920d7273fe4dd3662b08997657c321fb7ae62c9406abd9135e1' + 'fac02f932ee8c93c660daf2b36ca6a8246724dfa5ac040809e6d88eb219b7a03' + '492ac55eceaff28188516c154e738d4189615135e4434cde7d4108c6c92200a2' + '125f97265b11efa49886c6ca9611b6cdedfbaf40ac59fa7ba2f5d86308dbe4e9' + '36e58433af2939b69d461a4d21f8576c2773ab926f95e9742fcfa28c4b8155a9' + 'e56a3252d800bdc5ad2c18badf8a1a6743e7aa4fd29f459a339ef05a26614272' + '959138dcce85fd35da81fc9a1ddc28bfb06435f9a71fa1f2a2cf0b44978cdf70' + '3f86674161098d9446ea0736969c0d030eca100688880921daa8e615a9410e38' + 'bfb2eeb0c787ff5ca2afec939f4da875eb854bc5baafcd61021b2d0a4db4456b' + '8acb2f0a4416f8ef182abcf6450e9169852524c0fbf37dbf15cb5156273eec8c' + '53ecc5c4d83346d327cfea3ed8554b468f9ecb17daba0ee655268a3d1a23d276' + '33799f5f28c4b6fd80f5ecb5b4ac1ff9ebe34461e50c59151d029053f1f73d53' + '98f05fde9c1341b7d32e196660884fa24c266575374aa8fb26859f5fa75b7b46' + '3a9480cd2345f00507ae719c33185acf5e9f66a9c996607dfac0ec95d0d32d89' + '125abeb8f4a881fd68bb8f8bd31d7b89c98d35f3d04e18ade625a74e45723466' + 'a88449a67fdb85b21e031b894fc060e328c42a3ac1a39d13fff8446cc4df00d1' + 'd37fc8e422a2421829665a13c7b39bc18af76afc22639395fe346a3540a360e1' + 'ebdf5d14d7b97eddafe6fedc3b7b58b4823e2ba7e9f019facc65c469a1c0538b' + '861b0ee5cd7130606f8db16d16855a932f62d18ea279aeb425d13043b88afecf' + '17f205a9d775e3a97ea3d7b63ee931f4cf5bb24089978fc979dc4d1b5d057311' + '1da955c3cb53ee2fdbf03454840f2588ec3731b88d5ea31e450c4473eb7c0c8b' + '1b51688caa1e55b2117fe510d31485a3219c3f4446e3475c87699abd460e84b0' + '9a445773926e5abf3df7ed1e4ace90e52c17ffcfc65e76bc81b14ce3f9a47910' + 'fbff5ab8dae477e73725de8f1ee346287aede8c00b6891dbb11d4500b7e6620e' + 'd8756e4efe30cf21178d51ea7186d0bac4980a10fbfb29534d0e3988859d2997' + '19f3413cf7c9e0deaa025d254c8e787f2e2d3dbe0c800841d69f87dd02249b30' + '769ad5652416a94c038f1df689532c35cf00804e7971f7d0bfa7157ebc24e95d' + '692e7fb76eba7b2926300e2ae12dd1215c4010722cd95ece2893556ce1729ff5' + '0e7a1903ee292b3bacf00a876bce9618a869a708820bb04cc4487536b7a09590' + 'c51b1627c24c48721cf799e9438d097d2b815e576042813a15d7631285385499' + 'e4be6327448665795bc83a5de98826bfbc78118d188e7687546b5b5d170a1e3a' + '6aa7b005affd7cdc10d9c42454e841d94ecc94bec273755ef9754e033a3e62be' + '73bb6c2101dfa7876814c68b3b02467608c72e0e8bc3517aa0fec61673069bba' + 'f4f68fd8871ab409f9d3d0540873167e693314278a16508450a359d9cafdfdc3' + '8056a9169fd52a12f8f806f1e2870a2578591df8a2c711786bee7ce84436dbfa' + '5dd497dbddcc664facae77de25b8b3f4e3c87a1747bc44595dd91b716ba82748' + 'a7371d8b484cb686965b3769f0bedf6c8803bbbc05021c8b3e24d99dfe66348d' + '79db2dab58df83d308c614469a7050d3228898fcb2edfbdb9eaf66d37d541719' + 'cbfc04c1b6dd2de9f87bca693b4de8275ab4860cc538c0d7a60fecb58b88c6dd' + 'f7f312ed6907c15004e75cfb95a0e254087932cf8203b1d0419dc1eea055a9c7' + 'd13fcef16af096732c430b699a53b1d0d76eb3829bff5166d876ffcc94e123e7' + '9cd4c26a521f2e0550ea62ddc27ca751a2b3f2fdc6d55af861936abcdd6c1efd' + 'cf88953513fc4b20a5318b3d4e8f771edc7dc3ef3b3b09a8858ad1b9261c0866' + 'd5151574b477c6964461ae75563397ebc8f11dfb9331e2ffeb046a4bd046ea97' + '0289531702f0e2ad68984a9dd939e67dafed98eed7c1a6552d136d759ed74684' + '314d1635548bbfd7f41927cf327c781d03d99b8ed1a2c8775a34ba6cd3b12a85' + 'd40e11bda881fa9703e51065bab7204bc5dad8d4affedd4638cfe96f907ddf07' + '8ba7277af23a615970cc1384d3b54e8d88a3305da9fe03790819e7b1aeb41a15' + '3709b10419d813e3255ef9022e276344ca90788c33858aec111c541b455bb79a' + 'fdc0e581d870726728aad45980c6f10d4141a0b9fa39424e51335c8751063e30' + '6007a48742b675c34bd8a331c201f79a19cb52fe7dd7907cd73e76ff9d0c090c' + '21158bf5a1286bc55dda4e34ef00fecf5490c55da61dfbb8de8a8f15f6c3fb95' + 'ec13ec46f071219815b200ab46f103ebdca82308187562d57ae9ae01a9c234e8' + 'b1ffd8fa3534f51d3ec9294288223898d8c41285c4fa400e096fc7ec1aff8b0b' + '0e15637fcefb0e16c4722c242466d2f67b18eb0fbe79097cc29e5358cf7aa19d' + 'fae94efd727ddd145146d2df759e02e060e8302c666ea6cb2d09558bdff76abe' + 'd9871bbdffe5f9cf5275894c05a7934a21af421c3343844fb5efa78efa06aaa8' + '3c5ff9e17debf3c7d865474262aad09c5e7d98106ecb6395d656caee27c39b61' + '9e7dc043c3aa7890255241bdd0292a01d957fcb77434ed236df07401e3f7a9b2' + 'd41ee639470dce1ff3a103987c16ad5dc32c3b1f468760855d9c840dfbc0a39d' + '6b58c8a6fd5e62933d8ec42758a6fc7dd4794b7f659855331debc876e8b80bec' + 'bb22672b52104fd11c28d5609d2c039dd0b3636445b091523dfb90538cf84e94') diff --git a/libre/icecat-l10n/brand.dtd b/libre/icecat-l10n/brand.dtd new file mode 100644 index 000000000..ff4f95957 --- /dev/null +++ b/libre/icecat-l10n/brand.dtd @@ -0,0 +1,9 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + +<!ENTITY brandShorterName "IceCat"> +<!ENTITY brandShortName "IceCat"> +<!ENTITY brandFullName "GNU IceCat"> +<!ENTITY vendorShortName "GNU"> +<!ENTITY trademarkInfo.part1 ""> diff --git a/libre/icecat-l10n/brand.properties b/libre/icecat-l10n/brand.properties new file mode 100644 index 000000000..73ef20839 --- /dev/null +++ b/libre/icecat-l10n/brand.properties @@ -0,0 +1,16 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +brandShorterName=IceCat +brandShortName=IceCat +brandFullName=Mozilla IceCat +vendorShortName=Mozilla + +homePageSingleStartMain=IceCat Start, a fast home page with built-in search +homePageImport=Import your home page from %S + +homePageMigrationPageTitle=Home Page Selection +homePageMigrationDescription=Please select the home page you wish to use: + +syncBrandShortName=Sync diff --git a/libre/icecat-l10n/browserconfig.properties b/libre/icecat-l10n/browserconfig.properties new file mode 100644 index 000000000..72ab4bed3 --- /dev/null +++ b/libre/icecat-l10n/browserconfig.properties @@ -0,0 +1,6 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Do NOT localize or otherwise change these values +browser.startup.homepage=about:icecat diff --git a/libre/icecat-theme-adwaita/PKGBUILD b/libre/icecat-theme-adwaita/PKGBUILD index d349ac4d6..c8b749cc4 100644 --- a/libre/icecat-theme-adwaita/PKGBUILD +++ b/libre/icecat-theme-adwaita/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: André Silva <emulatorman@parabola.nu> pkgname=icecat-theme-adwaita -pkgver=31.1 +pkgver=38.1 pkgrel=1 pkgdesc="Adwaita theme for IceCat (Matches the default Gnome Shell theme)" url="https://addons.mozilla.org/en-US/firefox/addon/adwaita/" @@ -13,12 +13,16 @@ arch=('any') license=('MPL') depends=("icecat") makedepends=('unzip') -source=("gnome-firefox-theme-${pkgver}.xpi"::"https://github.com/gnome-integration-team/firefox-gnome/releases/download/${pkgver}/gnome-firefox-theme-${pkgver}.xpi") -sha256sums=('6fb71b316db500574a837a511b05219273363c5b8ed05b20fc9e031eff3299db') +source=("gnome-firefox-theme-${pkgver}.xpi"::"https://github.com/gnome-integration-team/firefox-gnome/releases/download/${pkgver}/gnome-firefox-theme.xpi") +sha256sums=('af050237a8cddee0f9123f81a9df58b0b97e94f84059cc67225183cb3243a70e') noextract=("gnome-firefox-theme-${pkgver}.xpi") prepare() { unzip -qo "gnome-firefox-theme-${pkgver}.xpi" -d "${pkgname}-${pkgver}" + # Fix for wrong version number + # https://github.com/gnome-integration-team/firefox-gnome/issues/337 + cd "${pkgname}-${pkgver}" + sed -i "s_\(<em:version>\)35.1\(</em:version>\)_\1${pkgver}\2_" "install.rdf" } package() { diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index db70b8c2c..462ccb6b7 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -13,9 +13,9 @@ _pgo=true pkgname=icecat -_pkgver=31.8.0-gnu1 +_pkgver=38.2.0-gnu1 pkgver=${_pkgver//-/_} -pkgrel=5 +pkgrel=1 pkgdesc="GNU IceCat, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64) @@ -32,32 +32,28 @@ optdepends=('networkmanager: Location detection via available WiFi networks' 'gst-libav: h.264 video') url="http://www.gnu.org/software/gnuzilla/" install=$pkgname.install -source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig} +#source=(http://ftp.gnu.org/gnu/gnuzilla/${_pkgver%-*}/$pkgname-$_pkgver.tar.bz2{,.sig} +source=(http://jenkins.trisquel.info/$pkgname/$pkgname-$_pkgver.tar.bz2 mozconfig - mozconfig.pgo libre.patch gnu_headshadow.png $pkgname.desktop $pkgname-install-dir.patch freetype26.patch vendor.js - rhbz-966424.patch $pkgname-fixed-loading-icon.png - fixing_nullptr_31.7.0.patch) -sha256sums=('370087d0adadf8b1c1e6a9920e26488a8902b9dc461d305f258fddb26a129d87' - 'SKIP' - '541532698e04563ac60cb4d6c75891a8eec828df8dc19e2c20c6f84e560efb56' - '92d7ea9feb8d2814d1abaf5cf4012983a2fb9cc56b26a5d7c7c3898aedf06fb4' - 'df92188c828c104bd52e4eb090fbf3ffd745d890f9252edbf6be6edc6d5ba790' + remove-google-play-services-support.patch) +sha256sums=('eef4addf37f6fc885f28eea936cee7258d42f0cb11d79703ec7ec1fe2b80ef8d' + '33a8cf07373c63a0bea70ec2c3983d2cca990752c0f946cb5dbd91f1e2b6410f' + 'e333901df4fc8a881d08c9434e3c302885ed4a989316114e13af828417510410' '93e3001ce152e1d142619e215a9ef07dd429943b99d21726c25da9ceb31e31cd' '52df9ffeb52166ed4abd9a132ee4a9017b9c4980f0725ba383610ccfb06d4745' '5bdab2de5520fb4d3dbc453d9f73d20e0e077bf652bc780fc17184ba6c718a47' 'b9c440406644fde5097da8717f0b5e5e973d11ec4dd6d4a0570ca7094d96dc85' '977aa49b940f1da049cefa2878a63ac6669a78e63e9d55bb11db7b8f8fb64c33' - 'd25c6e95d20ec622a51346897d986fdd97074023d6a02bee0533773a195f8233' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213' - 'd57d0e4d5bc66323388e8f3c9999ed443abfd304a28a1696cc6f4518ed0d0f2a') -validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez + '9e651b0f7e7d9d663e8b24077d52bad15f011871747743aff60d6e2d7a45ae5b') +#validpgpkeys=('A57369A8BABC2542B5A0368C3C76EED7D7E04784') # Ruben Rodriguez prepare() { export GNU_BUILD="gnuzilla-release" @@ -75,22 +71,9 @@ prepare() { # https://bugzilla.mozilla.org/show_bug.cgi?id=1143411 patch -Np1 -i "$srcdir/freetype26.patch" - # https://bugs.archlinux.org/task/41689 - patch -Np1 -i "$srcdir/rhbz-966424.patch" - - # Patch for GCC 5.1 - patch -Np1 -i "$srcdir/fixing_nullptr_31.7.0.patch" - # Patch and remove anything that's left patch -Np1 -i "$srcdir/libre.patch" - sed -i '\|return| s|Flash|SWF Player|g; - ' browser/base/content/pageinfo/permissions.js \ - browser/base/content/browser-plugins.js - sed -i '\|["]displayName["][:] ["]Flash["]| s|Flash|SWF Player| - \|["]displayName["][:] ["]Shockwave["]| s|Shockwave|DCR Player| - \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player| - \|installLinux| s|true|false| - ' browser/base/content/browser-plugins.js + patch -Np1 -i "$srcdir/remove-google-play-services-support.patch" rm -v browser/base/content/abouthome/snippet*.png || true sed -i '\|abouthome/snippet|d ' browser/base/jar.mn @@ -111,19 +94,6 @@ prepare() { # Load our build config, disable SafeSearch cp "$srcdir/mozconfig" .mozconfig - if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .mozconfig - fi - - # Fixing for libvpx >= 1.4.0 - sed -i 's|IMG_FMT_I420|VPX_IMG_FMT_I420|; - s|PLANE_U|VPX_PLANE_U|; - s|PLANE_V|VPX_PLANE_V|; - s|PLANE_Y|VPX_PLANE_Y|; - s|VPX_VPX_PLANE_|VPX_PLANE_|; - ' content/media/encoder/VP8TrackEncoder.cpp \ - media/webrtc/trunk/webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc - mkdir "$srcdir/path" # WebRTC build tries to execute "python" and expects Python 2 @@ -133,15 +103,10 @@ prepare() { # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure - # Fix tab loading icon (flickers with libpng 1.6) + # Fix tab loading icon (doesn't work with libpng 1.6) # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 - # TODO: Remove this; IceCat 36 might use CSS animations for the loading icon - # https://bugzilla.mozilla.org/show_bug.cgi?id=759252 cp "$srcdir/$pkgname-fixed-loading-icon.png" \ browser/themes/linux/tabbrowser/loading.png - - # Remove non-existent file on Makefile.in - sed -i '\|build/pgo/blueprint/valid.png|d' build/Makefile.in } build() { @@ -150,7 +115,6 @@ build() { cd "$srcdir/$GNU_BUILD" export PATH="$srcdir/path:$PATH" - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" export PYTHON="/usr/bin/python2" if $_pgo; then diff --git a/libre/icecat/fixing_nullptr_31.7.0.patch b/libre/icecat/fixing_nullptr_31.7.0.patch deleted file mode 100644 index ecfca4138..000000000 --- a/libre/icecat/fixing_nullptr_31.7.0.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- a/js/src/builtin/TypedObject.cpp 2015-06-03 22:48:47.000000000 +0200 -+++ b/js/src/builtin/TypedObject.cpp 2015-06-08 16:45:30.918154529 +0200 -@@ -710,12 +710,12 @@ - contents.append(")"); - RootedAtom stringRepr(cx, contents.finishAtom()); - if (!stringRepr) -- return nullptr; -+ return false; - - // Extract ArrayType.prototype - RootedObject arrayTypePrototype(cx, GetPrototype(cx, arrayTypeGlobal)); - if (!arrayTypePrototype) -- return nullptr; -+ return false; - - // Create the instance of ArrayType - Rooted<UnsizedArrayTypeDescr*> obj(cx); -@@ -728,7 +728,7 @@ - if (!JSObject::defineProperty(cx, obj, cx->names().length, - UndefinedHandleValue, nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - args.rval().setObject(*obj); - return true; -@@ -762,7 +762,7 @@ - if (!size.isValid()) { - JS_ReportErrorNumber(cx, js_GetErrorMessage, nullptr, - JSMSG_TYPEDOBJECT_TOO_BIG); -- return nullptr; -+ return false; - } - - // Construct a canonical string `new ArrayType(<elementType>).dimension(N)`: -@@ -775,7 +775,7 @@ - contents.append(")"); - RootedAtom stringRepr(cx, contents.finishAtom()); - if (!stringRepr) -- return nullptr; -+ return false; - - // Create the sized type object. - Rooted<SizedArrayTypeDescr*> obj(cx); -@@ -793,7 +793,7 @@ - if (!JSObject::defineProperty(cx, obj, cx->names().length, - lengthVal, nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - // Add `unsized` property, which is a link from the sized - // array to the unsized array. -@@ -801,7 +801,7 @@ - if (!JSObject::defineProperty(cx, obj, cx->names().unsized, - unsizedTypeDescrValue, nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - args.rval().setObject(*obj); - return true; -@@ -1253,7 +1253,7 @@ - Rooted<TypedProto*> proto(cx); - proto = NewObjectWithProto<TypedProto>(cx, objProto, nullptr, TenuredObject); - if (!proto) -- return nullptr; -+ return false; - proto->initTypeDescrSlot(*descr); - descr->initReservedSlot(JS_DESCR_SLOT_TYPROTO, ObjectValue(*proto)); - -@@ -1358,14 +1358,14 @@ - #define BINARYDATA_SCALAR_DEFINE(constant_, type_, name_) \ - if (!DefineSimpleTypeDescr<ScalarTypeDescr>(cx, global, module, constant_, \ - cx->names().name_)) \ -- return nullptr; -+ return false; - JS_FOR_EACH_SCALAR_TYPE_REPR(BINARYDATA_SCALAR_DEFINE) - #undef BINARYDATA_SCALAR_DEFINE - - #define BINARYDATA_REFERENCE_DEFINE(constant_, type_, name_) \ - if (!DefineSimpleTypeDescr<ReferenceTypeDescr>(cx, global, module, constant_, \ - cx->names().name_)) \ -- return nullptr; -+ return false; - JS_FOR_EACH_REFERENCE_TYPE_REPR(BINARYDATA_REFERENCE_DEFINE) - #undef BINARYDATA_REFERENCE_DEFINE - -@@ -1375,14 +1375,14 @@ - arrayType = DefineMetaTypeDescr<ArrayMetaTypeDescr>( - cx, global, module, TypedObjectModuleObject::ArrayTypePrototype); - if (!arrayType) -- return nullptr; -+ return false; - - RootedValue arrayTypeValue(cx, ObjectValue(*arrayType)); - if (!JSObject::defineProperty(cx, module, cx->names().ArrayType, - arrayTypeValue, - nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - // StructType. - -@@ -1390,14 +1390,14 @@ - structType = DefineMetaTypeDescr<StructMetaTypeDescr>( - cx, global, module, TypedObjectModuleObject::StructTypePrototype); - if (!structType) -- return nullptr; -+ return false; - - RootedValue structTypeValue(cx, ObjectValue(*structType)); - if (!JSObject::defineProperty(cx, module, cx->names().StructType, - structTypeValue, - nullptr, nullptr, - JSPROP_READONLY | JSPROP_PERMANENT)) -- return nullptr; -+ return false; - - // Everything is setup, install module on the global object: - RootedValue moduleValue(cx, ObjectValue(*module)); -@@ -1407,7 +1407,7 @@ - nullptr, nullptr, - 0)) - { -- return nullptr; -+ return false; - } - - return module; -@@ -2466,7 +2466,7 @@ - if (length < 0) { - JS_ReportErrorNumber(cx, js_GetErrorMessage, - nullptr, JSMSG_TYPEDOBJECT_BAD_ARGS); -- return nullptr; -+ return false; - } - Rooted<TypedObject*> obj(cx, createZeroed(cx, callee, length)); - if (!obj) - ---- a/js/src/frontend/BytecodeCompiler.cpp 2015-06-03 22:48:48.000000000 +0200 -+++ b/js/src/frontend/BytecodeCompiler.cpp 2015-06-08 01:15:08.080302638 +0200 -@@ -544,7 +544,7 @@ - - RootedScriptSource sourceObject(cx, CreateScriptSourceObject(cx, options)); - if (!sourceObject) -- return nullptr; -+ return false; - ScriptSource* ss = sourceObject->source(); - - SourceCompressionTask sct(cx); ---- a/js/xpconnect/wrappers/XrayWrapper.cpp 2015-06-03 22:48:45.000000000 +0200 -+++ b/js/xpconnect/wrappers/XrayWrapper.cpp 2015-06-08 01:15:35.672193557 +0200 -@@ -351,7 +351,7 @@ - { - JSAutoCompartment ac(cx, target); - if (!JS_GetClassPrototype(cx, key, protop)) -- return nullptr; -+ return false; - } - return JS_WrapObject(cx, protop); - } ---- a/netwerk/ipc/NeckoParent.cpp 2015-06-03 22:46:41.000000000 +0200 -+++ b/netwerk/ipc/NeckoParent.cpp 2015-06-08 01:16:10.200055747 +0200 -@@ -359,7 +359,7 @@ - RtspChannelParent* p = static_cast<RtspChannelParent*>(aActor); - return p->Init(aConnectArgs); - #else -- return nullptr; -+ return false; - #endif - } - diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index 8138985ad..ee88c6d56 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,19 +1,19 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js ---- a/browser/app/profile/icecat.js 2015-07-13 19:14:27.000000000 -0300 -+++ b/browser/app/profile/icecat.js 2015-08-18 02:36:42.167590967 -0300 -@@ -281,11 +281,6 @@ - pref("browser.slowStartup.timeThreshold", 50000); +--- a/browser/app/profile/icecat.js 2015-08-23 17:05:03.000000000 -0300 ++++ b/browser/app/profile/icecat.js 2015-08-25 04:49:18.450526750 -0300 +@@ -279,11 +279,6 @@ + pref("browser.slowStartup.timeThreshold", 40000); pref("browser.slowStartup.maxSamples", 5); -// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into -// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream -// repackager of this code using an alternate snippet url, please keep your users safe --pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); +-pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.cdn.mozilla.net/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/"); - pref("browser.enable_automatic_image_resizing", true); + pref("browser.casting.enabled", false); pref("browser.chrome.site_icons", true); - pref("browser.chrome.favicons", true); -@@ -1746,11 +1741,6 @@ +@@ -2080,12 +2075,6 @@ pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); pref("pfs.filehint.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%"); @@ -21,6 +21,7 @@ diff -Nur a/browser/app/profile/icecat.js b/browser/app/profile/icecat.js -pref("keyword.URL", "https://duckduckgo.com/html?t=gnu&q=!+"); -pref("browser.search.defaultenginename", "DuckDuckGo"); -pref("browser.search.order.extra.duckduckgo", "DuckDuckGo"); +-pref("browser.search.showOneOffButtons", false); - // https://directory.fsf.org/wiki/Disable_DHE pref("security.ssl3.dhe_rsa_aes_128_sha", false); @@ -690,8 +691,8 @@ diff -Nur a/browser/base/jar.mn b/browser/base/jar.mn content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png) content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png) diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd ---- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-27 16:19:19.000000000 -0200 -+++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-01-29 12:19:21.741429014 -0200 +--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-08-23 17:05:01.000000000 -0300 ++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd 2015-08-25 04:47:50.321608830 -0300 @@ -13,17 +13,6 @@ <!ENTITY abouthome.searchEngineButton.label "Search"> @@ -709,7 +710,7 @@ diff -Nur a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales - <!ENTITY abouthome.bookmarksButton.label "Bookmarks"> <!ENTITY abouthome.historyButton.label "History"> - <!ENTITY abouthome.settingsButton.label "Settings"> + <!-- LOCALIZATION NOTE (abouthome.preferencesButtonWin.label): The label for the diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties --- a/browser/locales/en-US/chrome/browser-region/region.properties 2015-07-13 19:14:26.000000000 -0300 +++ b/browser/locales/en-US/chrome/browser-region/region.properties 2015-08-18 02:43:13.382178053 -0300 @@ -788,8 +789,8 @@ diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/ </DL><p> </DL><p> diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm ---- a/browser/modules/AboutHome.jsm 2014-10-09 12:53:30.000000000 -0200 -+++ b/browser/modules/AboutHome.jsm 2014-10-21 14:54:12.086062616 -0200 +--- a/browser/modules/AboutHome.jsm 2015-08-23 17:04:41.000000000 -0300 ++++ b/browser/modules/AboutHome.jsm 2015-08-25 04:52:43.993422621 -0300 @@ -8,7 +8,7 @@ let Ci = Components.interfaces; let Cu = Components.utils; @@ -799,9 +800,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm Components.utils.import("resource://gre/modules/XPCOMUtils.jsm"); Components.utils.import("resource://gre/modules/Services.jsm"); -@@ -18,66 +18,6 @@ - XPCOMUtils.defineLazyModuleGetter(this, "fxAccounts", - "resource://gre/modules/FxAccounts.jsm"); +@@ -20,68 +20,6 @@ + XPCOMUtils.defineLazyModuleGetter(this, "Promise", + "resource://gre/modules/Promise.jsm"); -// Url to fetch snippets, in the urlFormatter service format. -const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl"; @@ -810,7 +811,9 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm -const STARTPAGE_VERSION = 4; - -this.AboutHomeUtils = { -- get snippetsVersion() STARTPAGE_VERSION, +- get snippetsVersion() { +- return STARTPAGE_VERSION; +- }, - - /* - * showKnowYourRights - Determines if the user should be shown the @@ -866,14 +869,14 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm /** * This code provides services to the about:home page. Whenever * about:home needs to do something chrome-privileged, it sends a -@@ -202,18 +142,9 @@ - ss.promiseInitialized.then(function() { +@@ -246,18 +184,9 @@ + }).then(function(engineName) { let data = { showRestoreLastSession: ss.canRestoreLastSession, - snippetsURL: AboutHomeUtils.snippetsURL, - showKnowYourRights: AboutHomeUtils.showKnowYourRights, - snippetsVersion: AboutHomeUtils.snippetsVersion, - defaultEngineName: Services.search.defaultEngine.name + defaultEngineName: engineName }; - if (AboutHomeUtils.showKnowYourRights) { @@ -882,6 +885,6 @@ diff -Nur a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm - Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true); - } - - if (target) { + if (target && target.messageManager) { target.messageManager.sendAsyncMessage("AboutHome:Update", data); } else { diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 974fcce4d..d85989194 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -14,7 +14,7 @@ ac_add_options --with-system-zlib ac_add_options --with-system-bz2 ac_add_options --with-system-png ac_add_options --with-system-libevent -#ac_add_options --with-system-libvpx +ac_add_options --with-system-libvpx ac_add_options --with-system-icu ac_add_options --enable-system-hunspell ac_add_options --enable-system-sqlite @@ -35,3 +35,4 @@ ac_add_options --disable-debug-symbols # Parabola features ac_add_options --disable-safe-browsing ac_add_options --disable-url-classifier +ac_add_options --disable-eme diff --git a/libre/icecat/mozconfig.pgo b/libre/icecat/mozconfig.pgo deleted file mode 100644 index 71ba205a4..000000000 --- a/libre/icecat/mozconfig.pgo +++ /dev/null @@ -1,3 +0,0 @@ - -# PGO -mk_add_options PROFILE_GEN_SCRIPT='EXTRA_TEST_ARGS=10 $(MAKE) -C $(MOZ_OBJDIR) pgo-profile-run' diff --git a/libre/icecat/remove-google-play-services-support.patch b/libre/icecat/remove-google-play-services-support.patch new file mode 100644 index 000000000..f184b15ad --- /dev/null +++ b/libre/icecat/remove-google-play-services-support.patch @@ -0,0 +1,64 @@ +diff -Nur a/configure b/configure +--- a/configure 2015-08-23 17:05:16.000000000 -0300 ++++ b/configure 2015-08-25 17:13:48.155780403 -0300 +@@ -18883,46 +18883,6 @@ + + + +-if test -n "$MOZ_NATIVE_DEVICES" ; then +- +- +- echo $ac_n "checking for google play services""... $ac_c" 1>&6 +-echo "configure:18891: checking for google play services" >&5 +- GOOGLE_PLAY_SERVICES_LIB="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/libs/google-play-services.jar" +- GOOGLE_PLAY_SERVICES_RES="${ANDROID_SDK_ROOT}/extras/google/google_play_services/libproject/google-play-services_lib/res" +- +- +- if ! test -e $GOOGLE_PLAY_SERVICES_LIB ; then +- { echo "configure: error: You must download Google Play Services to build with native video casting support enabled. Run the Android SDK tool and install Google Play Services under Extras. See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&2; echo "configure: error: You must download Google Play Services to build with native video casting support enabled. Run the Android SDK tool and install Google Play Services under Extras. See http://developer.android.com/google/play-services/setup.html for more info. (looked for $GOOGLE_PLAY_SERVICES_LIB) " 1>&5; exit 1; } +- fi +- echo "$ac_t""$GOOGLE_PLAY_SERVICES_LIB" 1>&6 +- +- ANDROID_APPCOMPAT_LIB="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/libs/android-support-v7-appcompat.jar" +- ANDROID_APPCOMPAT_RES="$ANDROID_COMPAT_DIR_BASE/v7/appcompat/res" +- echo $ac_n "checking for v7 appcompat library""... $ac_c" 1>&6 +-echo "configure:18904: checking for v7 appcompat library" >&5 +- if ! test -e $ANDROID_APPCOMPAT_LIB ; then +- { echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&2; echo "configure: error: You must download the v7 app compat Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_APPCOMPAT_LIB)" 1>&5; exit 1; } +- fi +- echo "$ac_t""$ANDROID_APPCOMPAT_LIB" 1>&6 +- +- +- +- ANDROID_MEDIAROUTER_LIB="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/libs/android-support-v7-mediarouter.jar" +- ANDROID_MEDIAROUTER_RES="$ANDROID_COMPAT_DIR_BASE/v7/mediarouter/res" +- echo $ac_n "checking for v7 mediarouter library""... $ac_c" 1>&6 +-echo "configure:18915: checking for v7 mediarouter library" >&5 +- if ! test -e $ANDROID_MEDIAROUTER_LIB ; then +- { echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&2; echo "configure: error: You must download the v7 media router Android support library when targeting Android with native video casting support enabled. Run the Android SDK tool and install Android Support Library under Extras. See https://developer.android.com/tools/extras/support-library.html for more info. (looked for $ANDROID_MEDIAROUTER_LIB)" 1>&5; exit 1; } +- fi +- echo "$ac_t""$ANDROID_MEDIAROUTER_LIB" 1>&6 +- +- +-fi +- +- +- +- + if test "$MOZ_ENABLE_GTK" -o "$MOZ_ENABLE_QT" + then + succeeded=no +@@ -29180,13 +29140,6 @@ + (''' MOZ_OFFICIAL_BRANDING ''', r''' $MOZ_OFFICIAL_BRANDING ''') + (''' MOZ_BRANDING_DIRECTORY ''', r''' $MOZ_BRANDING_DIRECTORY ''') + (''' MOZ_DISTRIBUTION_ID ''', r''' $MOZ_DISTRIBUTION_ID ''') +- (''' MOZ_NATIVE_DEVICES ''', r''' $MOZ_NATIVE_DEVICES ''') +- (''' GOOGLE_PLAY_SERVICES_LIB ''', r''' $GOOGLE_PLAY_SERVICES_LIB ''') +- (''' GOOGLE_PLAY_SERVICES_RES ''', r''' $GOOGLE_PLAY_SERVICES_RES ''') +- (''' ANDROID_APPCOMPAT_LIB ''', r''' $ANDROID_APPCOMPAT_LIB ''') +- (''' ANDROID_APPCOMPAT_RES ''', r''' $ANDROID_APPCOMPAT_RES ''') +- (''' ANDROID_MEDIAROUTER_LIB ''', r''' $ANDROID_MEDIAROUTER_LIB ''') +- (''' ANDROID_MEDIAROUTER_RES ''', r''' $ANDROID_MEDIAROUTER_RES ''') + (''' _PANGOCHK_CFLAGS ''', list(r''' $_PANGOCHK_CFLAGS '''.split())) + (''' _PANGOCHK_LIBS ''', list(r''' $_PANGOCHK_LIBS '''.split())) + (''' MOZ_PANGO_CFLAGS ''', list(r''' $MOZ_PANGO_CFLAGS '''.split())) diff --git a/libre/icecat/rhbz-966424.patch b/libre/icecat/rhbz-966424.patch deleted file mode 100644 index 9a1c9e2b4..000000000 --- a/libre/icecat/rhbz-966424.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur mozilla-release.orig/toolkit/modules/CertUtils.jsm mozilla-release/toolkit/modules/CertUtils.jsm ---- mozilla-release.orig/toolkit/modules/CertUtils.jsm 2014-10-11 07:06:48.000000000 -0200 -+++ mozilla-release/toolkit/modules/CertUtils.jsm 2014-10-16 03:44:30.226448002 -0200 -@@ -174,7 +174,9 @@ - } - - function isBuiltinToken(tokenName) { -- return tokenName == "Builtin Object Token"; -+ return tokenName == "Builtin Object Token" || -+ tokenName == "Default Trust" || -+ tokenName == "System Trust"; - } - - /** diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index cb7705845..bacb66435 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -24,7 +24,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } pkgname=iceweasel epoch=1 pkgver=$_debver.$_debrel -pkgrel=4 +pkgrel=5 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64) @@ -61,7 +61,7 @@ sha256sums=('ddebb9f43f653b096367fb6851299edae31973d88e8c91c1ec9c9926022ee4d3' '56eba484179c7f498076f8dc603d8795e99dce8c6ea1da9736318c59d666bff6' '2257dc69886bd0b72c48675a27c3a88b9cf6b598252c9e9f1c99763180684fc3' '3aea6676f1e53a09673b6ae219d281fc28054beb6002b09973611c02f827651d' - '153057101644dc764f9cc502ce1c47c66bd89e3eff09db7e9c86d591d0d6f39d' + '0171656480113c6fabfdf5b14effe4ac67fda667682eb692badac81562afa696' '68e3a5b47c6d175cc95b98b069a15205f027cab83af9e075818d38610feb6213') prepare() { diff --git a/libre/iceweasel/vendor.js b/libre/iceweasel/vendor.js index 4f45d6ebb..3b04e96b4 100644 --- a/libre/iceweasel/vendor.js +++ b/libre/iceweasel/vendor.js @@ -97,9 +97,9 @@ pref("app.update.url", "http://127.0.0.1/");" // Spoof the useragent to a generic one pref("general.useragent.compatMode.firefox", true); // Spoof the useragent to a generic one -pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:38.0) Gecko/20100101 Firefox/38.0"); +pref("general.useragent.override", "Mozilla/5.0 (Windows NT 6.1; rv:40.0) Gecko/20100101 Firefox/40.0"); pref("general.appname.override", "Netscape"); -pref("general.appversion.override", "38.0"); +pref("general.appversion.override", "40.0"); pref("general.buildID.override", "Gecko/20100101"); pref("general.oscpu.override", "Windows NT 6.1"); pref("general.platform.override", "Win32"); diff --git a/libre/lesspipe/PKGBUILD b/libre/lesspipe/PKGBUILD index 942b526de..cd1d317a9 100644 --- a/libre/lesspipe/PKGBUILD +++ b/libre/lesspipe/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 130024 2015-03-27 10:04:07Z spupykin $ +# $Id: PKGBUILD 138775 2015-08-26 07:05:31Z spupykin $ # Maintainer (Arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor (Arch): solsTiCe d'Hiver <solstice.dhiver@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=lesspipe -pkgver=1.82 -pkgrel=3.parabola1 -pkgdesc='an input filter for the pager less, with libarchive support' +pkgver=1.83 +pkgrel=1.parabola1 +pkgdesc='an input filter for the pager less, with libarchive recommendation' depends=('less') arch=('any') license=('GPL') @@ -26,19 +26,9 @@ optdepends=('perl' 'imagemagick: support for some image file') url="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html" source=("http://downloads.sourceforge.net/project/lesspipe/lesspipe/$pkgver/lesspipe-$pkgver.tar.gz" - "html2text.patch::https://bugs.archlinux.org/task/44365?getfile=12856" - lesspipe.sh - libarchive.patch) -md5sums=('dd6f7bc9b9f9afaf04c9aa0cdbe9fe56' - '4bb768cae4723b3719a70848d36cf5fe' - '675b56f560c600f43108adfd98222251' - 'ec452ea980d5c1e254e9775fd424c18c') - -prepare() { - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/html2text.patch - patch -Np1 -i ../libarchive.patch -} + lesspipe.sh) +md5sums=('fff7da88b9af45497c493a1682c67652' + '675b56f560c600f43108adfd98222251') build() { cd $srcdir/$pkgname-$pkgver diff --git a/libre/lesspipe/libarchive.patch b/libre/lesspipe/libarchive.patch deleted file mode 100644 index b4fb48788..000000000 --- a/libre/lesspipe/libarchive.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff --git a/configure b/configure -index cbd34af..5df4a31 100755 ---- a/configure -+++ b/configure -@@ -405,8 +405,7 @@ LESS_ADVANCED_PREPROCESSOR N # always interpret textlike files (html, ...) - # compression programs - bzip2 Y # include bzip2 and unzip code, it is fairly essential - unzip Y --rar Y --unrar Y -+bsdtar Y # bsdtar is the best free as in freedom alternative for rar - lzip N # default for lzma, lzip, xz, 7za should probably be N - lzma Y - xz Y -diff --git a/lesspipe.sh b/lesspipe.sh -index c80c75b..262a47b 100755 ---- a/lesspipe.sh -+++ b/lesspipe.sh -@@ -276,12 +276,8 @@ get_cmd () { - cmd=(isrpm "$2" "$file2") - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - cmd=(istemp "unzip -avp" "$2" "$file2") -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- cmd=(istemp "unrar p -inul" "$2" "$file2") -- elif cmd_exist rar; then -- cmd=(istemp "rar p -inul" "$2" "$file2") -- fi -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ cmd=(bsdtar xOf "$2" "$file2") - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - cmd=(istemp "7za e -so" "$2" "$file2") - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7zr; then -@@ -534,14 +530,9 @@ isfinal() { - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - msg "use zip_file${sep}contained_file to view a file in the archive" - istemp "unzip -lv" "$2" -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "unrar v" "$2" -- elif cmd_exist rar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -- fi -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ msg "use rar_file${sep}contained_file to view a file in the archive" -+ bsdtar tf "$2" - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - typeset res - res=$(istemp "7za l" "$2") -diff --git a/lesspipe.sh.in b/lesspipe.sh.in -index 407bc7d..753f3c5 100755 ---- a/lesspipe.sh.in -+++ b/lesspipe.sh.in -@@ -323,17 +323,10 @@ get_cmd () { - elif [[ "$1" = *Zip* || "$1" = *ZIP* ]] && cmd_exist unzip; then - set -A cmd istemp "unzip -avp" "$2" "$file2" - #endif --#ifdef unrar -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- set -A cmd istemp "unrar p -inul" "$2" "$file2" -- elif cmd_exist rar; then -- set -A cmd istemp "rar p -inul" "$2" "$file2" -- fi --#elif rar -- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then -- set -A cmd istemp "rar p -inul" "$2" "$file2" --#endif -+#ifdef bsdtar -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then -+ set -A cmd bsdtar xOf "$2" "$file2" -+#endif - #ifdef 7za - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then - set -A cmd istemp "7za e -so" "$2" "$file2" -@@ -705,19 +698,10 @@ isfinal() { - msg "use zip_file${sep}contained_file to view a file in the archive" - istemp "unzip -lv" "$2" - #endif --#ifdef unrar -- elif [[ "$1" = *RAR\ archive* ]]; then -- if cmd_exist unrar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "unrar v" "$2" -- elif cmd_exist rar; then -- msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -- fi --#elif rar -- elif [[ "$1" = *RAR\ archive* ]] && cmd_exist rar; then -+#ifdef bsdtar -+ elif [[ "$1" = *RAR\ archive* ]] && cmd_exist bsdtar; then - msg "use rar_file${sep}contained_file to view a file in the archive" -- istemp "rar v" "$2" -+ bsdtar tf "$2" - #endif - #ifdef 7za - elif [[ "$1" = *7-zip\ archive* || "$1" = *7z\ archive* ]] && cmd_exist 7za; then |