--- wikisrc/users/ryoon/how_to_update_www_firefox.mdwn 2016/06/19 09:21:40 1.9 +++ wikisrc/users/ryoon/how_to_update_www_firefox.mdwn 2017/01/22 13:00:58 1.10 @@ -1,24 +1,21 @@ [[!meta title="How to update pkgsrc/www/firefox"]] -This article shows how to update pkgsrc/www/firefox package to latest release. +This article shows you how to update pkgsrc/www/firefox package to latest +release. You can use Mozilla's Mercurial (hg) repositories to track upstream changes. -You should have pkgsrc/meta-pkgs/pkg_developer package. +You should have pkgsrc/meta-pkgs/pkg_developer package +and pkgsrc/devel/py-mercurial package. # Clone hg tree -See . - -You should follow "Using Bookmarks to Manage Multiple Repositories from a Single Clone" section. +See +You should follow "Working with the Unified Repo" section. +In short, run: + $ hg clone https://hg.mozilla.org/mozilla-unified # Update trees to latest - $ hg pull central - $ hg pull inbound - $ hg pull aurora - $ hg pull beta - $ hg pull release - $ hg update @@ -26,19 +23,19 @@ You should follow "Using Bookmarks to Ma Find latest release. - $ hg tags|grep 46_ + $ hg tags|grep 50_ (snip) - FIREFOX_46_0_1_RELEASE 341775:0b8492c110be + FIREFOX_50_1_0_RELEASE 359965:8612c3320053 (snip) Checkout the branch. - $ hg checkout FIREFOX_46_0_1_RELEASE + $ hg checkout FIREFOX_50_1_0_RELEASE Create named branch for applying pkgsrc patches - $ hg branch pkgsrc_firefox-46.0.1 - $ hg commit -m "Create pkgsrc_firefox-46.0.1 branch for applying pkgsrc patches" + $ hg branch pkgsrc_firefox-50.1.0 + $ hg commit -m "Create pkgsrc_firefox-50.1.0 branch for applying pkgsrc patches" Add .*\.orig$ to .hgignore, and commit this change @@ -52,26 +49,26 @@ Add .*\.orig$ to .hgignore, and commit t $ popd $ cat /usr/pkgsrc/www/firefox/patches/patch-*|patch -p0 $ hg add ...(necessary files) - $ hg commit -m "Apply pkgsrc patches for firefox-46.0.1nb1" + $ hg commit -m "Apply pkgsrc patches for firefox-50.1.0nb3" # Checkout latest beta source, and create your branch Find latest branch. - $ hg tags | grep 47_ + $ hg tags | grep 51_ (snip) - FIREFOX_47_0b9_RELEASE 341367:2ee4473c729a + FIREFOX_51_0b14_RELEASE 364880:09142d07fd73 (snip) Checkout the branch. - $ hg checkout FIREFOX_47_0b9_RELEASE + $ hg checkout FIREFOX_51_0b14_RELEASE Create named branch for working. - $ hg branch ryoon_firefox-47.0b9 - $ hg commit -m "Create ryoon_firefox-47.0 branch for merging pkgsrc patches" + $ hg branch ryoon_firefox-51.0 + $ hg commit -m "Create ryoon_firefox-51.0 branch for merging pkgsrc patches" Add .*\.orig$ to .hgignore, and commit this change @@ -79,19 +76,19 @@ Add .*\.orig$ to .hgignore, and commit t # Merge your patches - $ hg merge pkgsrc_firefox-46.0.1 + $ hg merge pkgsrc_firefox-50.1.0 $ hg resolve -l $ vi file/marked/as/U $ hg resolve --mark file/marked/as/U (loop) - $ hg commit -m "Merge pkgsrc_firefox-46.0.1 branch to 47.0" + $ hg commit -m "Merge pkgsrc_firefox-50.1.0 branch to 51.0" # Create patch file for patch -p0 - $ hg diff -r (revision of first commit in ryoon_firefox-47.0b9) | \ - sed -e 's!^--- a/!--- !' -e 's!^+++ b/!+++ !' > ~/firefox-47.0.diff - $ vi ~/firefox-47.0.diff + $ hg diff -r (revision of first commit in ryoon_firefox-51.0) | \ + sed -e 's!^--- a/!--- !' -e 's!^+++ b/!+++ !' > ~/firefox-51.0.diff + $ vi ~/firefox-51.0.diff (Remove patch to .hgignore) (Remove patch to .hgtags) @@ -103,8 +100,8 @@ Add .*\.orig$ to .hgignore, and commit t (Remove PKGREVISION) $ make mdi $ make extract - $ pushd ${WRKOBJDIR}/www/firefox/work/mozilla-beta - $ patch -p0 < ~/firefox-47.0.diff + $ pushd ${WRKOBJDIR}/www/firefox/work/${DISTNAME} + $ patch -p0 < ~/firefox-51.0.diff $ popd $ mkpatches $ patchdiff