gnu: Remove icecat-68 source.
It was necessary for icedove@68 which is now based on icecat@78. * gnu/packages/gnuzilla.scm (mozilla-68-compare-locales): Remove. (all-mozilla-68-locales): Remove. (%icecat-68-version): Remove. (icecat-68-source): Remove. * gnu/packages/patches/icecat-68-makeicecat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. Modified-By: Mark H Weaver <mhw@netris.org> Signed-off-by: Mark H Weaver <mhw@netris.org>
This commit is contained in:
		
							parent
							
								
									597aa644af
								
							
						
					
					
						commit
						e648533311
					
				
					 3 changed files with 0 additions and 384 deletions
				
			
		|  | @ -1135,7 +1135,6 @@ dist_patch_DATA =						\ | |||
|   %D%/packages/patches/hurd-xattr.patch				\
 | ||||
|   %D%/packages/patches/hplip-remove-imageprocessor.patch	\
 | ||||
|   %D%/packages/patches/hydra-disable-darcs-test.patch		\
 | ||||
|   %D%/packages/patches/icecat-68-makeicecat.patch		\
 | ||||
|   %D%/packages/patches/icecat-makeicecat.patch			\
 | ||||
|   %D%/packages/patches/icecat-avoid-bundled-libraries.patch	\
 | ||||
|   %D%/packages/patches/icecat-use-older-reveal-hidden-html.patch	\
 | ||||
