From a42b76c35d387d3e8689eb75faf5783d48db56f4 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 31 Aug 2012 23:22:34 -0300 Subject: icecat-i18n: updating PKGBUILD --- libre/icecat-i18n/PKGBUILD | 324 ++++++++++++++++++++++++++++++--------------- 1 file changed, 215 insertions(+), 109 deletions(-) diff --git a/libre/icecat-i18n/PKGBUILD b/libre/icecat-i18n/PKGBUILD index e6f2e82b8..aebc6cef0 100644 --- a/libre/icecat-i18n/PKGBUILD +++ b/libre/icecat-i18n/PKGBUILD @@ -1,7 +1,8 @@ # Maintainer: Luke Shumaker # Contributor: fauno # Contributor: Figue -# Contributor: emulatorman +# Maintainer : Márcio Silva +# Maintainer : André Silva # Based on firefox-i18n package @@ -10,125 +11,230 @@ # - (optionally) edit PKGBUILD.in # - Run 'make'. It will take care of everything else for you. -_langpacks=(af 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 fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk 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) +_langpacks=( + af + 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-i18n' -pkgname=($(for lang in ${_langpacks[@]} - do echo icecat-i18n-$lang | tr A-Z a-z - done)) -_pkgver=12.0 -pkgver=12.0 -pkgrel=2 -pkgdesc="Language packs for GNUzilla IceCat." -arch=('any') -license=('MPL') -url="http://www.gnu.org/software/gnuzilla/" -depends=("icecat=${pkgver}") -source=($(for lang in ${_langpacks[@]} - do echo http://ftp.gnu.org/gnu/gnuzilla/lang/$pkgver/$lang.xpi - done)) -noextract=($(for lang in ${_langpacks[@]} - do echo $lang.xpi - done)) +pkgbase=icecat-i18n +pkgname=( + $(for lang in ${_langpacks[@]} + do echo icecat-i18n-$lang | tr A-Z a-z + done) +) +_pkgver=14.0 +pkgver=14.0 +pkgrel=1 +pkgdesc='Language packs for GNUzilla IceCat.' +arch=( + any +) +license=( + MPL +) +url=http://www.gnu.org/software/gnuzilla/ +depends=( + ${pkgbase%-i18n}=$pkgver +) +source=( + $(for lang in ${_langpacks[@]} + do echo http://ftp.gnu.org/gnu/gnuzilla/lang/$pkgver/$lang.xpi + done) +) +noextract=( + $(for lang in ${_langpacks[@]} + do echo $lang.xpi + done) +) build() { - cd "${srcdir}" + cd $srcdir } -_path="/usr/lib/icecat/extensions/" +_path=/usr/lib/${pkgbase%-i18n}/extensions/ for lang in ${_langpacks[@]} do eval " package_icecat-i18n-$(echo $lang | tr A-Z a-z) () { - install -Dm644 '$srcdir/$lang.xpi' \"\${pkgdir}\"'${_path}langpack-$lang@firefox.mozilla.org.xpi' + install -Dm644 $srcdir/$lang.xpi \"\${pkgdir}\"'${_path}langpack-${lang}@firefox.mozilla.org.xpi' } " done -md5sums=('334d06cd9e32b2c3df5129dba4f0f474' - '99954e582ddb9bbd8965e6468e7d9799' - 'a2b777edb9a595b4c427716458ffdeb6' - '2d1796a37f2e927b5939de257dddab4e' - '17589c7d8994d4f62fd95fddc2c0c796' - '27f9d4029dbab73d9f5c6a7c169c1811' - '5d13f0aeb780e4d3693bf62be21e6e11' - 'c47f6aaa0b33261e7277f6d807e88396' - '0d87bb53f0b71634c189eeb3f3d64bc5' - '2ada422bef681cee2bd7e667a9090d6a' - 'fc8bc018c6d41c2fcb883734e37b518a' - '5e9b488cd52a42e235169de3a4b4cea2' - '0b781ce69f571797d3dc1fd5b70d882c' - '5ae943ee2293fd427a0072f1c95dd2e9' - '15d2a2076008efefdb7d031f4d0b1663' - '71a45cefe3b5f45de4ff784ca1a4fe1e' - '98e6f6de8c0184f339cc1b88e31e285b' - '43f9c2a3e9580b6a2adcc36dba4c0755' - 'a12665f7c8e6121e82c6c0be91da3f2a' - '7268181e8190cb62685c365fb99d9102' - '6f60912c53bd21acd99ee11abd5862d9' - '25f2c8a6665f6aef75204b1bcd0c0ff1' - '6e3516383f6eaad4bc1abe5fdd212d26' - 'c76f8a91086735c8252eab0d90e163e6' - '85cf430e36e70713b715fca4e1ac3410' - '60f3573882bbd1dc0ed0f16518660bf9' - '6c51beefb2da7add8c8c635efc2fc565' - 'e2d4d8182716b329249619d227d449f1' - '28facbc470554488b0a722cb0c3d53d3' - '3b167b50c188ef190fbad18077aacc0d' - 'f8edd8921fb8fa24099d1725fc478a2b' - '5b90202d9288d073e5f401b498355c13' - 'ec8478b6e0420484de8d7332bafafac2' - '9d932bc91062a58b0509b5395403c708' - 'bba6d905218c4a2b3d6e289e3ef35186' - 'b32d1ad6e5c8ed52cde0ea351290fd17' - 'd0d1d307c87ec8c8102527944f05887e' - '2605d5226c23205f3c7cd5466059b802' - '2b800c1c729d3b65ae38050bd4c06af1' - '8744ce05e573acefa9f802e53da2aea4' - 'edd3e216b37ee32fd517c2b49e85439a' - 'd9786706c058b1e4acac62f07deac285' - '6377004ddaa6731734696509be6dda53' - 'c73bd01ab8c5a25e234e51082978f7f5' - 'b44a3df07e663803234c72f359d06422' - '81c646a84b4f56d4721bec4013c123bf' - '9b678f5dbb7243b9e5751d04b988b640' - 'c237afb9ed6819a6219383590a8ee448' - 'b27c9236866dd55ee01a6e3929752767' - '8d527119a84f22840a919bc35ed612c0' - '1b51158c8c218544654245c418943c3a' - '1314bbc8cde2babcf6e807f7f958152c' - '59eb9146f16189932d9d5eea536cd8af' - 'a427b45282c6f8f4f1646050e9a93f71' - '618771f03f807603b2efed2760f6004c' - '56ca63d8c797d47fd3b6c094390990d7' - '24bde56465d7ab923fed3e23eca59d42' - 'ff9858a371df54c25f77ea4a5d1091f9' - '6135b885b12ccc64d5c93f385d5c62ad' - 'f98347a6ae9db6faef247373fd5092df' - 'e58f094448b085636c9e9435ef22fb53' - 'ed073cd4a1f3bbdcec1ee56334d8b9d3' - '988a1c279f94941bd4ab3b90cfad0bbe' - 'd8bc3ee80be944051f975a2534651ce1' - 'bd94ef18efe11eeee93a0ff1dc602301' - '20a8381c88b1735c558316936469c1a9' - '064d6f05f7b4c1ce8c5e0f083eccef15' - 'c22c4fb9da7cdee2cb29119e7c4f3696' - '50071d48b92f373713f6f8ee483b6f7d' - '518fbbf3838332da2e561565d29281bf' - '2a5a42ad2110e7e24c967233fdc0dc2c' - 'd21424a551ff625034b6e015f0eddcc4' - '829a1e6fe575e761f97564f68a1859ec' - 'd1047468370b7cbb766ed688107ca879' - '27f3609a99c3be8e59cfc700e251a5d7' - 'c7eb3ef0bedc610065713da9a55e2bf9' - '9125fcb792da1e58f00c43ec5b7bce97' - '5b9dd2a8ac84aace97a6095042ea537b' - '13be748a3331f2a9fac691dec7173aa8' - '0b694233f5385e0e5898d4b64a683bbc' - 'ad037272aabcc3b58fd2141447113905' - '347f53738950c9927b19ec3462840696' - '4fc25f81dd0b744aaaea5705dd36d943' - '5c96e79fc7463907b1c635586c910a71' - '50b1dcbd0eaf9d62b3f9050598298933' - 'c40de39f9502a8789f8301581cad25b4') +sha512sums=( + 765390ba04d88b4b56cebab007f9f593e33c54fe3cd8dbbafdb48171db68e23cd4e1c3d8360f2ef641a537e27f1d6db1aa8a0bdade854d3151359ecab6676af9 + 2b21f849299e7185163ce99e91aa612f64094cdf792bb855eb8836be940c0ef1cdfd33da080a793def714874810b269373f0c80830f42919f967417356efb86f + 86a79b1a785c967d56bb492a1c5867c42ac00832813a72027cc0a51dd940c1020dc7c911109efd9eb4ef1a9d996eea6382cd0a03a6a53e3347f909a28a3a943d + 727e3f44812c9c56620b7871fcffb28ebabef460fc52f483402fae787d90f3f197703e0bbde689a744e1135602b5ee765023402e0d365812e8521f8cf9dd2791 + 06989be3fd8d73f7887dae3bac7b0bdc80c7a11b7e6c8630da0ee4652f0ffbd60e01c049242ab3b61555f84485ce9b2f098c80cf6dba41538442cdc5cbdded9b + bc9e19e9e216df4acb8d9bccae2e0e426ab402998934ad9393cf86a2a81c6d20c7ba622d1f312dd70a62c8659b611421904ba0aa5aa7e3eb7ece5ed578cbdd81 + f12d343a5b5f9f35d3d112f041baa29919bfda8bf4c22353ac899ee65eda438c6a9ed243e7a03fb659aff0f9c448bfa5146807b8d3eafa9dd7b8384d7a0d8124 + 11cedfcd91a550fa1f65d1eca4ebac97ecd7c823e7a41e74f908ae1dc0b36b7cbb0c91c2640de5a0ba61c6820c0101c195bb31482376880025b494b280c7274d + 51f0b5e575f99b718b5ca96416148cced3a2c3fcd512e7135d3062fbc6e3c0ede86cb5bbda4a0bed43f6bd73d5c493a97c5bfbf373a92edb48b4a299b27a4f4d + de166d28ba81758d002712c408eada0ca5955e9b6275bc5f491177496f79f8de9dd5d5cd10cda5bc7671c56d7b5d15e136910d671da58ab1363b4dae769b58c9 + 79c0d107c1c61cd6281e0c545f10389a9968b7f49f27a4ff531c729c608cfff9107430f6d7b323a9f00cd2259ef5787db817b7aaa226272e7347413e0a50be83 + a1f5399254c5ce261468dbf539072371a51796de02331e173f8c44704f95d7784280115f7ba1deb46874caeccdeb925d9fe540dc8b5ada5970df6274a06f3429 + 11a278717f5da5a6d284242863bda3142ba4263946104fdbd86545f741127a368138bd4f7d0bd7bf377795d5d36fc61544b585dc044d5a6ddf93ce077f1e747f + 34a995016f4d7bff5c972bb4ef252a0ddac4f0b36943c7e4f8fbb899827aec307a081a7a30f1cb1fdf8c84af82f8f32675c57c45c39f7e47f21aacb75438be48 + fc5d410a903912f05886c4573a3b199efae22f8c9810a7bfc6acf8b5851b1791d97bd562a9c77204b7cf9091e0731ffe332c640d8693165f69cb934e8d523e04 + ab03d3e5391f806b6733078501d8a767cf2267d126cba284d473de21a7c976e55bd7ba63e3489336232ee9f5a7672b8c436e19adcfc68fe2a69db4e08b6f4b19 + fa55b4a26a346c21f0b98c137c4fabbd7aaaa61de45da89ca26c78044d23be8333f2d0c849ec5a34ff7517a556a979ee98b1ce87f02174fcb695632bbbb5edeb + 1ac410bd9b30d917b77ebac3ba08e25adaa4a20a6a77d13229a0efedca7a3b650777a6ca71675fde69f06137b09150dd2dee89760b93801dcf14b2801e6e5ad8 + 0b37ef6936f78c0384c36be7ad174cb90b5ca55b77128de6cdb6663de191144392728fccabc2baca25cb2d0f1ba69b80598bbf531e18b473a9515b553c1f594c + e2d4d6f1fc470d17dfc35b193c20f23b07dfbe54cad1b4f47d2f534493ea297dbdaf15e6c9b1556049c2db314dde66701a0624ef8af8f85f9cebbbf30f50ab3f + c3874b81b84de34fd9cfbb8b009dd033e57ffc726f7b607d895a917e4eb7ef9770ec0e24e0c41cdcd82f29c8140438101c1d1263ee64fbe0117c6b1510c0ed54 + e06f5da5fd157045be13459635b881cd09c92cc5f56af7d745afbdb52889ff18e23a75475331cc13471d9e7aefe157f43ae83074856d81e4f4ad0a9b275d58a5 + f04c77b037b04bf69929cdd712126b6c08a786d7a66181b3e536ca97c750506963b699dd8c4374fc01a86e694100f3fd9ed15d88ada0ef52364f492c5f61bb16 + f538442bf340e7856522288498de54a28dd0b25f36ad7897d1e444e46e98d17c0e5432c6f40e02c49cacacbe5b6b87a4db0dfec3f79e52df91ef278e15afdd73 + 9154c78adb5ec3d4c5dcb69bd61fb2b9a98a908f3fb6344ca5ba2ac96145ab8e770ad786b2c704f522c9f6cf61fdaf256e309e85bf105bbd83df892840804fca + 5c80bddaf0e51984034aac3d211327f89209673cceee5fc30dc4d9958cf44f564ce7aae995795987885c560a427a0098958fdcbf4534f5c84ec9778a3cd555c5 + 1d8a8a3fe5b2ade77dbd7b6f7fee74cd82452ec4eeee42bcb590b6f919fbccd9d345dc1ac2c171d265882e3583b6826778df73713e23df4c4ca66cfed594971b + 6d060b98e0a1d27b87d2e3b4c038756897af223759a53e3ce31beca9244d27f71610e5bc87ffbc5c53aced569165067ebf07720e33ee2ac27105a981dbc201d4 + 646eaaedec5aca57f26c0e1a8cc415e1607efc72a1f37205c40a22ee38e334ec138851375b0091c5d5ea5d8c5d7a2e2e90422e6aec0ddf6079a46f09696911b0 + a7619e2cd951f2b6c87f54386159fbffe5ef3895b05ac5422c76403b8cfd31b05ce98e3dd1532b79e81629adab828149c7154ba861d0bd4760a24ba74a8f4293 + 06dc48e0368927111fc7b4d3ea86c1a8a3a4b077fe0bddd434cf388c9048d2ea0cbd6184becfb2d02005c2e3ed6351e019a086a705c558a8e1e2df0a2816516f + 5b2120ffe02f469c1b52f0c4d9255619781aeac36e40c8df700707c955118ec298b78474ac2a17cf9d2823f049e9e15596fc58c4cffb5ac07315f9a73f7e2ad3 + c3141419942b85f93b2d6f5643544987f57e2805f1586c40ba91b814876cdf635f2500d350ad2a335cf440405716ed8e212221a7a9140cd8a4c3edee67fd3658 + 5fab16a0210bb6d6bcd18701ec0ff669bf5a971dd9f6953186864e09758ca37283af88c7dfec120cef87b9372bad61ac76d8248dad2bea68ca86b3a6410bc446 + d793679d2b51ecf41c0265e9bd9549d8bdae7d1db2afee631088bbf0aee314f16037840fcef8a1241519b952cdebec7f3eecedf3583ccdb92514d855d8577eb8 + bf658f472d23871cb3b54f9100bf3e935985625b4607330dff318315b9b56eae913c020ec69b0465f6a5cb3ac508e39bc0597e65cc940c20db7a63e3728dd632 + be75a19e56a39b597a88133071ca8f8d8ad2931d9accf47db3370d72c5d0dc9fd1c206f70ba64643a1657198ee930eb8884f36e2f9a2e7dbafb9bcd624c1c993 + b2ba8025736c7c8b40661826908c046e9ba8d61c1f273594d043c56f62dec39ed8e27c428a9444b946c2f638bdf60af5b9c5bd90b578d37dcdd884a9b0766d83 + cb140b72c26eb8e0d150cfac0da9a74932f2764911764d2ba326a6c059547e8e6ad1a5b5f6630b55f8dff1290182672c0c6016cf863b22a0e17524a79c1b835e + 5b6426c3c68ead2e9dd4975d18d671bdead44e455ee2802935fa34d153a9a651af765f25731ff0cd462823c85e60b3ad13b9e4a340c80e5b6435d9cb74545a89 + 03501a4808ba5cb0c9a94b61843a33604fde88d00bac2cc0e141975cef5ccc2ad4de219bcc077b92191fa45ba228dff3920c206add564a4331ccfbe02a8f69db + 5277580baa12169d15396ee08d019f5a1fa4cca86ba52e0e2dd05b0f497599cd5c560638ed502b842328c3e767a0f2bffcb6cfdbeada4d7613ff9f9040bd416f + 6656d0508d65c6e860fe66f5d1180c6040f03ac0579a85dded1f3e2b3d26341be4da8c423029927443ac99dfd52a954aa21f1a06a729ecaa4dca1522ccdd9333 + 4dcc6b8f1305d3b9ee3b6f90a92d169d8c9a3d6aec52b92c320a9cad88fc7c26567a343e201d943c56e721c587d2bbd74bbcfdb29fc0a2691f85e9262fad5dbd + 046b6d47386940892f07a10f564b9bbd0fdf7094a0e1f468f42d4b33514d8122b54a78fd6de09ad442a497eba266ad459733a86eda417c87db91d988c9d1ce2d + 0334bb286b560fa28ce9763868110970043155a24f6fec9b01611639add7b2f98781692d4ef84244d67c91afe477a9b1984aaedcba570ad0169c77d904cf865f + 6dda8b0cd0b5862520812ad2e2d4a5ee7d4be030565dcec55cefb0ff3eb960fb1f18aa52ee437d96890ccc35483d93b4fa684ea042cbb530d038d99770e45760 + 5ba5df20669dd3b337dae8de5f909def9747f4c22c041108ca30398ff59004c4a37dbfe88c243d55af23ef85fbe4509d4a4ddda772626f5170573f89a6f7990b + 9dd8b244130b291d16390fabf3470235892ae2506f7020fb5e1a3dcf142a5f771e3ebc91a6b14036721dd216751764a2d5cd74a6f60db92cdbe62e97f69d6af5 + a64ef951b6f0e23d8407414b9c1a5f5c8eabf89d7680fcbedb5acb70a9ca7e4c3253437e2af23c4287ecb5638587bceed4a87edc990056b26199e8cd9b955275 + 57459b8e13110e89acaa042a3c7bcfdde40c8f5e7fe00277f38960e23a9e750b1a85fba35fff29c8eca0d0d6c2e38a357cc2692a80af70feef8816225a88805b + 33cd4be72524c0d0877760a882c79e47fff8036e455103a2587d2eb694715f081a5c95355a8a536df08da4a62c8872001db2a9a1431fe9803d2267a3e02334e9 + 5e653ab0eb49e89408b51f34a549f0f1ac20868d121f9688f04a53788748b69f7f4628355fb23de6c1f69aefbb244d646debf345bed8f98a9f16f1fbd785f116 + 04bcfcf4683ff0f0596e703ea280d843d42f5e883a7c252518c1cc1953b7a7391b38adcab720a020164fa6adfbdfc8f40255109641880c83815b4b5bdb218378 + 6d550a3a1b4e1c375e6754e0e81e049bb10c04ec87614266123076dbc71b518bac4dc03233c7f8fb022302e1d5f7ed0064efdf6a21a98d17b8b0600b04b540fb + a8a14d0095ed6cb5b6e06f9737cbd7923c4fbce394671e510e275198312144706fa3e3063f4f57a3cd4ec9b08714f8e6b9d01943613b0147502be77647cc9440 + 3fa8938e38ea904b31a086b7cf8221b5ec4aa3c125fab79a9c88e68cc799595117d2199b6fc80e8b7cc1a809e1a10c230a929f420e4ef25bbd04775a0dfd52e1 + 1cb6fca6e8214603b1d60f5c0a187514b002704d33811ce229129a223fd63d55b4aafb1ccd1ed21d003f32b983bff8f785c74b488673edb8a5027f336dfde5d4 + 6566215d680dabf8184ba6edd33ddeeec09d2e2544250e7cf5026c4ea420de6273568056ac403739649d1f2636764459525b847f9d6e21ff860d211bdd3a0eed + 2c085539c1ab882b0370b2112d517b8f1be1f5869560fa5c0242ccc159c01b9f1c770593e72cafa6eecc3e3e623fe33a9901b2e0d576d98c85219122cdb34317 + 1f7e9eb6351e8de6b709c0a31b1cfcbfa108288da5b5b99ea88235e568b84ee0a3eabd8814c5f4b9935caca467f4a8e4531317ba8abf2d6d3121def8682fa961 + fde912f0a7cfac59fad72a56ddfe6c7ff10fc51a53ac5b89229f08f18c4ff689eb15d2980d32433b640f62941e7b38c4bf147b7728c22849fb04da46a13ec707 + e8b4de904e52503028ba50ec96fc4cf151ccae03bf42240c680204fa1794233374db6a4cc3a2e13965c28af2984be9f55288b0a9f522ec0d1ae738829da04b52 + 5bf071de14dce19ef5faa4b0b35a0618eb65093283c22d4da16b45839b6b3cfd4314fb8173f419dd3596b9684fd7c6ca1258098e0b9c4167b1546987c0e93b1e + ba0af0ad267b49e2890e77568882eae7d34846208472bfa3299934ae6d40a9864e39340a8228dd6215988a3238dd59dc84856e0d7cb4375601b0018683e867e7 + 3aac042bc0107e8f5d25009266f61272edbb70cad3dd0e984344738995a2119df247a4664bbd1c2bf9f7f889d0f8cb7039b6e852208f2f0c6040ef8953072cc4 + 8c1621ad105104b6dff50fa769c2504d66ef0d1c716f954ab1eb83742efad48be22ec718d4520a262bc733b42c72ef1a0085d1a1868124c5c18a1b4141b89041 + 1da09d13349b54f21ccaa46c0d96c320ee940af10591755a55e8953187a6159b1e1ebe087e3061888dbdc43ee767ed59259312d10e04f1374c45a715d09935ff + f0430e711a97bc9b0603620ac4a9adf7f63916c5ccdea3db588679df6a36fc4ccf7a17c9f581f7fab679002c50e4f0b8708ae5a2ee9bce4cb1d39bcc2dc05aef + bef2db0771b5f7053366d0a2f4fc9cce96649af1aec497bb5f38b9fd3affa0fc662a194d2f69f8cc49121037350690b6506da6f6659c41bef734089c8c7da784 + b7585ac1320f12915f01359a573eeff3524fbe24a583476f12a18ce16389c00802f4e48ebc2d4ecdb002dbcca97a44ad5721b0445bcfe0dee220f7d90abef4a5 + 59e278a846484b7c57c978b66658031d23dfc297f63bd756f82701b700906f74322de60988cd481a84c48a7d5e828e411e2ca7e4e58f7f695016b6ffbd680af1 + 21dc4bcdece71d8d310e179c010dc6c4b089ab55315ba7c67aee7da5a93b3ffc22f27e0c10087137c594adf1114abdbeda2424d5ee8c4944e6ad2a780d93acfb + bf16ae0501316c61656147bdff8140e9f75bfbc9ee625e791b11531d019a6431d9c9ee4110f2d566ae4f11c8d6d4d035c3ebed1a0f6ee0d98f2ede52bcc91e16 + 32161e5a951c353456564b6b0a203e148986322eccf7169630bda6fe8e3913485d431940595a27ff3e9ed71d3a9f2b2a2fd2835363e5db69a2982273e321186c + 01f6d21908175d58123faa91ec0545a173226052632ef636a3b6ded2b77bd6554532eb94e2a87ae2a64ef62cceacf3fc800360232b11a51cc91dfde4397190d8 + 8f8275d5a4582b524a6dd31ee81afffe1ca8371a87f50cfb663ab397a5906f6ad485b7ed7c49781af9bce82ef5e34f2d3de883ed45a5972ccb187cdbdae9c7c7 + 7183274b7d97652ae635a971dd539d46d16a397eac1f3e51c93c53fb8abfd6eb01cdfd41f7c951847291b033a17e6566ea2b9a629dc5796f012bf1993ca14b40 + b35822f1b09062a9c5b6fa41e036657f68def07a15ee9d5f078d372fdc17bb36fa42f08c1a3ed73bb7eb63d290041f441a580c19ee1f2fe789575aa6361b0293 + c9d05ac24a63799805ebe257c11675c1400a014e0d8c408a02e9b3842ec7bf40922a76120297b6796bba3adff0d2449abe1068085176f0deec0463756e3b5c3d + 28ff49291b5cfc51acd878fee3e2de6693bc060ac8f4b1233d44cd5797bf2815c0a563f07decd38647d384f183fb9f945e1040d77bfde4503320a5af2b91482f + 8a137bc5d30e662a28fb809615ebf480503e278a5882aa81b71260d8c548b73e0401e458a6dc4cf0e9e9a61bbadb72a5d8c4e636d7ce616672bf7f10bd4dc810 + cfa399cf459b2487f260a7287b1ddfcbc8ecde9bda160f6f8036bbff7389a383be5acadbfad092b72cbf7d77d8b053fbe98b3df0ae6f01029b92e78bbbf681ba + 5553b2e0193fe0aa65cc88171b5358949906ee01292bc2b2aaf1bc7c330b703d998901999aa5dd923861886b589411b221ae00fc3323cc3bb23068dd21220601 + 502426fc851b9ce8782a7c73b6024492b8e7a46764eaaf2a3b4fef7546312dde9ae9d6a83619f93c3fa96e85767d0cae668f3f9d4cf16427d9b8e7f55163df41 + 5b48c402f4ac36366d157a30db3c36e0bbbf6f8601a498ef0d7cfac4899ed5a168826caae7427f949cef7c54fada0c4886b5f7b7c9efb933fc246781845d5db4 + e8b0a1580757da961551580dcb83fe5dca1a99e446fc9b0bf302e7eded06f4ad795650743b387c0ce05840f238940e0013019b4b36d9eaff1272057fe2949c0a + b2d8be6934966c477c07f6c7fbe341148b7cdb75aeb51ac0fbe15b72c933a2886454057237ae968a3ce7d3d8b7132b8d9f488dac8e68f6ed451c608c17738f27 +) -- cgit v1.2.3 From 96c4c1414481245fcbac8f25d7b5e467dedd7af7 Mon Sep 17 00:00:00 2001 From: Márcio Alexandre Silva Delgado Date: Fri, 31 Aug 2012 23:25:38 -0300 Subject: icecat: updating package --- libre/icecat/PKGBUILD | 205 ++++++++++++++++----------------- libre/icecat/cairo.patch | 14 +-- libre/icecat/icecat-install-dir.patch | 13 +-- libre/icecat/libre.patch | 161 ++++++++++++-------------- libre/icecat/xulrunner-copy-stub.patch | 6 +- 5 files changed, 182 insertions(+), 217 deletions(-) diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index 88bd70c09..fd050fb27 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Figue # Contributor (Parabola): fauno # Contributor (Parabola): vando -# Contributor (Parabola): emulatorman -# Contributor (Parabola): Márcio Silva +# Contributor (Parabola): André Silva +# Maintainer (Parabola): Márcio Silva # Contributor (Arch): Jakub Schmidtke # Thank you very much to the older contributors: # Contributor: evr @@ -14,108 +14,102 @@ # the value for 'browser.dictionaries.download.url' in 'libre.patch' _pgo=false - -_pkgname=icecat -pkgver=13.0.1 +pkgname=icecat +pkgver=14.0 pkgrel=2 - -if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi -if $_pgo; then - pkgname+='-pgo' -fi - -pkgdesc="The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2' 'MPL' 'LGPL') +pkgdesc='The GNUzilla web browser, based on Mozilla Firefox. SafeBrowsing and other Google services disabled!' +arch=(i686 x86_64 mips64el) +license=(GPL2 MPL LGPL) depends=( - 'alsa-lib' - 'dbus-glib' - 'desktop-file-utils' - 'gtk2' - 'hicolor-icon-theme' - 'hunspell' - 'libevent' - 'libnotify' - 'libvpx' - 'libxt' - 'mime-types' - 'mozilla-common' - 'mozilla-searchplugins' - 'nss>=3.13.1' - 'sqlite3' - 'startup-notification' + alsa-lib + dbus-glib + desktop-file-utils + gtk2 + hicolor-icon-theme + hunspell + libevent + libnotify + libvpx + libxt + mime-types + mozilla-common + mozilla-searchplugins + 'nss>=3.13.3' + sqlite3 + startup-notification ) makedepends=( - 'autoconf2.13' - 'diffutils' - 'imagemagick' - 'libidl2' - 'librsvg' - 'libxslt' - 'mesa' - 'pkg-config' - 'python2' - 'unzip' - 'wireless_tools' - 'zip' + autoconf2.13 + diffutils + imagemagick + libidl2 + librsvg + libxslt + mesa + pkg-config + python2 + unzip + wireless_tools + zip +) +optdepends=( + 'wireless_tools: Location detection via available WiFi networks' ) if $_pgo; then - makedepends+=('xorg-server-xvfb') + makedepends+=(xorg-server-xvfb) options=(!ccache) fi - -url="http://www.gnu.org/software/gnuzilla/" -install=icecat.install -source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/${pkgname}-${pkgver}.tar.gz - mozconfig - mozconfig.pgo - xulrunner-copy-stub.patch - libre.patch - icecat.desktop - icecat-safe.desktop - icecat-install-dir.patch - vendor.js - cairo.patch) - -md5sums=('ba249f3e889089dc64615333dd324791' - '3117865902d1a20ab61d75707be9888e' - 'ac29b01c189f20abae2f3eef1618ffc0' - '683c4540ab84c220937feb7d1a1450ee' - 'cd52a6e3f138fa92267600cc53ff4247' - 'e81ad01dbc16ba28bf92ba4b7c309ca7' - 'd93fe402b87cd000a869e1fd6badc6c9' - '268e65c8fcae6152e156c09760a18dfd' - '0d053487907de4376d67d8f499c5502b' - '721c59ffc14f14cb0d3a90b7e84df70e') - -if [ "$_pkgname" != "$pkgname" ]; then - provides+=("$_pkgname") - conflicts+=("$_pkgname") -fi +options=(!emptydirs) +url=http://www.gnu.org/software/gnuzilla/ +install=$pkgname.install +source=( + ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz + mozconfig + mozconfig.pgo + xulrunner-copy-stub.patch + libre.patch + $pkgname.desktop + $pkgname-safe.desktop + $pkgname-install-dir.patch + vendor.js + cairo.patch +) +md5sums=( + 6bb02202cd568e8a4f43239b8f52a4a7 + 3117865902d1a20ab61d75707be9888e + ac29b01c189f20abae2f3eef1618ffc0 + 3009b176cc5f9b1e416b1bf7c45b064b + 72e6bb9ebebe555b4ab961add3df3b27 + e81ad01dbc16ba28bf92ba4b7c309ca7 + d93fe402b87cd000a869e1fd6badc6c9 + b320085e7effa2890a79f4f45760614b + 0d053487907de4376d67d8f499c5502b + c8552d030494443218d88792f4dbbd0f +) build() { - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" - export PYTHON="/usr/bin/python2" - mv "$_pkgname-$pkgver" "$srcdir/mozilla-build" - cd "$srcdir/mozilla-build" - - patch -Np1 -i "$srcdir/icecat-install-dir.patch" # install to /usr/lib/$pkgname - patch -Np1 -i "$srcdir/xulrunner-copy-stub.patch" # small fix - patch -Np1 -i "$srcdir/libre.patch" # Remove Google+Mozilla stuff - patch -Np1 -i "$srcdir/cairo.patch" - - cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch + mv $pkgname-$pkgver $srcdir/gnuzilla-build + cd $srcdir/gnuzilla-build + cp $srcdir/mozconfig .mozconfig # Load our build config, disable SafeSearch if $_pgo; then - cat "$srcdir/mozconfig.pgo" >> .mozconfig + cat $srcdir/mozconfig.pgo >> .mozconfig fi + patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname + patch -Np1 -i $srcdir/xulrunner-copy-stub.patch # small fix + patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff + patch -Np1 -i $srcdir/cairo.patch # fix cairo + + # Fix for use nspr, sqlite and nss external + sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \ + browser/installer/Makefile.in # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in # This is a bug, we should fix it. - if [ "$CARCH" = "mips64el" ]; then + if [ $CARCH = mips64el ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ js/src/assembler/wtf/Platform.h @@ -129,44 +123,43 @@ build() { fi chmod +x build/unix/run-icecat.sh # fix bug for bad file permition + export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgname" + export PYTHON=/usr/bin/python2 if $_pgo; then LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 & - LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS" + LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS=$MAKEFLAGS kill $! || true else - LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" + LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS=$MAKEFLAGS fi } package() { - cd "$srcdir/mozilla-build" - make -j1 -f client.mk DESTDIR="$pkgdir" install + cd $srcdir/gnuzilla-build + make -j1 -f client.mk DESTDIR=$pkgdir install - install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref" + install -Dm644 $srcdir/vendor.js $pkgdir/usr/lib/$pkgname/defaults/pref - brandingdir="browser/branding/unofficial" - icondir="$pkgdir/usr/share/icons/hicolor" + brandingdir=browser/branding/unofficial + icondir=$pkgdir/usr/share/icons/hicolor for i in 16x16 32x32 48x48; do - install -Dm644 "$brandingdir/default${i/x*/}.png" "$icondir/$i/apps/$_pkgname.png" + install -Dm644 $brandingdir/default${i/x*/}.png $icondir/$i/apps/$pkgname.png done - install -d "$pkgdir/usr/share/applications" - install -m644 "$srcdir/icecat.desktop" "$pkgdir/usr/share/applications" - install -m644 "$srcdir/icecat-safe.desktop" "$pkgdir/usr/share/applications" + for d in $pkgname $pkgname-safe; do + install -Dm644 $srcdir/$d.desktop $pkgdir/usr/share/applications/$d.desktop + done - rm -rf "$pkgdir/usr/lib/$_pkgname/"{dictionaries,hyphenation,searchplugins,plugins} - ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries" - ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation" - ln -sf /usr/lib/mozilla/plugins "$pkgdir/usr/lib/$_pkgname/plugins" - ln -sf /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$_pkgname/searchplugins" + rm -rf $pkgdir/usr/lib/$pkgname/{dictionaries,hyphenation,searchplugins,plugins} + ln -sf /usr/share/hunspell $pkgdir/usr/lib/$pkgname/dictionaries + ln -sf /usr/share/hyphen $pkgdir/usr/lib/$pkgname/hyphenation + ln -sf /usr/lib/mozilla/plugins $pkgdir/usr/lib/$pkgname/plugins + ln -sf /usr/lib/mozilla/searchplugins $pkgdir/usr/lib/$pkgname/searchplugins # We don't want the development stuff - rm -rf "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl} - - # Fix a bug with https-everywhere (duplicate rules) - #rm -f "$pkgdir/usr/lib/$pkgname/extensions/https-everywhere@eff.org/chrome/content/rules/GoogleMaps.xml~HEAD" + rm -rf $pkgdir/usr/{include,lib/$pkgname-devel,share/idl} # Workaround for now: https://bugzilla.mozilla.org/show_bug.cgi?id=658850 - ln -sf $_pkgname "$pkgdir/usr/lib/$_pkgname/$_pkgname-bin" + ln -sf $pkgname $pkgdir/usr/lib/$pkgname/$pkgname-bin } diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch index 981eff883..a1fabee90 100644 --- a/libre/icecat/cairo.patch +++ b/libre/icecat/cairo.patch @@ -1,16 +1,6 @@ -From: Uli Schlachter -Date: Thu, 17 May 2012 10:51:11 +0200 -Subject: Bug 722975 - Make system cairo work again - ---- - gfx/thebes/gfxPlatform.cpp | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp -index fb06fba..a0edefc 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp -@@ -436,11 +436,9 @@ void SourceBufferDestroy(void *srcBuffer) +@@ -459,11 +459,9 @@ void SourceBufferDestroy(void *srcBuffer) static_cast(srcBuffer)->Release(); } @@ -24,7 +14,7 @@ index fb06fba..a0edefc 100644 origSurf->SetData(&kSourceSurface, NULL, NULL); } -@@ -512,14 +510,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa +@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa imgSurface->Stride(), format); diff --git a/libre/icecat/icecat-install-dir.patch b/libre/icecat/icecat-install-dir.patch index 6609650da..eb698f307 100644 --- a/libre/icecat/icecat-install-dir.patch +++ b/libre/icecat/icecat-install-dir.patch @@ -1,9 +1,8 @@ -diff -Nur icecat-12.0.orig/config/autoconf.mk.in icecat-12.0/config/autoconf.mk.in ---- icecat-12.0.orig/config/autoconf.mk.in 2011-12-31 17:07:52.000000000 -0500 -+++ icecat-12.0/config/autoconf.mk.in 2011-12-31 17:11:18.000000000 -0500 +--- a/config/autoconf.mk.in ++++ b/config/autoconf.mk.in @@ -74,8 +74,8 @@ mandir = @mandir@ - idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION) + idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) @@ -12,9 +11,9 @@ diff -Nur icecat-12.0.orig/config/autoconf.mk.in icecat-12.0/config/autoconf.mk. DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ -diff -Nur icecat-12.0.orig/js/src/config/autoconf.mk.in icecat-12.0/js/src/config/autoconf.mk.in ---- icecat-12.0.orig/js/src/config/autoconf.mk.in 2011-12-20 18:28:21.000000000 -0500 -+++ icecat-12.0/js/src/config/autoconf.mk.in 2011-12-31 17:11:43.000000000 -0500 +diff -Nur a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in +--- a/js/src/config/autoconf.mk.in ++++ b/js/src/config/autoconf.mk.in @@ -60,8 +60,8 @@ datadir = @datadir@ mandir = @mandir@ diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch index a4c76b6f5..18dfcc177 100644 --- a/libre/icecat/libre.patch +++ b/libre/icecat/libre.patch @@ -1,36 +1,27 @@ -diff -Naur icecat-13.0.1/browser/app/profile/firefox.js icecat-13.0.1-libre/browser/app/profile/firefox.js ---- icecat-13.0.1/browser/app/profile/firefox.js 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/browser/app/profile/firefox.js 2012-07-17 21:35:32.600229972 -0300 -@@ -65,6 +65,7 @@ +diff -Nur a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js +--- a/browser/app/profile/firefox.js ++++ b/browser/app/profile/firefox.js +@@ -70,6 +70,7 @@ pref("extensions.getAddons.cache.enabled", true); pref("extensions.getAddons.maxResults", 15); - pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -+pref("extensions.getAddons.getWithPerformance.url", "http://www.gnu.org/s/gnuzilla/addons.html"); - pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); - pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); - pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -@@ -82,7 +83,7 @@ + pref("extensions.getAddons.get.url","http://www.gnu.org/software/gnuzilla/addons.html"); ++pref("extensions.getAddons.getWithPerformance.url","http://www.gnu.org/s/gnuzilla/addons.html"); + pref("extensions.getAddons.search.browseURL","http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.getAddons.search.url","http://www.gnu.org/software/gnuzilla/addons.html"); + pref("extensions.webservice.discoverURL","http://www.gnu.org/software/gnuzilla/addons.html"); +@@ -87,7 +88,7 @@ pref("extensions.update.autoUpdateDefault", true); // Dictionary download preference -pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -+pref("browser.dictionaries.download.url", "about:blank"); ++pref("browser.dictionaries.download.url","http://www.gnu.org/software/gnuzilla/addons.html"); // The minimum delay in seconds for the timer to fire. // default=2 minutes -@@ -247,7 +248,7 @@ - // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session - // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore - pref("browser.startup.page", 1); --pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties"); -+pref("browser.startup.homepage", "about:home"); - - // 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 -diff -Naur icecat-13.0.1/browser/base/content/aboutHome.js icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js ---- icecat-13.0.1/browser/base/content/abouthome/aboutHome.js 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/browser/base/content/abouthome/aboutHome.js 2012-07-17 23:19:05.593724417 -0300 -@@ -37,104 +37,6 @@ +diff -Nur a/browser/base/content/aboutHome.js b/browser/base/content/abouthome/aboutHome.js +--- a/browser/base/content/abouthome/aboutHome.js ++++ b/browser/base/content/abouthome/aboutHome.js +@@ -38,104 +38,6 @@ * * ***** END LICENSE BLOCK ***** */ @@ -135,18 +126,19 @@ diff -Naur icecat-13.0.1/browser/base/content/aboutHome.js icecat-13.0.1-libre/b // The process of adding a new default snippet involves: // * add a new entity to aboutHome.dtd // * add a for it in aboutHome.xhtml -@@ -142,7 +44,7 @@ +@@ -143,7 +45,7 @@ // The part of the snippet will be linked to the corresponding url. const DEFAULT_SNIPPETS_URLS = [ - "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" +- "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1" -, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2" ++ "https://www.gnu.org/software/gnuzilla/?WT.mc_ID=default1" +, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2" ]; const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day. -diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties ---- icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.properties 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/browser/locales/en-US/chrome/browser-region/region.properties 2012-07-17 22:01:56.786224684 -0300 +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 ++++ b/browser/locales/en-US/chrome/browser-region/region.properties @@ -1,28 +1,28 @@ # Default search engine -browser.search.defaultenginename=Google @@ -183,7 +175,7 @@ diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.prop # 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=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} +-browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms} +browser.search.siteSearchURL=https://duckduckgo.com/lite/?q=site%3A{moz:domain}+{searchTerms} # increment this number when anything gets changed in the list below. This will @@ -210,9 +202,9 @@ diff -Naur icecat-13.0.1/browser/locales/en-US/chrome/browser-region/region.prop +# 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 -Naur icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in icecat-13.0.1-libre/browser/locales/generic/profile/bookmarks.html.in ---- icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/browser/locales/generic/profile/bookmarks.html.in 2012-07-17 23:34:22.488558721 -0300 +diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in +--- a/browser/locales/generic/profile/bookmarks.html.in ++++ b/browser/locales/generic/profile/bookmarks.html.in @@ -11,13 +11,20 @@

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@ @@ -240,9 +232,9 @@ diff -Naur icecat-13.0.1/browser/locales/generic/profile/bookmarks.html.in iceca +
h-node

