From 4e8c9530dbbf6c8b4c8147cef8fe9845c8898de3 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 17 Jan 2013 00:06:09 -0800 Subject: Thu Jan 17 00:06:09 PST 2013 --- libre/icecat-l10n/Makefile | 38 ++ libre/icecat-l10n/PKGBUILD | 260 +++++++++++ libre/icecat-l10n/region.properties | 32 ++ libre/icecat/PKGBUILD | 2 +- libre/icecat/libre.patch | 576 ++--------------------- libre/icecat/vendor.js | 4 + libre/icedove-l10n/PKGBUILD | 3 +- libre/iceweasel-l10n/Makefile | 59 +++ libre/iceweasel-l10n/PKGBUILD | 166 +++++++ libre/iceweasel-l10n/PKGBUILD.in | 80 ++++ libre/iceweasel-l10n/region.properties | 32 ++ libre/iceweasel-libre/PKGBUILD | 31 +- libre/iceweasel-libre/libre.patch | 628 ++++++-------------------- libre/iceweasel-libre/vendor.js | 9 + libre/mplayer-libre/PKGBUILD | 21 +- libre/mplayer-libre/cdio-includes.patch | 43 ++ libre/mplayer-vaapi-libre/PKGBUILD | 12 +- libre/mplayer-vaapi-libre/cdio-includes.patch | 43 ++ 18 files changed, 983 insertions(+), 1056 deletions(-) create mode 100644 libre/icecat-l10n/Makefile create mode 100644 libre/icecat-l10n/PKGBUILD create mode 100644 libre/icecat-l10n/region.properties create mode 100644 libre/iceweasel-l10n/Makefile create mode 100644 libre/iceweasel-l10n/PKGBUILD create mode 100644 libre/iceweasel-l10n/PKGBUILD.in create mode 100644 libre/iceweasel-l10n/region.properties create mode 100644 libre/mplayer-libre/cdio-includes.patch create mode 100644 libre/mplayer-vaapi-libre/cdio-includes.patch (limited to 'libre') diff --git a/libre/icecat-l10n/Makefile b/libre/icecat-l10n/Makefile new file mode 100644 index 000000000..d1aaf7bff --- /dev/null +++ b/libre/icecat-l10n/Makefile @@ -0,0 +1,38 @@ +#!/usr/bin/make -f +# Use this script to update the PKGBUILD's list of langpacks. +# This script depends on: +# - coreutils +# - grep +# - pacman +# - sed +# - wget + +# Variables: +_pkgver=10.0 +pkgver=10.0 +pkgrel=1 + +# Guts: ############################################################## + +default: PHONY all +all: PHONY PKGBUILD + +index.html: Makefile + rm -f $@ + wget http://gnuzilla.gnu.org/download/langpacks/${pkgver}/ +langpacks.txt: index.html Makefile + egrep -o '[^>".]+\.xpi' $< | sort -u | sed 's/\.xpi//' > $@ +PKGBUILD: PKGBUILD.in langpacks.txt Makefile + sed \ + -e 's/@_PKGVER@/$(_pkgver)/' \ + -e 's/@PKGVER@/$(pkgver)/' \ + -e 's/@PKGREL@/$(pkgrel)/' \ + -e "s/@LANGPACKS@/(`xargs echo < langpacks.txt`)/" \ + -e '/md5sums/,$$d' \ + PKGBUILD.in > $@ + makepkg -dg >> $@ + +clean: PHONY + rm -f index.html langpacks.txt *.xpi + +.PHONY: PHONY FORCE diff --git a/libre/icecat-l10n/PKGBUILD b/libre/icecat-l10n/PKGBUILD new file mode 100644 index 000000000..7ee93cf06 --- /dev/null +++ b/libre/icecat-l10n/PKGBUILD @@ -0,0 +1,260 @@ +# Maintainer: Luke Shumaker +# Contributor: fauno +# Contributor: Figue +# Maintainer : Márcio Silva +# Maintainer : André Silva + +# Based on firefox-i18n package + +# When updating to a newer upstream release: +# - Edit variables in in Makefile. +# - (optionally) edit PKGBUILD.in +# - Run 'make'. It will take care of everything else for you. + +_langpacks=( + ach + ak + ar + as + ast + be + bg + bn-BD + bn-IN + br + bs + ca + cs + csb + cy + da + de + el + en-GB + en-US + en-ZA + eo + es-AR + es-CL + es-ES + es-MX + et + eu + fa + ff + fi + fr + fy-NL + ga-IE + gd + gl + gu-IN + he + hi-IN + hr + hu + hy-AM + id + is + it + ja + kk + km + kn + ko + ku + lg + lij + lt + lv + mai + mk + ml + mr + nb-NO + nl + nn-NO + nso + or + pa-IN + pl + pt-BR + pt-PT + rm + ro + ru + si + sk + sl + son + sq + sr + sv-SE + ta-LK + ta + te + th + tr + uk + vi + zh-CN + zh-TW + zu +) + +pkgbase=icecat-l10n +pkgname=( + $(for lang in ${_langpacks[@]} + do echo icecat-l10n-$lang | tr A-Z a-z + done) +) +pkgver=17.0.1 +pkgrel=1 +pkgdesc='Language packs for GNUzilla IceCat.' +arch=( + any +) +license=( + MPL +) +url=http://www.gnu.org/software/gnuzilla/ +depends=( + ${pkgbase%-l10n}=$pkgver +) +makedepends=( + unzip + zip +) +source=('region.properties') + for lang in ${_langpacks[@]} + do + source+=(http://ftp.gnu.org/gnu/gnuzilla/lang/${pkgver::4}/$lang.xpi) + done + +noextract=( + $(for lang in ${_langpacks[@]} + do echo $lang.xpi + done) +) + + +_path=/usr/lib/${pkgbase%-l10n}/extensions/ + +build() { + cd $srcdir + + for i in ${_langpacks[@]} + do + cd $srcdir + unzip -q $i.xpi -d $i + install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region + cd $i + zip -q -r $srcdir/langpack-$i@firefox.mozilla.org.xpi . + done + + cd $srcdir +} + +for lang in ${_langpacks[@]} +do + eval " +package_icecat-l10n-$(echo $lang | tr A-Z a-z) () { + replaces=(icecat-i18n-$(echo $lang | tr A-Z a-z)) + conflicts=(icecat-i18n-$(echo $lang | tr A-Z a-z)) + provides=(icecat-i18n-$(echo $lang | tr A-Z a-z)) + install -Dm644 \"\$srcdir/langpack-$lang@firefox.mozilla.org.xpi\" \"\$pkgdir$_path/langpack-$lang@firefox.mozilla.org.xpi\" +} +" +done + +sha512sums=( + 20064992e694b3fed0f75bee9d54af3427c01ae0048e0ec220895e58127954ceb4db47ea85627e86d9ea6614ce3feaf30f652d87f7c2e896fc00774a757a640a + f3c627282fa78ef67335fa70671af848f2fff2252db1c4125838bcbfd92c61ae978b9a32885f4b33beac4eb4d8dc3fc034b18703686164a4903c4180de539439 + d88793ed54794833ec6200d7a1957b68ebe8dd5c1dd6f4d030440919e5ca7f85f84fefd459603d29be57fd6b9d0961356c7760aedaca638bc3b58532ceae8441 + 6f3f6e026bc7d4ac6d6aa9e1ebb5995d663293f9b26190d33de8857cbfd5e6454bbda49bd13d6c6c1dab544ef0f2da0cdec50b1d9fbfb73aa5d66b0a6a67a87c + a0f8aec338bd7a36af983bab144fafdb9c9dc9081ceaf31aae443160e68758f3d46a385bc20d4a6767b81d09eeca92e08e0aa79250719e9e1f9d7bbab8137390 + 066d2540fcf97e87e778124d9bd8aa0d624d810d5b034423f43fc77f8579c2006c2a7a519b438a152272ed9db85a3e56ae770f221c7eabdc700368c4788e6108 + 12801164ecebf059c5615480785ce4ce95de5221d05e74bf85f747a62f8954decd372afb829b8d941316bc9115c3b6faf1da6da869d0ce5b09c622043936bf6f + aacf7f3713431a4dd5060d475145834c0b9aafb032bdceac9bfee4d3ea0ebe869c86bfec1fb65995b2a531962c40b9df69d4a427e81cf01164891f668c3000ee + ce022ddcb8c46d1ecc97187ad025707b33f763b1abed69a8cc33b1b512728267fe67ab45dd19e5f89463328950330db9ea5243df30e0f35acae48c4746211b79 + 560c43e6f684a726c10a547b6f95d511d63837521b6251ab3b5f141c4e9490c925eb049e3c6e29d1eb9bbe066fda9e5671a0aae8715f0946ee941ece77b5968a + 5bd37933a9026c5af0facb34932a1cbb24b46d16fee9ee2b94313e3c7c6622d5ac0f1afe05b003a39cd9750cfa4f0d1f40455610b52d4c48f1e3ff108c2bdca8 + 37c5d9048f8ef0969a71bf422f9625fa768fac0174046f8cc5922534070eb38a89e467e78013c394702afe4af9045d3977d250bbe0dc26ce5059d5f4c8bce990 + aaf2b4a0d7a8a9b9d29a212be5c7de43af47b80624e6f2ffc6fd1be80de3840acdb7dc91309bd59a0e1e8c8f510f2ce571d0be5587dcbb55caed32b0c400be5d + 5db08621ddb5313c2e87e6f0922b66716cd1880eb479ca23ef6dbfcd52c86af2e6954dfb68569aef31061fe4ef0965111fab91f36caa12e01f76749bac0ae625 + 9acf3446c15e95f7f8bd553ce1860fc9d8181eb20472e3e435544ccea96d2305698cf89af4b4bce8a741c1c13f5b590f73912a3ff478fe976a7da02046877a6e + 0f3cf93dc93f324b5caa4da8fba259164bb6bd58bdd1dc4152304a4000ef84b6191e827fa69a619a32c8edcdd3c66d2307100f6db5e934182862fd53e382ebc2 + 31b7185f3587e3f8cd660510908392e97cd664364fb4e1c538f30fc53012ae2703a4c2542b956099feccecc28d849953cc0259c76ea8b13cac8e2ae4a66091b6 + 5c195f9572eb9134d2616be85b4101ad3b5ca7f2314a061208238e8c22a3dfa4173da8aaae5923875776bc782b0e84c8ca1633e701b16a6a6f0847e99c28a1a6 + b0825885c0dc76dd2aacf86bb662d6db400d76247c7071b2920f3c0543e6bea6c4d9752aa42abeb02b25195160eb727dce949be2dbd6493b5e4de6afb738f227 + 2e27aebb49e6c4ca3360dd53e240ac03e307442a26690c37e09e185a02531a13077181417bbf64580062820d67cbc5a8d87d297accb2410c85a00655bb74a359 + e77b3060eddda40956dd6cebc56d2c754e9f9132afe346cbaba4b9f0df33b799c357a61d65cd8d469ae52df1419fbe31e35226c342a43ebbdd1ca09913d733fb + 5deefc36b86a2bb20804a506df208d5ef87675dcc82b3f2faaa39ca08eb5ae2793a15aff61da7328234f75c67c3aff3c5a56e5cdabcc5e6b7c2225405b9967e1 + 7216d29fb344b7e1ad373cb41f3926a52e6fb7a3ba1313c3b9918ca7e8001d7b285d40d1ca0d06cf38cc29f8d16aabd28dbbdd7cb4270eff4a5357a60bcada11 + ffbe8caf8b7c38dfe760d7007f9da9cff78c59814572a2bc3f3dbe41b00abae91d1aae54661e19ec5c836b13ae752bdbbda09691485e6f7546335435207f0c51 + 9213b4b91a1849bc1d659bfe97d78ac936204a7b68aaa4294840867950f59276a792b00f278ea2bf078b80ee187a26d1ad94be34beb609f0f321fa102b5c8902 + 4d4c267991aba194aef7fbcba6e4212e095aaf99b7b21255dc3faf770685effb7284eb75d6dec41be685f694736f101a15e7c6a09c877444c73b0c9ecf523a01 + cf9e06f616d181894f6731587e917fa7b12f2dd89bd388dbfc3ee263595239908be36dc076b448932bd27a58f5fc95c5b8f39d53c0b487973976f036a660e9c3 + 504778df4dc2b19afe617ce506eefc6440931fcaa3f1637f1bbaa43fcc5b1f480d3e5223a3b0a3570dc73b08d6c2b77474b65b90ce9e706d4114431d53293a9e + 92361116e3faaa39a93ca33e190a3ffb40eefe028ad30feaf2cd62517a4337af74bfebd00a7e0f8ee3dfc9e1b6d9fb69d26c360e4c80edc193c7bcbcbabd86f2 + 3a7ff8e5213d88727ea15fb63ebdbb6c1c53da18b203895f4ec4b4d42b8ce163eeba94c2cbe68407fabbd1290048c75ce8fac91d379d11e5357b0a0908e2da86 + 6db783b5581ebfddea5d3e27e0ac081f216252711a9ad1f0c88a78ca79bd7c0a76e21b28aec745052cd210e6282670824640b67016822cc312a508052347453b + d6cad457fbe801e0469dad7760f3dc434b09ae44f703d60e96dbe8882a9fce001d5ebfb5b86154eaddc898c57bd36ce540be5505f9dd67872ecdcf5a378bddbb + 08a4893fb4cc059ddf4407e5989a21cd47efc4cbb49248b92638d39a5833f7a61c22d38a3c63a744417342f2a1cfe42615202bc19f4aa10c31e6efc3e757fa7c + 610cca4845f8f7a8e4a5401a5247677d953d60ba9d936fde6d796f59ce545c103a229ff15c5511041fa7b6883ed622b5a0576f92bee9b668982bda191a748f12 + 5228910ca879655c32ccd6e87ebcaceaff34f370517f6f4dc02f9d34a724d0243a0a4512549bab3f6c9da296c527e73f30274f57fb35187aa76475166137e9f4 + be389439dff009413c5bac5bc2a9b3ec98aafb9ed5be2c1429d8a528f9dcf9906f33f2f695d70f84e9940312a7e06c90bc9f8071ecb2bdd697bd7d6e7d69cc31 + 4d0fa955007c5ed6b3ab45da487bc569e0ee7e50d270ead3dea69e8e98b4f8fc105dc1e5876c2c1d35c1f5be97a48f013af3893214ecd1ac75f8c50d6db12446 + 4b2cb88b781c320b1230d65b41dcfbdb7120e2fc3acb30e679f7c143cacc293e07bf5d4e1c32910e9dd5952b17a8fb24d312a12553e7d7b99636c40d26d004ea + 2ea6935fb9b9f24f901f34f6ad9982c8f523247992244b2f2cbc82a4558e73e9a401a6ceaa0b7d49b1b96c52ff145c1698d8e032bc5ecd81c313c7fc5d299224 + d73c522a334c79ec68f5d3609d04585c0796d257435c9ae2ac19c5bca57c153b8fc45c045ab3fb3c26b2110eb9e1fd169edd6c67d6762a30b13b7bbe8bc00d79 + 709f86b5bae1a2d20ea78a35b84c4b60825090769bb0797c4958362d4c593e796a651801f3f52e2e8eb74f541945ad216f4f91ed633ed0d714fa4b13c88ab11f + 0d6b27fcb5d9bf936215a4736877a605dd7279c9c3e4a30dd359acb373cc8413130855393e00e44f2465da980c5e18003f8b9c383e4fe24550234b06830e92e4 + aec647729bff73a8f4a645d5a058ac65d106346023535197c13042e832f40f3e7c716b6c0f5ffc5071efe8a70138db5cf1edd36ab871d2b4d62729c151485d17 + 66fff3d844cf19dd606c87b21d61ca5b708693177e2e07b7496443b046c689db3670796f9979eb8e1705562f7912c9b0b55e588e5487184af88bbb4576db1dd6 + 02edefb82f8c80050bea8c34244b9475c56ee27331afa3660cb1c287b5e458bc497803fb0551f349490f8306a9484714d3e37202b65bae69b6193db3a338f39b + 374015d62bd5e739438bd4d6946991448b545719be2b577e70efd1bae44d80ae05f164b234ba7dbc9908645d8d09882b51bd4576e2b787a1738e1da1c8da37c7 + b7a9f867c1fa8d6867f23bdbc3cce2bc5de5524ed62197af58c64de79ada49daad7395c54795d588fdf48ea390c065c2648aa5f745072b58b16d8381e0c2c4fb + 02113a07a1b326b961f3ffddbe8e5be7504d6d653ae5a9e1a0391c2f6f047cd59e783e257db717b6d31191b6c0516db61b3e729d9710b594d6cdd0a9cc396365 + 86840368f447eeb82ada6194ccab18cba8a293fa4803303041bff22d8639bba0099a1bdf93dd7b027ab91c675a42c02ccf6ba299986f1aa5f62b3fc5a6cc8745 + 16c08ab4088c44b3b09dd021c19669156da99e7a578bb91543ccd9a4d60a3a5d66d57b75f23b4c26c40924a2c52f9a73d02b61db1aae039701c3b881575265f3 + e3c33cffe8e88bde6b6a1108de40809b2dc6ee8d9b861fed38d98389410d65856f84b8e225695283e8d53570147a2d12bfc9875a527b9e2f383249091712f5ea + 29dfcc4f4eb455eab8eee90ee1fda258fb24b0679d73ac6b63085e48795c7218ac941e73c9dd691105e63907f8b5cd6aa067628d45b6d4a8c19e829f1ef28ca2 + ced0dbdfd1f5685811c8984b8eaab67698eeec134d34852b8e64f62e426ddac5c0c2d6130ec14d4c0d374d5333b5376aefa256befc98bee77daff64fd7d0ecaf + c49242218db2c982182ead1ce91b72ad8e315a1dff8a327185cb2718eb27cd5381b9801e9bd287cf82a191d5618e434491246404a9801da95d37e0702730771e + 44fdd428b0eaab6a6c879c940fd499d49a184b6e11fe73eb23534a7f6e069d7535c43b6364e17398e75b8fa420edb50efb2cd9e6321759171ad944d37c4297be + 2f02da6626bb6f2b39c33ba761048a3219b11a7a1e0012e28e6b99eda194a12e467443716a5f3e3590d764cf96912d782fa2013f18c15df0694d58c380dfb665 + 9223386933582dbff20c40f84f6a7c60d86f3015de7a66f2119a616dc8a1ea1f148d7b726167dac72fed4742ff0d9ebe02660e99d22fceb59d557e718c35b3c9 + 1af17d2d25db68d4876f25e4d624d28f7ee83517fd3e8aa1e404b4eba82b8e6c9fe25ecf62593c737260ea969089c9be9ac111cdca45a8f32a10d88c4d76dd01 + e8735e914db6707014a9e23cbde156862f113f9d6c83f1480b34235830e73dc1efddfba3c8eb692d3ec081de7c07bda6d467203498b4301a22c440a71094df4c + ac7ed3ecea34d585d1d66e00f84d946f676aadc5987596f324a51f72a55253c665577ff88f7d197640d33c721331e60b721c386018e87cdbc287461f74b5e3aa + ca8bf664228145b559e7032f225f585cc8cd606c53d81dee79f748e6197a42c58f0587a1d21ba282cccd4836b336d92efabfde8e523f4ef3298d40a0bb7c95cb + f40dcdbc6fd7bddac1a216af6796fae520a799863d559f57aecc2c6fae880ff8cdb6630ffc6672cd54c270b1a2e246d98b352437a752910199938b4a0ba38c0a + 92e4a6140e0079dfd6f733a203e802174958829b40d46c5117c46fa9d278ae2acb5a51103486557b7ca09dcc3c432150b98963c8f4522d4cf75ecba7ae481eca + 9a8f364eaa8fbaa241867bd85677b0258d39cefadbdce9bc09a34420392dfa7f1feceb56558a11666b7e9136dc420881c21705acc793bb98d2dc7858902c3e1c + edef438984bda3cfb48a5bb33e00613465c9eb51308eb2b77809d09d40fc9fd606e1f41fb5acb6381991e51d42d789efd278e3c7dfdeae03418700c4501af1b5 + a21dc8a5c0bf621be61a612fad44d02bdda488e3eea528f54cf799430926d3ce3caff36b7a7ce5ae622ab4c8b5a1d93420ae01b646feeb41995dd0e6f6f1cda1 + 2f0d5222de35c08bc9197e8c89b1b0052164284207e390abaf436744badb77a3afa0832342649bcb4b94372a60f6deffae97fc486e4a84916e4a4630dd22b7e7 + 10b76868670c74b8a761189c410f1c174dd85b4f76b00aa7bdd497959dc4f584f2f6c5736cfb17f08ed8e6e27db6f82a206badc58653ecc7f765e2a27771651a + f4d1de91f617b2b72eb251b700bc54cf101d31a6b7c28cbf8f69f5f409e0e9b25b1aa1e1e349002a5af899edf28c6d36a16000de41f57f2a1fddd2d1ae45fb91 + bf6a9f5e7360d9b79f03ce79734d9814167d96443c59eec479deba6fb7cb78beff323873c166ec99f1256d3768c1740b37d1cb5c531a2eadbe5eb9988925ad4e + e7157b16a6f5524ce1637d5f7e0136949f0cbcb4eec53264863a91388750a202548df27abf5b64a63697c12161e832fc3f1e8ffb4d06b05e22e131d06bb2c579 + 66fd746eb5e2b0ebd05d3d0c645498d149217927ef058da118e558a22bdc1f5e8e3edcbb0dba92dfc2a6443eea25a1ca35a41d1535172dd00d140de9f9976944 + 738a5529a9b6a386f8fa49f2a08b17d63589eee3d3384644988f384dfa758963afc93b019fe0811997464531b23f7351b22ff39b9087e5c173b324174c70f5c5 + f3e1825879a37d561aa9c460b4b405225048f20b782a14ead6287eb62cd273ea72aee046d50e34c3af43e59bcf9449e801399a41fd8f42dde05c48c419971ff3 + e26985e1443beb7f403a0cd68b1b751cfbfc66a4e467d50f69a1aaa39179b71291a421ae28d7e13c5d38a9606db63adcb256e1ff9529cdd53cb25d0bf2826384 + 27cc10d779d20d526b98bcb3cf6b7e355735f29ba2ab67579919989067a816e7aa6668f9f995f04e7da3f0e14f0e3a7f9bcb74e4e321cfddd83c947a7ba8c882 + 81462218ca3e24ad703435fbc762041dc3060719d4846d1264a678ef4bfb29dc88ba6fd80da6352942dd24a8c466f731b5fb42bea04b3a07af29f2bdd1e0a265 + 2e3a4b33fcdc65f6b9482ee0f8dd4baa7b3323634725df3414ab2273dcc71e0b004d0a5fd24019873d23af39687354f60d1cb2255dd74307eec4f356ed84ec91 + 187871334a815b1084ad3ff0ba328ded8573a987878cb22d8546e181fa9ebc683288a352389ce4c7fd715537c400f877488570e3c3a6e7232b77ca94aeec5546 + cf33b1f63013d1fabba6868178f77075340fa946a03f0d936ec1fdfdfdfb58a4c59d21e2b8a8a0663306d05747220e951f17d5526ef6acd872e70c7c4084c18e + c18524862e76289187aa5e541ec11b3632ecf410c247d99aa6e29f73b5038b32e96ac8a6b8ac45671220ecff5c1d7837570dac4e65337e8e18b0e0938b6b8dfb + 23ac9a28661a9befff8410b15cd1a1d935ab0325f0f7c96ac363e8561c0142d9fb912bcaf75b6983fb3c705160ec2eaa44c3f19bd950bcd25c4d9e94f3f707ba + bacabefa1703d0444087e86aff908ac4768a4c07ebdc51fc0f80b417850001bf90561473f316a1d2de6e4a68c92f59876218bf29fcacd84da793a90dcfeb5482 + 7edbfde7bd76cf23c68520b0fef9de128c5dee9a19d3adc291aea0695754470368dade75092a5d476a4ca18ce907efac0f3d567b62b1b65c6711f013c5ecb6de + 04b2e1f09af6983905aaf8538333e4f42d4df856e2c9e6aa14c728ee2d6336f567734129e9a5aca1818f778d3ac81a2d5f0e0129024a77644f9a4318bc59e8a7 + 9d24a29788491eca45b893210e53eecb5eef326e8c9e9d0bc72a29dc2e9a9a369ee910759bf49f50d8d592a6bcf667ab325aa6523628e4358b1543cad5b81c5b + 9f2c1975b5bfbad8348de2d64f453828b6e38747ecd172a902093cbad8846d96b0d43368b28437ec96516517e8091e60564dd9e264218a4e9e6add83672692b4 + 32d9b993a5453fcb2ee64d853fdde16ddcb1589a393e56dec3de03481bc19f67e2c73d76bcbfea26864d90dd127091aaa8e278f114b8a0026ee59662a3fce83d + fdf828e81d039bb35d497aff8a1770beafb91f3a9c53ecbbb6fda672b989648731640a876f7f134fb0956c65129b1923712d363d42f08a54288f0c75bfc57dff +) diff --git a/libre/icecat-l10n/region.properties b/libre/icecat-l10n/region.properties new file mode 100644 index 000000000..4399d8db7 --- /dev/null +++ b/libre/icecat-l10n/region.properties @@ -0,0 +1,32 @@ +# 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/. + +# Default search engine +browser.search.defaultenginename=DuckDuckGo HTML + +# Search engine order (order displayed in the search bar dropdown)s +browser.search.order.1=DuckDuckGo HTML +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search + +# URL for site-specific search engines +# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site +# to be searched and the user's search query. Place them in the appropriate location +# for your locale's URL but do not translate them. +browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms} + +# increment this number when anything gets changed in the list below. This will +# cause Firefox to re-read these prefs and inject any new handlers into the +# profile database. Note that "new" is defined as "has a different URL"; this +# means that it's not possible to update the name of existing handler, so +# don't make any spelling errors here. +gecko.handlerService.defaultHandlersVersion=3 + +# The default set of protocol handlers for irc: +gecko.handlerService.schemes.irc.0.name=Freenode +gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s + +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Freenode +gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index cc5889c7a..5010b4298 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -16,7 +16,7 @@ _pgo=false pkgname=icecat pkgver=17.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' arch=(i686 x86_64 mips64el) license=(GPL2 MPL LGPL) diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index bf2dff437..497b8cd10 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,394 +1,26 @@ -diff -Nur a/browser/branding/unofficial/locales/browserconfig.properties b/browser/branding/unofficial/locales/browserconfig.properties ---- a/browser/branding/unofficial/locales/browserconfig.properties -+++ b/browser/branding/unofficial/locales/browserconfig.properties -@@ -3,5 +3,29 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. - - # Do NOT localize or otherwise change these values -+ -+# Default startup homepage - browser.startup.homepage=about:home --browser.search.defaultenginename="DuckDuckGo" -+ -+# Default search engine -+browser.search.defaultenginename=DuckDuckGo HTML -+ -+# Search engine order (order displayed in the search bar dropdown)s -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search -+ -+# increment this number when anything gets changed in the list below. This will -+# cause Firefox to re-read these prefs and inject any new handlers into the -+# profile database. Note that "new" is defined as "has a different URL"; this -+# means that it's not possible to update the name of existing handler, so -+# don't make any spelling errors here. -+gecko.handlerService.defaultHandlersVersion=3 -+ -+# The default set of protocol handlers for irc: -+gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ -+ -+# The default set of protocol handlers for ircs: -+gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ -diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js ---- a/browser/app/profile/firefox.js 2012-12-01 16:06:30.000000000 -0200 -+++ b/browser/app/profile/firefox.js 2012-12-04 20:42:20.753633713 -0200 -@@ -324,15 +324,15 @@ - pref("browser.search.searchEnginesURL","http://www.gnu.org/software/gnuzilla/addons.html#search%20engines"); - - // pointer to the default engine name --pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); -+pref("browser.search.defaultenginename", "chrome://branding/locale/browserconfig.properties"); - - // disable logging for the search service by default - pref("browser.search.log", false); - - // Ordering of Search Engines in the Engine list. --pref("browser.search.order.1", "chrome://browser-region/locale/region.properties"); --pref("browser.search.order.2", "chrome://browser-region/locale/region.properties"); --pref("browser.search.order.3", "chrome://browser-region/locale/region.properties"); -+pref("browser.search.order.1", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.search.order.2", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.search.order.3", "chrome://branding/locale/browserconfig.properties"); - - // search bar results always open in a new tab - pref("browser.search.openintab", false); -@@ -616,23 +616,23 @@ - pref("browser.send_pings", false); - - /* initial web feed readers list */ --pref("browser.contentHandlers.types.0.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.0.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.0.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.0.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.0.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.1.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.1.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.1.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.1.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.1.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.2.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.2.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.2.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.2.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.2.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.3.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.3.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.3.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.3.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.3.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.4.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.4.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.4.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.4.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.4.type", "application/vnd.mozilla.maybe.feed"); --pref("browser.contentHandlers.types.5.title", "chrome://browser-region/locale/region.properties"); --pref("browser.contentHandlers.types.5.uri", "chrome://browser-region/locale/region.properties"); -+pref("browser.contentHandlers.types.5.title", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.contentHandlers.types.5.uri", "chrome://branding/locale/browserconfig.properties"); - pref("browser.contentHandlers.types.5.type", "application/vnd.mozilla.maybe.feed"); - - pref("browser.feeds.handler", "ask"); -@@ -643,7 +643,7 @@ - // region.properties file is newer than the version number in the handler - // service datastore, it will add any new handlers it finds in the prefs (as - // seeded by this file) to its datastore. --pref("gecko.handlerService.defaultHandlersVersion", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.defaultHandlersVersion", "chrome://branding/locale/browserconfig.properties"); - - // The default set of web-based protocol handlers shown in the application - // selection dialog for webcal: ; I've arbitrarily picked 4 default handlers -@@ -651,65 +651,65 @@ - // protocol not currently listed here), we should go ahead and add those. - - // webcal --pref("gecko.handlerService.schemes.webcal.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.webcal.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.webcal.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // mailto --pref("gecko.handlerService.schemes.mailto.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.mailto.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.mailto.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // irc --pref("gecko.handlerService.schemes.irc.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.irc.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.irc.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // ircs --pref("gecko.handlerService.schemes.ircs.0.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.1.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.2.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.3.name", "chrome://browser-region/locale/region.properties"); --pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://browser-region/locale/region.properties"); -+pref("gecko.handlerService.schemes.ircs.0.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.0.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.1.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.1.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.2.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.2.uriTemplate", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.3.name", "chrome://branding/locale/browserconfig.properties"); -+pref("gecko.handlerService.schemes.ircs.3.uriTemplate", "chrome://branding/locale/browserconfig.properties"); - - // By default, we don't want protocol/content handlers to be registered from a different host, see bug 402287 - pref("gecko.handlerService.allowRegisterFromDifferentHost", false); - - #ifdef MOZ_SAFE_BROWSING --pref("browser.safebrowsing.enabled", true); --pref("browser.safebrowsing.malware.enabled", true); -+pref("browser.safebrowsing.enabled", false); -+pref("browser.safebrowsing.malware.enabled", false); - pref("browser.safebrowsing.debug", false); - --pref("browser.safebrowsing.updateURL", "http://safebrowsing.clients.google.com/safebrowsing/downloads?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.keyURL", "https://sb-ssl.google.com/safebrowsing/newkey?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.gethashURL", "http://safebrowsing.clients.google.com/safebrowsing/gethash?client=SAFEBROWSING_ID&appver=%VERSION%&pver=2.2"); --pref("browser.safebrowsing.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/report?"); --pref("browser.safebrowsing.reportGenericURL", "http://%LOCALE%.phish-generic.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportErrorURL", "http://%LOCALE%.phish-error.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%"); --pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%"); -+pref("browser.safebrowsing.updateURL", ""); -+pref("browser.safebrowsing.keyURL", ""); -+pref("browser.safebrowsing.gethashURL", ""); -+pref("browser.safebrowsing.reportURL", ""); -+pref("browser.safebrowsing.reportGenericURL", ""); -+pref("browser.safebrowsing.reportErrorURL", ""); -+pref("browser.safebrowsing.reportPhishURL", ""); -+pref("browser.safebrowsing.reportMalwareURL", ""); -+pref("browser.safebrowsing.reportMalwareErrorURL", ""); - --pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/"); --pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); -+pref("browser.safebrowsing.warning.infoURL", ""); -+pref("browser.safebrowsing.malware.reportURL", ""); - - // Name of the about: page contributed by safebrowsing to handle display of error - // pages on phishing/malware hits. (bug 399233) -@@ -1149,13 +1149,3 @@ - // might keep around more than this, but we'll try to get down to this value). +diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -1150,11 +1150,9 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); -- + -// Example social provider -pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}"); --// Comma-separated list of nsIURI::prePaths that are allowed to activate --// built-in social functionality. + // Comma-separated list of nsIURI::prePaths that are allowed to activate + // built-in social functionality. -pref("social.activation.whitelist", "https://www.facebook.com"); --pref("social.sidebar.open", true); --pref("social.sidebar.unload_timeout_ms", 10000); --pref("social.active", false); --pref("social.toast-notifications.enabled", true); -diff -Nur a/browser/branding/unofficial/content/aboutHome.js b/browser/branding/unofficial/content/aboutHome.js ---- a/browser/branding/unofficial/content/aboutHome.js -+++ b/browser/branding/unofficial/content/aboutHome.js -@@ -5,100 +5,41 @@ - // If a definition requires additional params, check that the final search url - // is handled correctly by the engine. - const SEARCH_ENGINES = { -- "Duck Duck Go": { -- image: "data:image/png;base64,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"}, -- "Google": { -+ "DuckDuckGo HTML": { - image: "data:image/png;base64," + -- "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" -- , params: "source=hp&channel=np" -- } -- --, "Яндекс": -- { -- image: "data:image/png;base64," + -- "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" - } - }; - -@@ -115,8 +56,8 @@ - const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. - - // Bug with dom.storage.enabled set as false --// We are using DDG as a default in this case. --let gSearchEngine = {"name": "Duck Duck Go", "searchUrl": "https://duckduckgo.com/html/?t=icecat&q=_searchTerms_"}; -+// We are using DDG HTML as a default in this case. -+let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?q=_searchTerms_"}; - - document.addEventListener("DOMContentLoaded", function init() { - setupSearchEngine(); -diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties ++pref("social.activation.whitelist", ""); + pref("social.sidebar.open", true); + pref("social.sidebar.unload_timeout_ms", 10000); + pref("social.active", false); +diff -urN 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 +++ b/browser/locales/en-US/chrome/browser-region/region.properties -@@ -3,30 +3,18 @@ - # file, You can obtain one at http://mozilla.org/MPL/2.0/. +@@ -10,23 +10,11 @@ + browser.search.order.2=Google + browser.search.order.3=Yahoo - # Default search engine --browser.search.defaultenginename=DuckDuckGo -+browser.search.defaultenginename=DuckDuckGo HTML - - # Search engine order (order displayed in the search bar dropdown)s --browser.search.order.1=DuckDuckGo --browser.search.order.2=Google --browser.search.order.3=Yahoo -- -# This is the default set of web based feed handlers shown in the reader -# selection UI -browser.contentHandlers.types.0.title=Bloglines @@ -400,10 +32,7 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow - -# Keyword URL (for location bar searches) -keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q= -+browser.search.order.1=DuckDuckGo HTML -+browser.search.order.2=DuckDuckGo Lite -+browser.search.order.3=Seeks Search - +- # URL for site-specific search engines # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site # to be searched and the user's search query. Place them in the appropriate location @@ -420,11 +49,33 @@ diff -Nur a/browser/locales/en-US/chrome/browser-region/region.properties b/brow + +# The default set of protocol handlers for irc: +gecko.handlerService.schemes.irc.0.name=Freenode -+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/ ++gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s + +# The default set of protocol handlers for ircs: +gecko.handlerService.schemes.ircs.0.name=Freenode -+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/ ++gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s +diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul +--- a/dom/ipc/test.xul ++++ b/dom/ipc/test.xul +@@ -294,6 +294,6 @@ + oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/> + + +- ++ +