|  |  | |||
|  | @ -1156,279 +1156,6 @@ standards of the IceCat project.") | |||
|        (cpe-name . "firefox_esr") | ||||
|        (cpe-version . ,(first (string-split version #\-))))))) | ||||
| 
 | ||||
| (define mozilla-68-compare-locales | ||||
|   (origin | ||||
|     (method hg-fetch) | ||||
|     (uri (hg-reference | ||||
|           (url "https://hg.mozilla.org/l10n/compare-locales/") | ||||
|           (changeset "RELEASE_3_3_0"))) | ||||
|     (file-name "mozilla-68-compare-locales") | ||||
|     (sha256 (base32 "0biazbq7vbi99b99rfn4szwyx032dkpi09c9z4zs6f1br0f86iy1")))) | ||||
| 
 | ||||
| (define all-mozilla-68-locales | ||||
|   (mozilla-locales | ||||
|    ;;                      sha256                            changeset    locale | ||||
|    ;;--------------------------------------------------------------------------- | ||||
|    ("0pybx6j2ycbrr1xmv0spv19sd8a1dyzcs8kf6pzn71w8y6kiagcf" "35959cf2343c" "ach") | ||||
|    ("0dixmkha738w7fkx20nx95xkfyrqb9vczpy6m03qnqfvb76xaxj5" "e8dc1010f909" "af") | ||||
|    ("124j09va25gwfxdzyfixrli0skxv53c7niagjyp7g3a3kcv2lbhc" "4c67f6b96a7b" "an") | ||||
|    ("0flgqll3xx0ym0zj0w9j2jw3fmhs6h9m4l5da6m0bpnk5ff80r06" "34cbea5f44a5" "ar") | ||||
|    ("0kdb1yqfbfz508f4p77z3p1v6fwy190vs5ipj58hgdixjgbxkqay" "b4790b27633c" "ast") | ||||
|    ("1vm5xw6wg12pygswd3p0qpkaxyryah6nif5n15chb4sb42c1gqcm" "96d341bf49d4" "az") | ||||
|    ("1j2qrrws51qij6haz5b77n5vzqhsxgs1ppqqw4mdrkacwvz4ciwh" "4adaede00646" "be") | ||||
|    ("0ydr8f9lbd51prgcbjb5yacb461j8va0s5bqfs0rnglkvhmk6ard" "d1140972aefe" "bg") | ||||
|    ("0wyw90zjp8kpd1gljng00in9wr2cf59ww6z002lgx5k4gibnqcfd" "2b3ce92c2310" "bn") | ||||
|    ("0kkq621h1qdmimyrmms9g5p70m54z2ddw4cd962nqbkrnmabq9vn" "426896350893" "br") | ||||
|    ("0vibhnb3cbpbgf10db04g6vm372kb9i27p0jkwif019f7qprswd8" "7463f339ce07" "bs") | ||||
|    ("1l8cn2fqfvx7bswzfy9vavv8cd32ha9ygdxxdbxi64wcgw0f80bf" "dab3f05125e4" "ca") | ||||
|    ("0fik17y8zyg9w82lq501ic73a53c0q9r8v4zgn9bnzgsygig8qpq" "ebb9d989275a" "cak") | ||||
|    ("0sj29v6144h39wzb4rvxph3cwgvs4gzkgpr0463d3fcs6jdi0kjs" "522352780348" "cs") | ||||
|    ("1nz8jlx62l69jcdi59hlk8jysm15sh3d1cxqginjmx7w351wsidm" "0791b954c333" "cy") | ||||
|    ("1vc01q1vlq26xm1vm1x0119jawxxp975p9k8ashmiwncl1bvqb48" "121f5f876f4c" "da") | ||||
|    ("1iqny61rg57banfbbskc2y3pr6d35fabnxmynv7vxm9jd86pndz3" "95fb3e99a2bc" "de") | ||||
|    ("06v9j8acx5h8za7m65v6qm0wjbkx6vm46m8sigcp69phyg3fjc96" "90e681b74587" "dsb") | ||||
|    ("0lbk90x2dxdbh63fycqxspx6jqq2zlzys6grg45balw8yyvzqrkz" "58ba4c13fd42" "el") | ||||
|    ("0c2ypvy0z8g78s5158v6h9khckq1xps34r5wbiiciix289m43dgl" "8953d8c98a30" "en-CA") | ||||
|    ("0z3riz3w2z6p710p90ridmwwam4snnz5mn90gd4jc1h2n7vc9mr0" "5a2b9bca3f52" "en-GB") | ||||
|    ("102gn3h4ap8c3x1p7vfc88vapkfiz6264y6byhxy1axxjk3x3a77" "e87cb1c61d6e" "eo") | ||||
|    ("148wj6wsx0aq7cpaxk8njj7cb1wfjr2m96dgxq6b3qcv781ldvjn" "5db15fdf95d5" "es-AR") | ||||
|    ("0r11d8vzvbyz17n371byvkrnszcv1zhr7rg64i58xra3y6d7is7n" "ce2ee0e51a92" "es-CL") | ||||
|    ("1xmqa8p7lpqvkgg879hfnmf6kxcpawjk8z31cdzfp1hrdlmxg8n7" "7346617620f3" "es-ES") | ||||
|    ("0jxv3jh2018lnybr9mzqrffvwmr87yab9bh8lxqjj294fxw1hrxm" "687f05eb0c58" "es-MX") | ||||
|    ("1rpgv7pajv4xldsn1xxsia5j72vn3x8zl5wmbzkyw56lvn9fckvf" "839a5029c496" "et") | ||||
|    ("0hxp4fr3y05rkpamdb1hlmybn6d3bv3rcawjm3axbpqxbyfdpfzc" "54e8d87230c9" "eu") | ||||
|    ("1y50knymnmcihw8bhvahicc386mjm6dx4hx0j6fv8sl23wzx2h9m" "c5ffca960f9c" "fa") | ||||
|    ("0pj9zgi0c3yl3myhvb5afiijayp2lqzhlk630ahxn5hgjgkz0lx7" "75c000a8538d" "ff") | ||||
|    ("199jg0zv7wp1cq0ik2hf84j99jx5vq2jwac0gaayvjzkh2z83jqr" "f11b2e689e7b" "fi") | ||||
|    ("1vxkiwwni7470ywy99arxxa56ljkhjrhxslsp1l1l61g6gdbbspr" "49ec4f791806" "fr") | ||||
|    ("0d8gwdcj0jpjv03nhjds8jrg86pg371xpylaibwri76wlyl7m54i" "faa761a5cfdc" "fy-NL") | ||||
|    ("0nipbxx11a2sjadzhbi88vgknw5hzr4nqy2722q3kc1212jbi754" "5bd9466f9f9d" "ga-IE") | ||||
|    ("0bay8mrm65cvmnvqpwqgzr0h3cb18ifzg5kbsbxcvdfm9xv0zi9g" "a4f6a47e82dd" "gd") | ||||
|    ("00kn5w3nnpw1pxg6hhrn9asf9hgpjd6ia4038iwzcqs68w887qcy" "6c2aa01ada4e" "gl") | ||||
|    ("0jj13i0ach85c975vaz2rr83mibs29ipssa7qsjkb0y2ch6xya1k" "c2d607e36cb5" "gn") | ||||
|    ("1nhqbgzilcb0pr7941dxkhg079bf8v7ldikp1s5xli34wf9sabm2" "f34465d6ac1c" "gu-IN") | ||||
|    ("11bh0541d996cfin1zy72l66753q94i4idgv2waf0h40h9g3z1bm" "c2ecb2762274" "he") | ||||
|    ("1lslji7hh5lx5ig1xgfjh4cdindsgh3n2a7qlvzwz96gda43lvv4" "94d2bb10ee03" "hi-IN") | ||||
|    ("1nx5yw00l25i3m3grdm29mi9mi7h0cy5qx02pypir754pk3hiwcc" "08df0d94edd5" "hr") | ||||
|    ("19yc9dk2pwqycynmx58d1ik6x4mnyfxscgr6sg676dpl613xd7nq" "21b614e77025" "hsb") | ||||
|    ("0l3z64jlx6b6ivk1b5hwqyx9hm1m5721ywnb2m4zmg3g9fw4vn7f" "f82cad7170af" "hu") | ||||
|    ("1sn0dxbbf2zwcpybwcw77qb4p0hf6fxapnsnn4avaab5g55dlgz4" "d94c30920396" "hy-AM") | ||||
|    ("0c92cqxrhv4317kirmhpjk7mrq44yn6fp3v6syxnhz7xwxnhshjm" "6a5f176b0626" "ia") | ||||
|    ("03gyg9gqsd6pwb9nydglhm46fi2wk2p2qygmhmrf8hnav3ba7n0r" "94e4302e0f85" "id") | ||||
|    ("0ky8aaps92mn56rvkwn0i13wg8av8hzi1fvr0ahqhjcpj5sfgdwq" "eca348a59888" "is") | ||||
|    ("01py0sfg7nljcsgpivryrvai4p4wzbcvhgc2ymr19r579nv1vw7g" "d541a6197359" "it") | ||||
|    ("0iv7vmj43njmi7g1gjzsv68ax4j502d2wnkvbfz1rx11lrqs7yw1" "a5ab3a1d95b7" "ja") | ||||
|    ("1sr9ccshcw6agbj4hbnpblxixb1jz0m36glas6f9ahxmi7m605si" "63763ffa5a94" "ja-JP-mac") | ||||
|    ("1as33pzcsdkynrj16dv7w642vl6plbhk650am4l5djwm64f2rgms" "aa83e8555ddc" "ka") | ||||
|    ("1jwaqb5qps3i5y9iw8l2hrwa0n8lfnx1k9x0p54y3jkh6p3q3fzc" "0e0e25c26247" "kab") | ||||
|    ("0cjfiwv0q5i8d7fpwb4m2w5ahq687dqjlwlicgpa443yi2zsxr4s" "33117723ceb1" "kk") | ||||
|    ("0k5b56cv39aaxf9r0p9c27f3fp6yq2ffd4w6qmd0ibpl69sm629d" "aff7b2a7825e" "km") | ||||
|    ("1a0zg96jgq4zn9cz0h2qwc0vv1fbkfzs5qrgabg62wqgz286jvvv" "ea91638cb1dd" "kn") | ||||
|    ("0jhmv2n3yx55r6fg3myg7j1c1nhsv25g016m6lh2j023xbr723gp" "88821009b5b3" "ko") | ||||
|    ("06bybgv4m4i7r9p0qld65j31vbrnljhsdj649dl93msv2r69ilif" "88685d5f07b3" "lij") | ||||
|    ("1bzjf8smw6ngi88j5g3fawrg54m8fifbhshwjbgkpj7rnrpjgh4w" "e046c7ffa7d0" "lt") | ||||
|    ("18dmzmpavijb7fwzffas0j5nb6byqp8h6ki7hhf6qb35diqgfq6n" "c520ef4f576c" "lv") | ||||
|    ("055zf7xj5h1h8mzxj1cjzhngpcvg2p5vs2dmffsa5zfprj02d0dm" "9e43723f18ad" "mk") | ||||
|    ("1496fbyyzcl075gzcd3xy50h9jyhnzgb544k1scji56yhyfajacb" "ce615fef92c1" "mr") | ||||
|    ("1wc1q8ksry181pvnysqsq4dhhsg5adw5vgqafmmq5sf6i2bwn2z0" "4fefe88cfaee" "ms") | ||||
|    ("0awf6mrdwdhy2yvxynssvp1zg1nc2fqbmg2d2bhjcib69zx944xw" "3987a06866fd" "my") | ||||
|    ("1hycvz7i4jd40hfs5abx6sgfdkafg0jhdgqih9b7lb08aqcl35pj" "2b3b8997d9a1" "nb-NO") | ||||
|    ("048z1ib46izwryyy8l1x71kq4775n7l2ilbskhsyrbxqryma13k8" "f25324281615" "ne-NP") | ||||
|    ("1qkxqpyr4la9bn1bqsgc2h9869arglh9n2kwpkq6722jzdbynkz2" "04c7d32c57f6" "nl") | ||||
|    ("08gnmdll55dbqj7qs63gq1kljbvg24nzns6q4m0av3sszsic0jv5" "5587520e5019" "nn-NO") | ||||
|    ("1yh2p4ipj5p2b7gh0xxj0n7ndvwn5bw2773ibrh7vz932mkzhhjn" "499386b02695" "oc") | ||||
|    ("0kjbnixjzv9hvyba4ll20gs76vx84pviy134fvpjp9lfjpnpib55" "31c01c325675" "pa-IN") | ||||
|    ("0g61imvr4639bbydyi0kwc1il7l1gzlfij4ywx7hdcmq2x6vgb9v" "fb5f3b8dea09" "pl") | ||||
|    ("13n68d7z94d7943m6fwl4kizbqm3wp82xz69vng4w9vyqlvv7d41" "9a541cbdc748" "pt-BR") | ||||
|    ("1j8afvrl1afmj2zixrp91rrhag5w4xw90raca1ic6mxyih9kvdi4" "edc959a685c2" "pt-PT") | ||||
|    ("0wf4a6q9nvcmam2g8ksbymjdnrz59pdr5nirfpjprfhifjmxx4nn" "d2699db715cd" "rm") | ||||
|    ("1k9qalir5pbh490w1mxyq31yhy9hbxsyrrk11hwlwlgn6syp9nvp" "b5460a9017bc" "ro") | ||||
|    ("1avy6wyfa5lbvy36wai6mwhhh6x1y8a0jyjk8hvjn52yfxj1gypk" "59ffa8ad047a" "ru") | ||||
|    ("1cakhm4jxcw1ij0l1vhxw74hsp5wg68i3319dkdncyyc5a2s1qv9" "8b3c8a7ebdfa" "si") | ||||
|    ("0s534r09bqdfvw3q17y9b1035kzzlafjv656v73mqhyz3fkffsx5" "cb39dc77980e" "sk") | ||||
|    ("1s58vgmnb9aiaiaqwwcivq3iyzpzj527w2aqh2nrh6xmaw7f43sr" "17d7969b1d9a" "sl") | ||||
|    ("147qm7x5z8rkf24jpqvkdlqg0fjz1l3zwnaxvkh9y2jpzv7m0x7z" "c55b0e9ff99d" "son") | ||||
|    ("0nn4r1rxi8cy7x9nmn5ljd8gcsn2rjl2ma2j7waxkafkm4rs6n20" "2bb3808072da" "sq") | ||||
|    ("0jsb01b94z7qbm59yaj56nb7yx7a6hpgw8v6nzwhbvmnmcsird4p" "c323c0d02d61" "sr") | ||||
|    ("1n7vv9y4sk3gig56rgfd2jk8jr2160grxk31bd1wkm7fvbndd259" "4220ce487cbc" "sv-SE") | ||||
|    ("06270mq7gajxfrsb8gqd25v2dac68ask5vvlh6kkkp3hrgy02vid" "6a1dbc2fe1d3" "ta") | ||||
|    ("10az7pd3npa7n8wq0qywvsj2qrx9592i2wffs3rnc1fviv1i1q0y" "028505b5ecd1" "te") | ||||
|    ("0yj0c3iyibb3jyypvyiyhbr9asxa48v0nq21kcf9gphi8fnyp5if" "e44d38b6a67b" "th") | ||||
|    ("1qc4nvhw834lx7p304fxma0fjdr4xfj4lf69dhh6biqz795lx45p" "1e0771d95708" "tr") | ||||
|    ("1g4y2yq5xp61ncy7c08j7fqqr1jc0m1hjxmbg5659wzif3b3dkg4" "e3c96943e98f" "uk") | ||||
|    ("1zbi28z1c3p5il7ndixyjsv4nrimzq36zjvlmq10am38ycqr9df8" "f35da1b02691" "ur") | ||||
|    ("1jrxjjj8k771y0wljqbadxdj4pasg0771jmg4l3hvpgs929i3j9g" "6fd2084b3efe" "uz") | ||||
|    ("1f8sqgxzgqmw6vzjv3f49lg43q09i3j62f471864vr71815agl8n" "33b5dfd0cd63" "vi") | ||||
|    ("0ssnsbxw3q5k88fa081gkn1mbqn4j7bm6vb7yvz6h44j214xkz9x" "2d87c0740715" "xh") | ||||
|    ("0kd3mrvvgczhsmw4rvpxxxc71bb469ayr8r4azf7gc0y5nmlm950" "a2b6625688d3" "zh-CN") | ||||
|    ("0qy1asyfplkyc89z3g3gfm7b32aka92350b3ayv9d9dcgwxmfdwz" "4d6e959a13d1" "zh-TW"))) | ||||
| 
 | ||||
| (define %icecat-68-version "68.12.0-guix0-preview1") | ||||
| 
 | ||||
| ;; 'icecat-68-source' is a "computed" origin that generates an IceCat 68 | ||||
| ;; tarball from the corresponding upstream Firefox ESR tarball, using the | ||||
| ;; 'makeicecat' script from the upstream IceCat project. | ||||
| (define icecat-68-source | ||||
|   (let* ((base-version (first (string-split %icecat-68-version #\-))) | ||||
| 
 | ||||
|          (major-version (first  (string-split base-version #\.))) | ||||
|          (minor-version (second (string-split base-version #\.))) | ||||
|          (sub-version   (third  (string-split base-version #\.))) | ||||
| 
 | ||||
|          (upstream-firefox-version (string-append base-version "esr")) | ||||
|          (upstream-firefox-source | ||||
|           (origin | ||||
|             (method url-fetch) | ||||
|             (uri (string-append | ||||
|                   "https://ftp.mozilla.org/pub/firefox/releases/" | ||||
|                   upstream-firefox-version "/source/" | ||||
|                   "firefox-" upstream-firefox-version ".source.tar.xz")) | ||||
|             (sha256 | ||||
|              (base32 | ||||
|               "1k17pi4zh9hrvkzbw4rzzw879a15hpvwriylp75wl22rl7r2nsdf")))) | ||||
| 
 | ||||
|          (upstream-icecat-base-version "68.12.0") ; maybe older than base-version | ||||
|          ;;(gnuzilla-commit (string-append "v" upstream-icecat-base-version)) | ||||
|          (gnuzilla-commit "15a7c3d991a670b6489d4f432b52a188358f4ca5") | ||||
|          (gnuzilla-source | ||||
|           (origin | ||||
|             (method git-fetch) | ||||
|             (uri (git-reference | ||||
|                   (url "git://git.savannah.gnu.org/gnuzilla.git") | ||||
|                   (commit gnuzilla-commit))) | ||||
|             (file-name (git-file-name "gnuzilla" | ||||
|                                       ;;upstream-icecat-base-version | ||||
|                                       (string-take gnuzilla-commit 8))) | ||||
|             (sha256 | ||||
|              (base32 | ||||
|               "0n7p067yay413iy0gzprz0xrdkcxj5f8ywhkcghhhzw1nwajckba")))) | ||||
| 
 | ||||
|          (makeicecat-patch | ||||
|           (local-file (search-patch "icecat-68-makeicecat.patch"))) | ||||
|          (gnuzilla-fixes-patch | ||||
|           (local-file (search-patch "icecat-use-older-reveal-hidden-html.patch")))) | ||||
| 
 | ||||
|     (origin | ||||
|       (method computed-origin-method) | ||||
|       (file-name (string-append "icecat-" %icecat-68-version ".tar.xz")) | ||||
|       (sha256 #f) | ||||
|       (uri | ||||
|        (delay | ||||
|         (with-imported-modules '((guix build utils)) | ||||
|           #~(begin | ||||
|               (use-modules (guix build utils)) | ||||
|               (let ((firefox-dir | ||||
|                      (string-append "firefox-" #$base-version)) | ||||
|                     (icecat-dir | ||||
|                      (string-append "icecat-" #$%icecat-68-version))) | ||||
| 
 | ||||
|                 (mkdir "/tmp/bin") | ||||
|                 (set-path-environment-variable | ||||
|                  "PATH" '("bin") | ||||
|                  (list "/tmp" | ||||
|                        #+(canonical-package bash) | ||||
|                        #+(canonical-package coreutils) | ||||
|                        #+(canonical-package findutils) | ||||
|                        #+(canonical-package patch) | ||||
|                        #+(canonical-package xz) | ||||
|                        #+(canonical-package sed) | ||||
|                        #+(canonical-package grep) | ||||
|                        #+(canonical-package bzip2) | ||||
|                        #+(canonical-package gzip) | ||||
|                        #+(canonical-package tar) | ||||
|                        #+rename)) | ||||
| 
 | ||||
|                 (symlink #+(file-append rename "/bin/rename") | ||||
|                          "/tmp/bin/prename") | ||||
| 
 | ||||
|                 ;; We copy the gnuzilla source directory because it is | ||||
|                 ;; read-only in 'gnuzilla-source', and the makeicecat script | ||||
|                 ;; uses "cp -a" to copy parts of it and assumes that the | ||||
|                 ;; copies will be writable. | ||||
|                 (copy-recursively #+gnuzilla-source "/tmp/gnuzilla" | ||||
|                                   #:log (%make-void-port "w")) | ||||
| 
 | ||||
|                 (with-directory-excursion "/tmp/gnuzilla" | ||||
|                   (make-file-writable "makeicecat") | ||||
|                   (invoke "patch" "--force" "--no-backup-if-mismatch" | ||||
|                           "-p1" "--input" #+makeicecat-patch) | ||||
|                   (invoke "patch" "--force" "--no-backup-if-mismatch" | ||||
|                           "-p1" "--input" #+gnuzilla-fixes-patch) | ||||
|                   (patch-shebang "makeicecat") | ||||
|                   (substitute* "makeicecat" | ||||
|                     (("^FFMAJOR=(.*)" all ffmajor) | ||||
|                      (unless (string=? #$major-version | ||||
|                                        (string-trim-both ffmajor)) | ||||
|                        ;; The makeicecat script cannot be expected to work | ||||
|                        ;; properly on a different version of Firefox, even if | ||||
|                        ;; no errors occur during execution. | ||||
|                        (error "makeicecat major version mismatch")) | ||||
|                      (string-append "FFMAJOR=" #$major-version "\n")) | ||||
|                     (("^FFMINOR=.*") | ||||
|                      (string-append "FFMINOR=" #$minor-version "\n")) | ||||
|                     (("^FFSUB=.*") | ||||
|                      (string-append "FFSUB=" #$sub-version "\n")) | ||||
|                     (("^DATA=.*") | ||||
|                      "DATA=/tmp/gnuzilla/data\n") | ||||
|                     (("/bin/sed") | ||||
|                      #+(file-append (canonical-package sed) "/bin/sed")))) | ||||
| 
 | ||||
|                 (format #t "Unpacking upstream firefox tarball...~%") | ||||
|                 (force-output) | ||||
|                 (invoke "tar" "xf" #+upstream-firefox-source) | ||||
|                 (rename-file firefox-dir icecat-dir) | ||||
| 
 | ||||
|                 (with-directory-excursion icecat-dir | ||||
|                   (format #t "Populating l10n directory...~%") | ||||
|                   (force-output) | ||||
|                   (mkdir "l10n") | ||||
|                   (with-directory-excursion "l10n" | ||||
|                     (for-each | ||||
|                      (lambda (locale-dir) | ||||
|                        (let ((locale | ||||
|                               (string-drop (basename locale-dir) | ||||
|                                            (+ 32  ; length of hash | ||||
|                                               (string-length "-mozilla-locale-"))))) | ||||
|                          (format #t "  ~a~%" locale) | ||||
|                          (force-output) | ||||
|                          (copy-recursively locale-dir locale | ||||
|                                            #:log (%make-void-port "w")) | ||||
|                          (for-each make-file-writable (find-files locale)) | ||||
|                          (with-directory-excursion locale | ||||
|                            (when (file-exists? ".hgtags") | ||||
|                              (delete-file ".hgtags")) | ||||
|                            (mkdir-p "browser/chrome/browser/preferences") | ||||
|                            (call-with-output-file | ||||
|                                "browser/chrome/browser/preferences/advanced-scripts.dtd" | ||||
|                              (lambda (port) #f))))) | ||||
|                      '#+all-mozilla-68-locales) | ||||
|                     (copy-recursively #+mozilla-68-compare-locales | ||||
|                                       "compare-locales" | ||||
|                                       #:log (%make-void-port "w")) | ||||
|                     (delete-file "compare-locales/.gitignore") | ||||
|                     (delete-file "compare-locales/.hgignore") | ||||
|                     (delete-file "compare-locales/.hgtags")) | ||||
| 
 | ||||
|                   (format #t "Running makeicecat script...~%") | ||||
|                   (force-output) | ||||
|                   (invoke "bash" "/tmp/gnuzilla/makeicecat")) | ||||
| 
 | ||||
|                 (format #t "Packing IceCat source tarball...~%") | ||||
|                 (force-output) | ||||
|                 (invoke "tar" "cfa" #$output | ||||
|                         ;; Avoid non-determinism in the archive.  We set the | ||||
|                         ;; mtime of files in the archive to early 1980 because | ||||
|                         ;; the build process fails if the mtime of source | ||||
|                         ;; files is pre-1980, due to the creation of zip | ||||
|                         ;; archives. | ||||
|                         "--mtime=@315619200" ; 1980-01-02 UTC | ||||
|                         "--owner=root:0" | ||||
|                         "--group=root:0" | ||||
|                         "--sort=name" | ||||
|                         icecat-dir) | ||||
| 
 | ||||
|                 #t)))))))) | ||||
| 
 | ||||
| ;; Update this together with icecat! | ||||
| (define %icedove-build-id "20200924000000") ;must be of the form YYYYMMDDhhmmss | ||||
| (define-public icedove | ||||
|  |  | |||
|  | @ -1,110 +0,0 @@ | |||
| Make some of the changes needed to the 'makeicecat' script, to allow it to run | ||||
| in a snippet without network access.  After this patch is applied, some | ||||
| additional changes will be made using 'substitute*'. | ||||
| 
 | ||||
| diff --git a/makeicecat b/makeicecat
 | ||||
| index 8be2362..48716f2 100755
 | ||||
| --- a/makeicecat
 | ||||
| +++ b/makeicecat
 | ||||
| @@ -31,55 +31,55 @@ SOURCEDIR=icecat-$FFVERSION
 | ||||
|   | ||||
|  DATA="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/data | ||||
|   | ||||
| -mkdir -p output
 | ||||
| -cd output
 | ||||
| +# mkdir -p output
 | ||||
| +# cd output
 | ||||
|   | ||||
|  ############################################################################### | ||||
|  # Retrieve FF source code | ||||
|  ############################################################################### | ||||
|   | ||||
| -rm mozilla-esr${FFMAJOR} $SOURCEDIR -rf
 | ||||
| -
 | ||||
| -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz
 | ||||
| -wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
 | ||||
| -gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
 | ||||
| -gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
 | ||||
| -echo -n ae692bf2a15908cacbb9d4c7ccf78525a87410ff3f13befedc1926f849bc27cc firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
 | ||||
| -
 | ||||
| -echo Extracting Firefox tarball
 | ||||
| -tar -xf firefox-${FFVERSION}esr.source.tar.xz
 | ||||
| -
 | ||||
| -mv firefox-${FFVERSION} $SOURCEDIR
 | ||||
| +# rm mozilla-esr${FFMAJOR} $SOURCEDIR -rf
 | ||||
| +# 
 | ||||
| +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz
 | ||||
| +# wget -N https://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${FFVERSION}esr/source/firefox-${FFVERSION}esr.source.tar.xz.asc
 | ||||
| +# gpg --recv-keys --keyserver keyserver.ubuntu.com 14F26682D0916CDD81E37B6D61B7B526D98F0353
 | ||||
| +# gpg --verify firefox-${FFVERSION}esr.source.tar.xz.asc
 | ||||
| +# echo -n ae692bf2a15908cacbb9d4c7ccf78525a87410ff3f13befedc1926f849bc27cc firefox-${FFVERSION}esr.source.tar.xz |sha256sum -c -
 | ||||
| +# 
 | ||||
| +# echo Extracting Firefox tarball
 | ||||
| +# tar -xf firefox-${FFVERSION}esr.source.tar.xz
 | ||||
| +# 
 | ||||
| +# mv firefox-${FFVERSION} $SOURCEDIR
 | ||||
|   | ||||
|  ############################################################################### | ||||
|  # Retrieve l10n | ||||
|  ############################################################################### | ||||
|   | ||||
| -mkdir l10n
 | ||||
| -cd l10n
 | ||||
| -while read line;do
 | ||||
| -    line=$(echo $line |cut -d' ' -f1)
 | ||||
| -    #[ $line = "es-ES" ] || continue # To speed up testing
 | ||||
| -    [ $line = "en-US" ] && continue
 | ||||
| -    hg clone https://hg.mozilla.org/l10n-central/$line
 | ||||
| -    mkdir -p $line/browser/chrome/browser/preferences
 | ||||
| -    touch $line/browser/chrome/browser/preferences/advanced-scripts.dtd
 | ||||
| -    rm -rf $line/.hg*
 | ||||
| -done < ../$SOURCEDIR/browser/locales/shipped-locales
 | ||||
| -cd ..
 | ||||
| -
 | ||||
| -mv l10n $SOURCEDIR
 | ||||
| -
 | ||||
| -hg clone http://hg.mozilla.org/l10n/compare-locales/
 | ||||
| -cd compare-locales/
 | ||||
| -hg checkout RELEASE_3_3_0
 | ||||
| -cd ..
 | ||||
| -rm compare-locales/.hg* compare-locales/.git* -rf
 | ||||
| -mv compare-locales $SOURCEDIR/l10n
 | ||||
| +# mkdir l10n
 | ||||
| +# cd l10n
 | ||||
| +# while read line;do
 | ||||
| +#     line=$(echo $line |cut -d' ' -f1)
 | ||||
| +#     #[ $line = "es-ES" ] || continue # To speed up testing
 | ||||
| +#     [ $line = "en-US" ] && continue
 | ||||
| +#     hg clone https://hg.mozilla.org/l10n-central/$line
 | ||||
| +#     mkdir -p $line/browser/chrome/browser/preferences
 | ||||
| +#     touch $line/browser/chrome/browser/preferences/advanced-scripts.dtd
 | ||||
| +#     rm -rf $line/.hg*
 | ||||
| +# done < ../$SOURCEDIR/browser/locales/shipped-locales
 | ||||
| +# cd ..
 | ||||
| +# 
 | ||||
| +# mv l10n $SOURCEDIR
 | ||||
| +# 
 | ||||
| +# hg clone http://hg.mozilla.org/l10n/compare-locales/
 | ||||
| +# cd compare-locales/
 | ||||
| +# hg checkout RELEASE_3_3_0
 | ||||
| +# cd ..
 | ||||
| +# rm compare-locales/.hg* compare-locales/.git* -rf
 | ||||
| +# mv compare-locales $SOURCEDIR/l10n
 | ||||
|   | ||||
|  ####################################################### | ||||
|   | ||||
| -cd $SOURCEDIR
 | ||||
| +# cd $SOURCEDIR
 | ||||
|   | ||||
|  shopt -s nullglob | ||||
|  for patch in $DATA/patches/*.patch; do | ||||
| @@ -603,6 +603,6 @@ sed 's/777/755/;' -i toolkit/crashreporter/google-breakpad/Makefile.in
 | ||||
|  # Fix CVE-2012-3386 | ||||
|  /bin/sed 's/chmod a+w/chmod u+w/' -i ./js/src/ctypes/libffi/Makefile.in ./toolkit/crashreporter/google-breakpad/Makefile.in ./toolkit/crashreporter/google-breakpad/src/third_party/glog/Makefile.in || true | ||||
|   | ||||
| -cd ..
 | ||||
| -echo Packaging tarball
 | ||||
| -tar cfj icecat-$ICECATVERSION.tar.bz2 $SOURCEDIR
 | ||||
| +# cd ..
 | ||||
| +# echo Packaging tarball
 | ||||
| +# tar cfj icecat-$ICECATVERSION.tar.bz2 $SOURCEDIR
 | ||||
		Reference in a new issue