-diff -Naur icecat-13.0.1/build/pgo/blueprint/elements.html icecat-13.0.1-libre/build/pgo/blueprint/elements.html ---- icecat-13.0.1/build/pgo/blueprint/elements.html 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/build/pgo/blueprint/elements.html 2012-07-17 21:44:48.052812473 -0300 +diff -Nur a/build/pgo/blueprint/elements.html b/build/pgo/blueprint/elements.html +--- a/build/pgo/blueprint/elements.html ++++ b/build/pgo/blueprint/elements.html @@ -143,7 +143,7 @@

@@ -252,9 +244,9 @@ diff -Naur icecat-13.0.1/build/pgo/blueprint/elements.html icecat-13.0.1-libre/b

<abbr> abbr - extended text when mouseover.
-diff -Naur icecat-13.0.1/dom/ipc/test.xul icecat-13.0.1-libre/dom/ipc/test.xul ---- icecat-13.0.1/dom/ipc/test.xul 2012-07-12 14:27:37.000000000 -0300 -+++ icecat-13.0.1-libre/dom/ipc/test.xul 2012-07-17 21:48:08.242020288 -0300 +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;"/> @@ -263,9 +255,9 @@ diff -Naur icecat-13.0.1/dom/ipc/test.xul icecat-13.0.1-libre/dom/ipc/test.xul +

