[12:28] can you paste the original patch as well please ? [12:28] e.g. the one that is still in debian/patches ? [12:28] yes [12:28] gnomefreak: you sure you saved? [12:28] I don't see any PROGRAM lines in that diff [12:28] http://pastebin.mozilla.org/114364 [12:29] asac: yes i was looking at that too let me see [12:29] you didn't save [12:30] as you can see the diff for mozilla.orig/browser/app/Makefile.in is now completely missing in your new quilt diff [12:30] http://pastebin.mozilla.org/114367 [12:30] please do the change [12:30] still missing and yes i saved [12:30] i did already [12:30] look into that file again [12:30] (open in new editor) [12:31] ifeq ($(USE_SHORT_LIBNAME), 1) [12:31] PROGRAM = $(MOZ_APP_NAME)-trunk$(BIN_SUFFIX) [12:31] else [12:31] PROGRAM = $(MOZ_APP_NAME)-trunk-bin$(BIN_SUFFIX) [12:31] endif [12:32] you sure you are in right directory tree? [12:32] yes i opened it up new and save never saved it === gnomefreak thinks gedit issue [12:32] ah [12:32] please save it :) [12:32] when your change shows up in quilt diff ... let me know :) [12:33] http://pastebin.mozilla.org/114369 [12:33] yeah ... that looks better [12:33] i did save it the whole time :( [12:33] ok ... updating patch is now really simple ;) [12:33] just do [12:33] quilt refresh --diffstat -U8 [12:34] in mozilla dir still i take it [12:34] ok refreshed [12:34] do it whereever you ran quilt diff [12:34] ok ... now you can stay in that directory and see if all other patches apply as well [12:34] (e.g. lets excercise quilt a bit) [12:34] k [12:34] run quilt top [12:35] it should show you the currently top-most patch applied [12:35] (which should be trunk-fsh) [12:35] trunk-fsh [12:35] you see that? [12:35] yeah [12:35] run quilt series [12:35] what do you see? [12:35] 3 of them [12:35] the whole series, right? [12:35] no-have-stdint-h-ftbfs.patch [12:35] trunk-fsh [12:35] ftbfs-with-branding-dir [12:35] yes [12:36] that should be all patches listed in series [12:36] you can do quilt applied [12:36] to see which ones are currently applied [12:36] although there are 5 or so in debian/patches so i may get rid of the non used patches [12:36] yeah ... might be that i removed them from series weithout removing the in patches [12:36] no-have-stdint-h-ftbfs.patch [12:36] trunk-fsh [12:36] yeah ... and unapplied? [12:36] missing one [12:36] -> quilt unapplied [12:37] ftbfs-with-branding-dir [12:37] which is what we expected, right? [12:37] why did we expect that one to not be applied [12:37] because the trunk-fsh failed [12:37] other than the other 2 were wuilt applied [12:37] ah ok [12:37] we now applied it manually [12:38] and now we can apply the last one with [12:38] quilt push [12:38] try that [12:38] does it fail? [12:38] its patched [12:38] cool [12:38] ok ... don't go out [12:38] just get a feeling for what quilt does [12:38] try quilt pop [12:38] then look at unapplied and applied again [12:38] then do another pop [12:38] hey [12:39] pop redoes the last thing you did ? [12:39] or just last patch applied [12:39] pop unapplies what is currently on top [12:39] ah ok [12:39] with pop you unapply ... with push you apply [12:39] you can pop all by [12:39] quilt pop -a [12:39] then all patches should be in unapplied [12:40] and applied should be none [12:40] do you see? [12:40] then you can apply all again by quilt push -a [12:40] :) [12:40] yes [12:40] after that all should be in applied [12:40] and non in unapplied [12:40] ok ...fine [12:40] the trunk-fsh patch is not fixed and applies cleanly [12:41] just ensure that you copy it to the debian/patches directory of bzr tree [12:41] (so you don't loose it) [12:41] not fixed because we need to add quilt diff inplace of whats there? [12:41] no [12:41] oh [12:41] you did quilt refresh [12:41] that updated the patch for you [12:41] its already fine [12:41] cool [12:41] otherwise you would not be able to pop [12:41] or push it [12:41] makes sense [12:42] cool :) [12:42] well done [12:42] you merged the patch ;) [12:42] :) sweet ty [12:42] now lets see if it works [12:42] yeah (but please remember that bzr bd wipes your build-area) [12:42] so copy the new trunk-fsh patch there [12:42] im using dpkg-buildpackage [12:42] you can of course just build in build-area [12:42] right [12:43] (but don't forget to copy it) [12:43] :) [12:43] copy it [12:43] to bzr tree ... so its preserved [12:43] (unless you are in bzr of course) :) [12:43] i don't know how you build ... and i don't really care ;) [12:43] wait you mean the .bzr dir? [12:43] or you mean push to branch? [12:43] gnomefreak: commit the new patch :) [12:44] ah yes [12:44] do you use bzr bd or not? [12:44] if you don't use bzr bd ... its just commit [12:44] and publish it [12:44] once the build went well [12:44] (probably not before) [12:45] gnomefreak: so basically what you did was the same what you do when you do a merge [12:45] e.g. manually applying changes that patch is to stupid to apply [12:48] ok lets try this again :) [12:48] you can just use [12:48] dpkg-buildpackage -rfakeroot -nc [12:48] to go on [12:49] e.g. without unpacking and stuff like that [12:49] is fucking mp3 player is driving me nuts [12:50] it just refuses to get back to a sane state after you disconnnet it without pulling the plug [12:51] who knows ... maybe it just cannot reconfigure at all [12:51] and i have to write a server that keeps line up until the plug is physically reset [12:54] am i still here? [12:55] lag is hitting me again [12:56] irc lag? [12:57] yeah ... but apparently my connection worked well [12:58] gnomefreak: do you have access to a windows box? [12:58] no [12:58] win box is all fudged up from what im hearing i told her id get to it this weekend so shes using laptop until than [12:59] i already have lag [12:59] i probably will not survive long [01:00] gnomefreak: let me know when you have access to win :) [01:00] i just need to get a spec that is only shipped in .exe [01:00] which i cannot extract [01:00] http://msdn2.microsoft.com/en-us/library/ms867188.aspx [01:00] there is the spec [01:00] these bastards [01:02] i hate ms so much [01:02] these ignorant bastards [01:02] hopefully they will suffocate from in their own ignorance [01:02] why are you using it :) [01:03] i don't use it [01:04] i want to enable these shitty devices they force upon the world on linux [01:04] almost all high-end mp3 players use MTP [01:04] nowadays [01:04] no usb-storage anymore [01:04] everything that is more than a mp3-stick [01:04] is mtp [01:04] ah [01:05] brb smoke now that i got this to start === cjwatson_ [n=cjwatson@82-69-40-219.dsl.in-addr.zen.co.uk] has joined #ubuntu-mozillateam [01:56] bug 123829 [01:56] Launchpad bug 123829 in dhcp "Latest Gutsy Upgrade does not connect to DHCP anymore." [Undecided,Confirmed] https://launchpad.net/bugs/123829 === DarkMageZ [n=richard@238.101.233.220.exetel.com.au] has joined #ubuntu-mozillateam [02:37] probably a network manager issue ./ [02:37] :/ [03:26] grrrrrr [03:31] asac: can you please test bug 123882 on feisty 64bit when you get time [03:31] Launchpad bug 123882 in firefox "Some web sites reload infinitely, but not on Opera" [Low,Incomplete] https://launchpad.net/bugs/123882 [03:32] gnomefreak: not reproducible .. added comment [03:33] ah ok ty i added one he had said more than 1 site so i wanna see the others [03:33] asac: trunk failed to build [03:34] i will look into it more in the morning im going to bed === DarkMageZ [n=richard@238.101.233.220.exetel.com.au] has joined #ubuntu-mozillateam [08:04] asac: I've submitted bug 123926 [08:04] Launchpad bug 123926 in totem "added Xb-Npp-xxx tags accordingly to "firefox distro add-on suport" spec" [Undecided,New] https://launchpad.net/bugs/123926 === hjmf_ 's out for the morning [08:04] cu === shirish [n=shirish@59.95.54.99] has joined #ubuntu-mozillateam === shirish [n=shirish@59.95.54.99] has left #ubuntu-mozillateam [] === shirish [n=shirish@59.95.32.111] has joined #ubuntu-mozillateam === shirish [n=shirish@59.95.32.111] has left #ubuntu-mozillateam [] === gnomefreak is in for a while [10:54] hjmf_: great [10:54] i just want to verify that plugin-id is the right one ... then i push it [10:54] lets see [10:56] asac: is there a way to crash firefox just for shits and giggles? === gnomefreak doesnt seem to be affected by libcairo(if causing crashes) [11:01] this is annoying as hell [11:04] gonna see if restarting fixes this brb === jerome___ [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam === gnomefreak [n=gnomefre@ubuntu/member/gnomefreak] has joined #ubuntu-mozillateam [11:16] who has ~256mb ram that i can borrow to test something? [11:22] why is it no matter what string i search for i can never find upstream bugs maybe i need to search for somethin unrelated :( [11:22] gnomefreak: you say its because of too little mem? [11:22] gnomefreak: what bug do you try to triage? [11:22] i get crash and it cant send crash report due to not enough memory [11:23] bug 80964 [11:23] Launchpad bug 80964 in mozilla-thunderbird "MASTER mozilla-thunderbird crashed [@nsNSSCertificateDB::ImportCertsFromFile] " [High,Confirmed] https://launchpad.net/bugs/80964 [11:34] asac: do you remember seeing a thunderbird crash while deleting Imap message? i found upstream and i thought i remembered seeing it. [11:37] hjmf_: all sponsored ... rock! [11:38] hjmf_: i had to adapt changelog because uploads happened in the meantime ... though my bad [11:39] gnomefreak: can you please verify that this crash happens with latest upstream binary release as well? [11:39] gnomefreak: otherwise, they will probably hunt us down :) [11:39] k [11:39] if we post upstream [11:40] hjmf_: would be great if you could verify tonight that the packages succeeded to build [11:43] let me know when you have a few minutes strange feeling we are gonna need a few patches for trunk === jeromeg_ [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam [11:46] gnomefreak: yeah ... i always have a few minutes for you ;) [11:46] :) [11:46] well your not gonna like this im sure http://pastebin.mozilla.org/114392 === jeromeg [n=jerome@gra94-2-82-66-142-60.fbx.proxad.net] has joined #ubuntu-mozillateam [11:54] gnomefreak: first think you should do if things fail on trunk is to look in bonsai [11:54] if there has been a checkin after that .... if it fails for all [11:55] there is most likely a checkin that fixes this pretty quick [11:55] http://bonsai.mozilla.org/ [11:55] look what was checked in last week in mozilla/toolkit/xre directory [11:55] on HEAD [11:55] maybe you just need to take a new snapshot [11:55] and things will be done [11:56] (that said: from a first glance, this looks like a bug in Makefile.in of that directory) [12:06] hmmmm i cant open links from irssi anymore :( [12:08] asac: do i want to look in thunderbirdtinderbox? [12:10] why thunderbird? [12:10] its firefox trunk that fails, right? [12:10] gnomefreak: open the bonsai url above [12:10] you can fill in the fields [12:10] e.g. just set the directory like above [12:10] ensure that Branch is HEAD (should be default) [12:10] oh damn [12:11] and set how far you want to look in the past (e.g. today, week, month, since beginning of time) [12:11] usually a week should give you enough info [12:13] it lists the same as the thunderbird search i did by mistake [12:13] http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=MozillaBranchTinderboxAll&branch=HEAD&branchtype=match&dir=mozilla%2Ftoolkit%2Fxre&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot [12:18] should i diff http://lxr.mozilla.org/mozilla/source/toolkit/xre/Makefile.in against the makefile.in from the source i have? oh and i dont know how to do snapshots :( [12:19] thunder crashes upstream as well === asac_ [n=asac@debian/developer/asac] has joined #ubuntu-mozillateam [12:23] sprry this sucky connection is shaky again === asac_ [n=asac@debian/developer/asac] has joined #ubuntu-mozillateam [12:24] i dont see anything that jumps out and smacks me in face with this FTB [12:30] gnomefreak: do you have build failure again? [12:30] i lost my irssi history [12:30] heya guys [12:31] bluekuja: hey [12:31] asac_: is possible to add something to previous changelog's entries? [12:31] documenting it in new one [12:31] bluekuja: imo yes ... but you should document that in new ... yes [12:31] asac_: I'll do that for regex [12:32] seems it's what we need [12:32] yes right ... fix the changelog to be more readable and add it to outstanding merges [12:32] asac_: I prepare a diff and I push it on pastebin [12:32] for you [12:33] of the merge changelog [12:33] asac_: http://pastebin.mozilla.org/114392 build failure [12:36] if this connection resets one more time ... i will go kamikaze [12:36] i see lag already [12:36] still here? [12:36] ping [12:37] gnomefreak: ?? [12:37] am i still here? [12:37] yes [12:37] did you get the failure? [12:38] asac_: you still here or did you get dissconnected again [12:39] yeah i am here [12:39] please cross-fingers that i stay for an hour or so [12:39] k good [12:39] until this mozilla bzr branch is completely scp'ed to people.ubuntu.com at lsat [12:39] what branch is this? [12:40] mobile [12:40] ah [12:40] a complete 350M branch [12:40] e.g. not just debian [12:40] omg that is huge [12:40] like what i did for git ... but using bzr [12:40] gnomefreak: http://bonsai.mozilla.org/cvsquery.cgi?treeid=default&module=all&branch=HEAD&branchtype=match&dir=mozilla%2Ftoolkit%2Fxre&file=&filetype=match&who=&whotype=match&sortby=Date&hours=2&date=week&mindate=&maxdate=&cvsroot=%2Fcvsroot [12:40] if you look there [12:40] there is a change to Makefile.in [12:41] he? [12:41] its not really huge [12:41] anyway ... its broken [12:41] upstream is broken? [12:41] yeah ... look at the libs:: line they added [12:41] they should have done the same for install [12:41] so lest do a quilt patch for that [12:41] you ready? [12:41] have tree that failed lying around? [12:42] give me 1 minute to get set up for it [12:43] ok do i need to be in build-tree? === gnomefreak there since we did that lastnight :) [12:44] ok ready when you are :) [12:52] ok [12:52] you have to go to build-tree [12:52] mozillla [12:52] you in that directory? [12:52] yep [12:53] please verify with quilt applied /unapplied that actually all current patches are applied [12:53] like we did yesterday [12:53] all applied [12:53] then you create a new patch by [12:54] quilt new PATCHNAME .... use ftbfs_toolkit_xre_Makefile_in [12:54] as PATCHNAME [12:54] end with .patch or no need to end with anything? [12:56] no ... we usually don't use .patch in the end [12:56] k [12:56] or can you see .patch in any applied? [12:56] its now on top [12:56] just one [12:56] yeah [12:56] right [12:56] ok [12:56] now quilt is not like bzr [12:57] it doesn't know anything about the state [12:57] so you have to tell quilt that it should observe the file you are going to touch [12:57] in order to do that you have to [12:57] quilt add path/to/file/you/want/to/Edit [12:57] in our case its toolkit/xre/Makefile.in , right? [12:57] /toolkit/xre [12:58] ah yes makefile [12:58] thats a good question but yes i think it is makefile.in [12:58] im looking at failure [12:59] look at bonsai [12:59] its definitly toolkit/xre/Makefile.in [12:59] ah yes [12:59] because it failed in toolkit/xre [12:59] right [12:59] so add that file to be tracked in that patch [12:59] like above [12:59] then go into that file and fix the install:: target [12:59] File toolkit/xre/Makefile.in added to patch ftbfs_toolkit_xre_Makefile_in [12:59] (look how the libs:: line looks [01:00] yeah [01:00] where is the patch at this point? [01:00] its been created in debian/patches/ [01:00] but you don't need to care [01:01] its not there [01:03] it might even be not yet created (until first content is added) [01:03] ah ok [01:03] it gets created lazily [01:03] so edit makefile.in ... and look at your changes by [01:03] quilt diff [01:03] k let me see what we have [01:03] http://bonsai.mozilla.org/cvsview2.cgi?diff_mode=context&whitespace_mode=show&root=/cvsroot&subdir=mozilla/toolkit/xre&command=DIFF_FRAMESET&root=/cvsroot&file=Makefile.in&rev1=1.79&rev2=1.80 [01:03] that page (shows diff) [01:03] yeah [01:03] they added new targets for platform.ini [01:03] but failed to do it right for install:: target [01:03] because nobody upstream uses make install [01:03] so we ran into this [01:04] look how the libs:: line looks like [01:04] the install:: line should be similar [01:04] just fix that and show me quilt diff [01:05] oh so just use whats on the right hand side [01:05] yeah [01:05] they forgot [01:05] because they never use install [01:05] its always the same [01:05] install is always broken if they add something [01:05] either it forgets something ... or it has a typo [01:07] i have to find right makefile :( [01:07] hey ... its the one you just added to patch [01:07] remember? [01:08] gnomefreak: you should learn to use vi at some point [01:08] gedit will bring you to a mental institution at some point [01:08] anyway ... not today ;) [01:10] gnomefreak: you said: [01:10] 12:59 < gnomefreak> File toolkit/xre/Makefile.in added to patch ftbfs_toolkit_xre_Makefile_in [01:10] if that helps ;) [01:10] yeah i know but it looks exactly the same [01:11] same like what? [01:11] i guess its not hte green part i need to be looking for [01:12] the green part is what was added [01:12] so naturally its the same [01:12] the libs:: lines are the same but the makefile is missing the section above [01:12] but the green part has a fault [01:12] just fix the install:: line [01:12] but look closer if you want to understand [01:12] take your time [01:13] gnomefreak: maybe you got this wrong ... the patch you see in bonsai is the patch that broke this thing [01:13] it looks like the makefile.in has different indentions but that shouldnt matter [01:13] (its not the cure) [01:13] oh [01:13] we are developing the cure right now [01:13] and will submit upstream [01:13] ah ok [01:13] what should i be comparing it to? [01:14] you should not compare against anything [01:14] you have to fix the install:: line [01:14] and then produce a patch by quilt refresh [01:14] ah ok [01:14] but you can take alook [01:14] and show me your changes [01:14] before refresh [01:14] with quilt diff [01:14] just run quilt diff after you fixed the makefile [01:14] and show :) [01:14] so i can confirm that you did right ;) [01:15] though the change is pretty trivial [01:17] it is? [01:17] im lookingt at error i got from build atm [01:17] its just a one line change [01:17] gnomefreak: you see that the nsinstall run is missing an argument [01:17] if you look to makefile you see that $^ is empty [01:17] do you see that [01:17]