-tmpfs /tmp tmpfs nodev,nosuid 0 0 diff --git a/libre-testing/filesystem/group b/libre-testing/filesystem/group deleted file mode 100644 index 6e8e773d8..000000000 --- a/libre-testing/filesystem/group +++ /dev/null @@ -1,32 +0,0 @@ -root:x:0:root -bin:x:1:root,bin,daemon -daemon:x:2:root,bin,daemon -sys:x:3:root,bin -adm:x:4:root,daemon -tty:x:5: -disk:x:6:root -lp:x:7:daemon -mem:x:8: -kmem:x:9: -wheel:x:10:root -ftp:x:11: -mail:x:12: -uucp:x:14: -log:x:19:root -utmp:x:20: -locate:x:21: -rfkill:x:24: -smmsp:x:25: -http:x:33: -games:x:50: -lock:x:54: -network:x:90: -video:x:91: -audio:x:92: -optical:x:93: -floppy:x:94: -storage:x:95: -scanner:x:96: -power:x:98: -nobody:x:99: -users:x:100: diff --git a/libre-testing/filesystem/gshadow b/libre-testing/filesystem/gshadow deleted file mode 100644 index c5c76354e..000000000 --- a/libre-testing/filesystem/gshadow +++ /dev/null @@ -1,32 +0,0 @@ -root:::root -bin:::root,bin,daemon -daemon:::root,bin,daemon -sys:::root,bin -adm:::root,daemon -tty::: -disk:::root -lp:::daemon -mem::: -kmem::: -wheel:::root -ftp::: -mail::: -uucp::: -log:::root -utmp:x:: -locate::: -rfkill:x:: -smmsp::: -http::: -games::: -lock::: -network:x:: -video:x:: -audio::: -optical::: -floppy:x:: -storage:x:: -scanner:x:: -power:x:: -nobody::: -users::: diff --git a/libre-testing/filesystem/host.conf b/libre-testing/filesystem/host.conf deleted file mode 100644 index cf52fe561..000000000 --- a/libre-testing/filesystem/host.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/host.conf -# - -order hosts,bind -multi on - -# End of file diff --git a/libre-testing/filesystem/hosts b/libre-testing/filesystem/hosts deleted file mode 100644 index 1747f9196..000000000 --- a/libre-testing/filesystem/hosts +++ /dev/null @@ -1,9 +0,0 @@ -# -# /etc/hosts: static lookup table for host names -# - -# -127.0.0.1 localhost.localdomain localhost -::1 localhost.localdomain localhost - -# End of file diff --git a/libre-testing/filesystem/issue b/libre-testing/filesystem/issue deleted file mode 100644 index b001c55dd..000000000 --- a/libre-testing/filesystem/issue +++ /dev/null @@ -1,2 +0,0 @@ -Parabola GNU/Linux-libre \r (\n) (\l) - diff --git a/libre-testing/filesystem/ld.so.conf b/libre-testing/filesystem/ld.so.conf deleted file mode 100644 index dfac45683..000000000 --- a/libre-testing/filesystem/ld.so.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# /etc/ld.so.conf -# - -include /etc/ld.so.conf.d/*.conf - -# End of file diff --git a/libre-testing/filesystem/locale.sh b/libre-testing/filesystem/locale.sh deleted file mode 100644 index 5fd4174d5..000000000 --- a/libre-testing/filesystem/locale.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \ - LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION - -if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then - . "$XDG_CONFIG_HOME/locale.conf" -elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then - . "$HOME/.config/locale.conf" -elif [ -r /etc/locale.conf ]; then - . /etc/locale.conf -elif [ -r /etc/rc.conf ]; then - LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE") -fi - -export LANG="${LANG:-C}" -[ -n "$LC_CTYPE" ] && export LC_CTYPE -[ -n "$LC_NUMERIC" ] && export LC_NUMERIC -[ -n "$LC_TIME" ] && export LC_TIME -[ -n "$LC_COLLATE" ] && export LC_COLLATE -[ -n "$LC_MONETARY" ] && export LC_MONETARY -[ -n "$LC_MESSAGES" ] && export LC_MESSAGES -[ -n "$LC_PAPER" ] && export LC_PAPER -[ -n "$LC_NAME" ] && export LC_NAME -[ -n "$LC_ADDRESS" ] && export LC_ADDRESS -[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE -[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT -[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION diff --git a/libre-testing/filesystem/modprobe.d.usb-load-ehci-first b/libre-testing/filesystem/modprobe.d.usb-load-ehci-first deleted file mode 100644 index 947379411..000000000 --- a/libre-testing/filesystem/modprobe.d.usb-load-ehci-first +++ /dev/null @@ -1,2 +0,0 @@ -softdep ohci_hcd pre: ehci_hcd -softdep uhci_hcd pre: ehci_hcd diff --git a/libre-testing/filesystem/motd b/libre-testing/filesystem/motd deleted file mode 100644 index e69de29bb..000000000 diff --git a/libre-testing/filesystem/nsswitch.conf b/libre-testing/filesystem/nsswitch.conf deleted file mode 100644 index 6e459adb6..000000000 --- a/libre-testing/filesystem/nsswitch.conf +++ /dev/null @@ -1,19 +0,0 @@ -# Begin /etc/nsswitch.conf - -passwd: files -group: files -shadow: files - -publickey: files - -hosts: files dns -networks: files - -protocols: files -services: files -ethers: files -rpc: files - -netgroup: files - -# End /etc/nsswitch.conf diff --git a/libre-testing/filesystem/os-release b/libre-testing/filesystem/os-release deleted file mode 100644 index fe5f20b4f..000000000 --- a/libre-testing/filesystem/os-release +++ /dev/null @@ -1,8 +0,0 @@ -NAME="Parabola" -ID=parabola -ID_LIKE=arch -PRETTY_NAME="Parabola GNU/Linux-libre" -ANSI_COLOR="1;35" -HOME_URL="https://parabolagnulinux.org/" -BUG_REPORT_URL="https://labs.parabola.nu/" - diff --git a/libre-testing/filesystem/parabola.7.txt b/libre-testing/filesystem/parabola.7.txt deleted file mode 100644 index f7da03147..000000000 --- a/libre-testing/filesystem/parabola.7.txt +++ /dev/null @@ -1,81 +0,0 @@ -///// -vim:set ts=4 sw=4 syntax=asciidoc noet: -///// -parabola(7) -============ - -NAME ----- -parabola - basic configuration - -SYNOPSIS --------- -Overview of the basic configuration of Parabola GNU/Linux-libre. - -DESCRIPTION ------------ -Parabola exposes the user to the system without hiding any details. This manpage gives a -brief overview of the configuration files that should be set up on a fresh install. - -INITSCRIPTS[[I]] ----------------- -The initscripts are configured in rc.conf. Here you configure what daemons to start on boot, what storage -technologies should be enabled and, optionally, a basic network setup. - -HOSTNAME[[H]] -------------- -The hostname of the machine should be set in /etc/hostname. Additionally, either /etc/hosts should be -configured accordingly, or nss-myhostname should be used. This is needed so the hostname can always -be resolved to the current machine, which is required by some programs. - -LOCALIZATION[[L]] ------------------ -Various locales may be enabled in /etc/locale.gen, and generated by locale-gen. The system-wide locale to be used -can be configured in /etc/locale.conf. These settings can be overridden on a par-user basis by keeping a -user-spcefic locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists. - -VIRTUAL CONSOLE[[V]] --------------------- -The virtual console is configured in /etc/vconsole.conf. It allows you to set a font and a keyboard layout, among -other things. Note that these settings only apply to the console, and not if you use X. - -TIME[[T]] ---------- -The local timezone is configured by *symlinking* /etc/localtime to the correct zoneinfo file under -/usr/share/zoneinfo/. E.g., - - /etc/localtime -> /usr/share/zoneinfo/Europe/Paris - -The real-time clock, which keeps track of time when the computer is off, can be configured to either -be in UTC or in localtime in /etc/adjtime. The default is UTC. - -FILESYSTEMS[[F]] ----------------- -Filesystems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab. - -INITRAMFS[[R]] --------------- -The initramfs is generated by mkinitcpio, and can be configured in /etc/mkinitcpio.conf. - -PACKAGE MANAGER[[P]] --------------------- -The package manager, pacman, is configured in /etc/pacman.conf. - -BOOTLOADER[[B]] ---------------- -GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.cfg - -MODULES[[M]] ------------- -Most modules should be loaded on-demand. Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/, -and modules to be blacklisted from auto-loading can be configured in /etc/modprobe.d/. - -SEE ALSO --------- - -rc.conf(5), hostname(5), hosts(5), nsswitch.conf(5), locale.conf(5), vconsole.conf(5), timezone(3), hwclock(8), fstab(5), crypttab(5), -mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5) - -AUTHORS -------- -Written by Tom Gundersen. Rebranded for Parabola by Nicolás Reynolds and André Silva. diff --git a/libre-testing/filesystem/passwd b/libre-testing/filesystem/passwd deleted file mode 100644 index a4a24e34f..000000000 --- a/libre-testing/filesystem/passwd +++ /dev/null @@ -1,7 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -bin:x:1:1:bin:/bin:/bin/false -daemon:x:2:2:daemon:/sbin:/bin/false -mail:x:8:12:mail:/var/spool/mail:/bin/false -ftp:x:14:11:ftp:/srv/ftp:/bin/false -http:x:33:33:http:/srv/http:/bin/false -nobody:x:99:99:nobody:/:/bin/false diff --git a/libre-testing/filesystem/profile b/libre-testing/filesystem/profile deleted file mode 100644 index 3bc22db9f..000000000 --- a/libre-testing/filesystem/profile +++ /dev/null @@ -1,27 +0,0 @@ -# /etc/profile - -#Set our umask -umask 022 - -# Set our default path -PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin" -export PATH - -# Load profiles from /etc/profile.d -if test -d /etc/profile.d/; then - for profile in /etc/profile.d/*.sh; do - test -r "$profile" && . "$profile" - done - unset profile -fi - -# Source global bash config -if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then - . /etc/bash.bashrc -fi - -# Termcap is outdated, old, and crusty, kill it. -unset TERMCAP - -# Man is much better than us at figuring this out -unset MANPATH diff --git a/libre-testing/filesystem/resolv.conf b/libre-testing/filesystem/resolv.conf deleted file mode 100644 index cecafba03..000000000 --- a/libre-testing/filesystem/resolv.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/resolv.conf -# - -#search -#nameserver - -# End of file diff --git a/libre-testing/filesystem/securetty b/libre-testing/filesystem/securetty deleted file mode 100644 index 5a2235ce7..000000000 --- a/libre-testing/filesystem/securetty +++ /dev/null @@ -1,15 +0,0 @@ -# -# /etc/securetty -# - -console -tty1 -tty2 -tty3 -tty4 -tty5 -tty6 -ttyS0 -hvc0 - -# End of file diff --git a/libre-testing/filesystem/shadow b/libre-testing/filesystem/shadow deleted file mode 100644 index ccab68d33..000000000 --- a/libre-testing/filesystem/shadow +++ /dev/null @@ -1,7 +0,0 @@ -root::14871:::::: -bin:x:14871:::::: -daemon:x:14871:::::: -mail:x:14871:::::: -ftp:x:14871:::::: -http:x:14871:::::: -nobody:x:14871:::::: diff --git a/libre-testing/filesystem/shells b/libre-testing/filesystem/shells deleted file mode 100644 index 18c1aeffa..000000000 --- a/libre-testing/filesystem/shells +++ /dev/null @@ -1,8 +0,0 @@ -# -# /etc/shells -# - -/bin/sh -/bin/bash - -# End of file diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index add2fa659..49e837e02 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,24 +1,31 @@ -# $Id: PKGBUILD 163827 2012-07-20 23:47:38Z tomegun $ +# $Id: PKGBUILD 165634 2012-08-27 20:15:48Z tomegun $ # Maintainer: Tom Gundersen # Maintainer (Parabola): Nicolás Reynolds # Maintainer (Parabola): André Silva pkgname=filesystem -pkgver=2012.7 -pkgrel=1 +pkgver=2012.8 +pkgrel=1.2 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') url='https://parabolagnulinux.org' groups=('base') install='filesystem.install' +makedepends=('asciidoc') depends=('iana-etc' 'bash' 'coreutils') backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc/passwd' 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf' 'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue') source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf' 'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf' - 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first') + 'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt' + 'locale.sh') + +build() { + cd ${srcdir} + a2x -d manpage -f manpage parabola.7.txt +} package() { cd ${pkgdir} @@ -47,6 +54,7 @@ package() { done touch etc/arch-release install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf + install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh # setup /var for d in cache/man local opt log/old lib/misc empty; do @@ -69,6 +77,10 @@ package() { install -d -m755 usr/share/man/man${d} done + # + # install parabola(7) manpage + # + install -D -m644 ${srcdir}/parabola.7 usr/share/man/man7/parabola.7 # # setup /usr/local hierarchy @@ -95,4 +107,6 @@ md5sums=('45940618da782cc391c59f88ab3333c3' '22518e922891f9359f971f4f5b4e793c' 'f95416882cef800edef08382a1176b7d' 'f3b6ae7db8adffaaa4bffc6099dcbd50' - 'a8a962370cd0128465d514e6a1f74130') + 'a8a962370cd0128465d514e6a1f74130' + '3674fcb22044d2946934e7826aa0c632' + '3807d07215d9116331fe1cf8feeaa0f8') diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh new file mode 100644 index 000000000..5fd4174d5 --- /dev/null +++ b/libre/filesystem/locale.sh @@ -0,0 +1,28 @@ +#!/bin/sh + +unset LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES \ + LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION + +if [ -n "$XDG_CONFIG_HOME" ] && [ -r "$XDG_CONFIG_HOME/locale.conf" ]; then + . "$XDG_CONFIG_HOME/locale.conf" +elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then + . "$HOME/.config/locale.conf" +elif [ -r /etc/locale.conf ]; then + . /etc/locale.conf +elif [ -r /etc/rc.conf ]; then + LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE") +fi + +export LANG="${LANG:-C}" +[ -n "$LC_CTYPE" ] && export LC_CTYPE +[ -n "$LC_NUMERIC" ] && export LC_NUMERIC +[ -n "$LC_TIME" ] && export LC_TIME +[ -n "$LC_COLLATE" ] && export LC_COLLATE +[ -n "$LC_MONETARY" ] && export LC_MONETARY +[ -n "$LC_MESSAGES" ] && export LC_MESSAGES +[ -n "$LC_PAPER" ] && export LC_PAPER +[ -n "$LC_NAME" ] && export LC_NAME +[ -n "$LC_ADDRESS" ] && export LC_ADDRESS +[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE +[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT +[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION diff --git a/libre/filesystem/parabola.7.txt b/libre/filesystem/parabola.7.txt new file mode 100644 index 000000000..f7da03147 --- /dev/null +++ b/libre/filesystem/parabola.7.txt @@ -0,0 +1,81 @@ +///// +vim:set ts=4 sw=4 syntax=asciidoc noet: +///// +parabola(7) +============ + +NAME +---- +parabola - basic configuration + +SYNOPSIS +-------- +Overview of the basic configuration of Parabola GNU/Linux-libre. + +DESCRIPTION +----------- +Parabola exposes the user to the system without hiding any details. This manpage gives a +brief overview of the configuration files that should be set up on a fresh install. + +INITSCRIPTS[[I]] +---------------- +The initscripts are configured in rc.conf. Here you configure what daemons to start on boot, what storage +technologies should be enabled and, optionally, a basic network setup. + +HOSTNAME[[H]] +------------- +The hostname of the machine should be set in /etc/hostname. Additionally, either /etc/hosts should be +configured accordingly, or nss-myhostname should be used. This is needed so the hostname can always +be resolved to the current machine, which is required by some programs. + +LOCALIZATION[[L]] +----------------- +Various locales may be enabled in /etc/locale.gen, and generated by locale-gen. The system-wide locale to be used +can be configured in /etc/locale.conf. These settings can be overridden on a par-user basis by keeping a +user-spcefic locale.conf in $HOME/.config/locale.conf. The user-specific file will take precedence if it exists. + +VIRTUAL CONSOLE[[V]] +-------------------- +The virtual console is configured in /etc/vconsole.conf. It allows you to set a font and a keyboard layout, among +other things. Note that these settings only apply to the console, and not if you use X. + +TIME[[T]] +--------- +The local timezone is configured by *symlinking* /etc/localtime to the correct zoneinfo file under +/usr/share/zoneinfo/. E.g., + + /etc/localtime -> /usr/share/zoneinfo/Europe/Paris + +The real-time clock, which keeps track of time when the computer is off, can be configured to either +be in UTC or in localtime in /etc/adjtime. The default is UTC. + +FILESYSTEMS[[F]] +---------------- +Filesystems are configured in /etc/fstab, and encryption mappings are configured in /etc/crypttab. + +INITRAMFS[[R]] +-------------- +The initramfs is generated by mkinitcpio, and can be configured in /etc/mkinitcpio.conf. + +PACKAGE MANAGER[[P]] +-------------------- +The package manager, pacman, is configured in /etc/pacman.conf. + +BOOTLOADER[[B]] +--------------- +GRUB's configuration is generated from /etc/default/grub by grub-mkconfig. Syslinux is configured in /boot/syslinux/syslinux.cfg + +MODULES[[M]] +------------ +Most modules should be loaded on-demand. Modules to be unconditionally loaded at boot can be specified in /etc/modules-load.d/, +and modules to be blacklisted from auto-loading can be configured in /etc/modprobe.d/. + +SEE ALSO +-------- + +rc.conf(5), hostname(5), hosts(5), nsswitch.conf(5), locale.conf(5), vconsole.conf(5), timezone(3), hwclock(8), fstab(5), crypttab(5), +mkinitcpio(8), pacman(8), pacman.conf(5), grub-mkconfig(8), syslinux(1), modules-load.d(5), modprobe.d(5) + +AUTHORS +------- +Written by Tom Gundersen. Rebranded for Parabola by Nicolás Reynolds and André Silva. -- cgit v1.2.3 From 6110ce46051a4079d110268965fff1df7a73e770 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 4 Sep 2012 09:42:07 -0300 Subject: xulrunner-libre-15.0.1-1: updating version --- ...Make-the-Reset-Firefox-feature-more-gener.patch | 143 ++++++++++----------- libre/xulrunner-libre/PKGBUILD | 10 +- 2 files changed, 73 insertions(+), 80 deletions(-) diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch index 4a0507271..240c3d4e8 100644 --- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch +++ b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch @@ -41,10 +41,10 @@ index 0e8ccf5..fa46c08 100644 brandBundle.getFormattedString("homePageImport", [appName]); var oldHomePage = document.getElementById("oldHomePage"); diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul -index 4bcc1d9..c4db956 100644 +index f030756..23e37ff 100644 --- a/browser/components/migration/content/migration.xul +++ b/browser/components/migration/content/migration.xul -@@ -74,7 +74,7 @@ +@@ -42,7 +42,7 @@ #elifdef XP_UNIX #endif @@ -54,7 +54,7 @@ index 4bcc1d9..c4db956 100644 diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest -index 527771f..782b38f 100644 +index d7fec75..d531b83 100644 --- a/browser/components/migration/src/BrowserProfileMigrators.manifest +++ b/browser/components/migration/src/BrowserProfileMigrators.manifest @@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737 @@ -63,11 +63,11 @@ index 527771f..782b38f 100644 component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js -contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386} +contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386} + #ifdef HAS_IE_MIGRATOR component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4} - component {4b609ecf-60b2-4655-9df4-dc149e474da1} SafariProfileMigrator.js diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js -index 8f14f49..8dc175d 100644 +index a6598fe..8f83da8 100644 --- a/browser/components/migration/src/FirefoxProfileMigrator.js +++ b/browser/components/migration/src/FirefoxProfileMigrator.js @@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", { @@ -80,7 +80,7 @@ index 8f14f49..8dc175d 100644 const NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]); diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm -index 9460e6d..8db6827 100644 +index 0669aa8..19552e3 100644 --- a/browser/components/migration/src/MigrationUtils.jsm +++ b/browser/components/migration/src/MigrationUtils.jsm @@ -403,11 +403,6 @@ let MigrationUtils = Object.freeze({ @@ -126,10 +126,10 @@ index 744f117..59e5a4c 100644 classDescription: "Profile Migrator", contractID: "@mozilla.org/toolkit/profile-migrator;1", diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd -index 0b4b776..ce26fbd 100644 +index 21cf405..f3c1a6b 100644 --- a/browser/locales/en-US/chrome/browser/migration/migration.dtd +++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd -@@ -13,8 +13,6 @@ +@@ -17,8 +17,6 @@ @@ -139,10 +139,10 @@ index 0b4b776..ce26fbd 100644 diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties -index f522a66..be26460 100644 +index ab82d85..915f6b8 100644 --- a/browser/locales/en-US/chrome/browser/migration/migration.properties +++ b/browser/locales/en-US/chrome/browser/migration/migration.properties -@@ -4,7 +4,6 @@ profileName_format=%S %S +@@ -8,7 +8,6 @@ profileName_format=%S %S sourceNameIE=Internet Explorer sourceNameSafari=Safari sourceNameChrome=Google Chrome @@ -150,7 +150,7 @@ index f522a66..be26460 100644 importedBookmarksFolder=From %S -@@ -18,29 +17,29 @@ importedSafariReadingList=Reading List (From Safari) +@@ -22,22 +21,22 @@ importedSafariReadingList=Reading List (From Safari) 2_ie=Cookies 2_safari=Cookies 2_chrome=Cookies @@ -177,79 +177,72 @@ index f522a66..be26460 100644 32_ie=Favorites 32_safari=Bookmarks - 32_chrome=Bookmarks --32_firefox=Bookmarks -+32_self=Bookmarks - +@@ -46,4 +45,4 @@ importedSafariReadingList=Reading List (From Safari) 64_ie=Other Data 64_safari=Other Data 64_chrome=Other Data -64_firefox=Bookmarks Backups +64_self=Bookmarks Backups -diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js -index 957d4d8..1af3629 100644 ---- a/toolkit/content/aboutSupport.js -+++ b/toolkit/content/aboutSupport.js -@@ -616,13 +616,13 @@ function populateResetBox() { - .getService(Ci.nsIToolkitProfileService); +diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn +index 697b217..b6e1709 100644 +--- a/toolkit/content/jar.mn ++++ b/toolkit/content/jar.mn +@@ -38,7 +38,7 @@ toolkit.jar: + + content/global/mozilla.xhtml (mozilla.xhtml) + *+ content/global/nsDragAndDrop.js (nsDragAndDrop.js) + content/global/resetProfile.css (resetProfile.css) +-* content/global/resetProfile.js (resetProfile.js) ++ content/global/resetProfile.js (resetProfile.js) + * content/global/resetProfile.xul (resetProfile.xul) + * content/global/resetProfileProgress.xul (resetProfileProgress.xul) + * content/global/treeUtils.js (treeUtils.js) +diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js +index dcb4065..09c1146 100644 +--- a/toolkit/content/resetProfile.js ++++ b/toolkit/content/resetProfile.js +@@ -36,13 +36,13 @@ function resetSupported() { + getService(Ci.nsIToolkitProfileService); let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile); -#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__"; -#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__"; - - // Only show the reset box for the default profile if the self-migrator used for reset exists. + // Reset is only supported for the default profile if the self-migrator used for reset exists. try { - if (!currentProfileDir.equals(profileService.selectedProfile.rootDir) || -- !("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc)) -+ !("@mozilla.org/toolkit/profile-migrator;1" in Cc)) -+ return; -+ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator); -+ if (!("canMigrate" in pm) || !pm.canMigrate("self")) - return; - document.getElementById("reset-box").style.visibility = "visible"; +- return currentProfileDir.equals(profileService.selectedProfile.rootDir) && +- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc); ++ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) && ++ "@mozilla.org/toolkit/profile-migrator;1" in Cc) { ++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator); ++ return ("canMigrate" in pm) && pm.canMigrate("self"); ++ } } catch (e) { -diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js -index 84de6cd..3126da6 100644 ---- a/toolkit/content/resetProfile.js -+++ b/toolkit/content/resetProfile.js -@@ -6,6 +6,7 @@ Components.utils.import("resource://gre/modules/Services.jsm"); + // Catch exception when there is no selected profile. + Cu.reportError(e); +@@ -53,9 +53,6 @@ function resetSupported() { + function getMigratedData() { + Components.utils.import("resource:///modules/MigrationUtils.jsm"); - // based on onImportItemsPageShow from migration.js - function onResetProfileLoad() { -+<<<<<<< HEAD - #expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__"; - #expand const MOZ_APP_NAME = "__MOZ_APP_NAME__"; - -@@ -16,16 +17,22 @@ function onResetProfileLoad() { - "8_" + MOZ_APP_NAME, // Form History - "2_" + MOZ_APP_NAME, // Cookies - ]; -+======= -+ Components.utils.import("resource:///modules/MigrationUtils.jsm"); -+ const MAX_MIGRATED_TYPES = 16; -+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic - - var migratedItems = document.getElementById("migratedItems"); -- var bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP + -- "/locale/migration/migration.properties"); - - // Loop over possible data to migrate to give the user a list of what will be preserved. - for (var itemStringName of MIGRATED_TYPES) { +-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__"; +-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__"; +- + // From migration.properties + const MIGRATED_TYPES = [ + 4, // History and Bookmarks +@@ -68,7 +65,7 @@ function getMigratedData() { + let dataTypes = []; + for (let itemID of MIGRATED_TYPES) { try { - var checkbox = document.createElement("label"); -+<<<<<<< HEAD - checkbox.setAttribute("value", bundle.GetStringFromName(itemStringName)); -+======= -+ checkbox.setAttribute("value", MigrationUtils.getLocalizedString(itemID + "_self")); -+>>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic - migratedItems.appendChild(checkbox); +- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME); ++ let typeName = MigrationUtils.getLocalizedString(itemID + "_self"); + dataTypes.push(typeName); } catch (x) { // Catch exceptions when the string for a data type doesn't exist. diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl -index e941336..5b264af 100644 +index f35c227..7062886 100644 --- a/toolkit/profile/nsIProfileMigrator.idl +++ b/toolkit/profile/nsIProfileMigrator.idl -@@ -69,7 +69,7 @@ interface nsIProfileStartup : nsISupports +@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports * @client Toolkit (Startup code) * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1") */ @@ -258,7 +251,7 @@ index e941336..5b264af 100644 interface nsIProfileMigrator : nsISupports { /** -@@ -92,6 +92,14 @@ interface nsIProfileMigrator : nsISupports +@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports * @note The startup code ignores COM exceptions thrown from this method. */ void migrate(in nsIProfileStartup aStartup, in ACString aKey); @@ -274,15 +267,15 @@ index e941336..5b264af 100644 %{C++ diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp -index d2db0e2..45a4b0d 100644 +index e5d3042..6de3390 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3642,7 +3642,7 @@ XREMain::XRE_mainRun() - if (gDoProfileReset) { - // Automatically migrate from the current application if we just - // reset the profile. -- aKey = MOZ_APP_NAME; -+ aKey = "self"; +@@ -3650,7 +3650,7 @@ XREMain::XRE_mainRun() + if (gDoProfileReset) { + // Automatically migrate from the current application if we just + // reset the profile. +- aKey = MOZ_APP_NAME; ++ aKey = "self"; + } pm->Migrate(&mDirProvider, aKey); - // Set the new profile as the default after migration. - rv = SetCurrentProfileAsDefault(mProfileSvc, mProfD); + } diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD index 8c332db12..c4e72cfea 100644 --- a/libre/xulrunner-libre/PKGBUILD +++ b/libre/xulrunner-libre/PKGBUILD @@ -6,8 +6,8 @@ # We're getting this from Debian Experimental _debname=iceweasel -_debver=14.0.1 -_debrel=2 +_debver=15.0 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -30,11 +30,11 @@ options=('!emptydirs') conflicts=('xulrunner') provides=("xulrunner=${_debver}") replaces=('xulrunner-oss' 'xulrunner') -md5sums=('8e4f3987d37c8e73b168948d0771b872' - '8689c150a4d3a0a688ad2db6044feac6' +md5sums=('aa5a7f08f55a2b02a71c86f30ef75a25' + 'b93090724434e3801375730744e79950' 'f2f4f4a573f549e8b494e33b3ad226bc' '27271ce647a83906ef7a24605e840d61' - '88350bc611361a1ff635f5c960c6d6ee') + 'c52fac65c1e06290a5108b75c31ace79') build() { export QUILT_PATCHES=debian/patches -- cgit v1.2.3