| Ubulette | asac, shouldn't we have something like that in ubuntu https://addons.mozilla.org/en-US/firefox/pages/appversions ? | 00:03 |
|---|---|---|
| Ubulette | with our paths for plugins, addons, whatever | 00:03 |
| Ubulette | http://blog.vlad1.com/2007/12/11/graphics-in-mozilla/ | 00:04 |
| Ubulette | asac, ehh ??? http://paste.ubuntu.com/2653/ | 00:11 |
| Ubulette | are you sure ?? | 00:12 |
| asac | yes ... that was always the idea i had on my branch | 00:12 |
| asac | later we use system-nspr/nss anywhere ... for now we don't do that in official archive uploads | 00:12 |
| asac | s/anyw/everyw/ | 00:13 |
| Ubulette | DEV_PACKAGE_INDICATION contains ~cvs or ~ppa or nothing, then ifeq (,$(DEV_PACKAGE_INDICATION)) is true if it's neither ppa nor cvs, right ? | 00:14 |
| asac | hmm | 00:14 |
| asac | yeah | 00:14 |
| asac | that was another hick-up :) | 00:14 |
| Ubulette | ? | 00:14 |
| Ubulette | i'm lost here. initial code was correct | 00:15 |
| asac | yes | 00:15 |
| asac | i did not think at all apparently ... just saw build failure and did that ... we cannot use system-nss/nspr in gutsy | 00:15 |
| Ubulette | that's for sure. | 00:16 |
| asac | Ubulette: ok will clean up the branch mess first thing tomorrow morning | 00:37 |
| asac | Ubulette: thanks for kicking me :) | 00:38 |
| Ubulette | just drop the last one in .dev (ppa + bogus ~cvs fix) | 00:39 |
| asac | i will fix it yes | 00:39 |
| asac | i will fix the 1.9 branch as well | 00:39 |
| Ubulette | and don't touch .head :) | 00:39 |
| asac | i won't | 00:39 |
| asac | hmm ... moving the hildon backend to xul toolkit will be fun | 00:42 |
| asac | otherwise i cannot get access to the native Window | 00:42 |
| Ubulette | i know nothing of hildon, what it is ? | 00:45 |
| Ubulette | is it | 00:45 |
| asac | hard to say :) | 01:01 |
| asac | gtk extension to support mobile things | 01:02 |
| asac | for instance you can create a gtk menu and it will not be visible ... instead it will open as a popup when you click somewhere on the desktop panel | 01:04 |
| Ubulette | hmm. obscure to say the least | 01:06 |
| Ubulette | .head is now b2~rc1 | 01:07 |
| asac | good | 01:09 |
| asac | off | 01:32 |
| Jazzva | have fun ;) | 01:33 |
| Ubulette | xul.head ftbfs with b3pre, update_configure patch diverged. damn. .head will not stay on b2 very long :P | 01:37 |
| Ubulette | hmm, the build system of ff3 b2 rc1 is broken for us (libxul). xul is ok but ff3 fails in gnomevfs because missing nspr libs (it's both without system-nss/nspr) | 02:55 |
| === asac_ is now known as asac | ||
| === \sh_away is now known as \sh | ||
| asac | Ubulette: is ffox 3 really broken? is that for beta 2 branch? or trunk? | 11:13 |
| * asac lunch time | 12:40 | |
| Ubulette | hi | 13:51 |
| Ubulette | asac, i've fixed it | 13:57 |
| Ubulette | when you dropped my -1.9 suffix from the .pc files in xul, you forgot to update ff3 | 13:58 |
| [reed] | asac: attach patches? :) | 14:00 |
| asac | [reed]: yes ... i am just doing a test build to verify that i didn't add a glitch | 14:03 |
| [reed] | k | 14:03 |
| asac | Ubulette: yes, but it shouldn't be a problem for runtime | 14:03 |
| Ubulette | it is a problem at build time | 14:04 |
| Ubulette | nspr_flags_by_pkg_config_hack.patch | 14:04 |
| asac | Ubulette: is your problem due to your system-nspr? | 14:05 |
| Ubulette | no | 14:05 |
| Ubulette | b2 is not using system-nss/nspr | 14:05 |
| Ubulette | remember we had to patch configure as it depends on $(DEPTH)/nsprpub/config/nspr-config which is not in our ff3 tarball ? | 14:06 |
| Ubulette | we used pkg-config instead | 14:06 |
| Ubulette | hmm.. seems update_configure.patch in xul is not needed. the build system takes care of that already | 14:10 |
| asac | Ubulette: the build system? | 14:16 |
| asac | ouch | 14:16 |
| Ubulette | it worked well for ff3 for months | 14:16 |
| asac | sounds like MAINTAINER_MODE | 14:17 |
| Ubulette | we had patches for configure.in but no 99_ like patch | 14:17 |
| asac | Ubulette: no ... its our debian/rules | 14:17 |
| Ubulette | hmm, no, it's not a gnome package ;) | 14:17 |
| asac | the idea was to remove that automatic feature once the package becomes stable | 14:17 |
| asac | Ubulette: we have: DEB_AUTO_UPDATE_AUTOCONF=2.13 | 14:18 |
| asac | which is why we don't need configure patch | 14:18 |
| Ubulette | oh | 14:18 |
| asac | i would be fine to drop 99_configure from xul as well .. until we get close to hardy | 14:19 |
| asac | just add the line above to the rules | 14:19 |
| asac | (if you want to do that) | 14:19 |
| asac | but since updating 99_configure with quilt is so trivial, i don't really care | 14:19 |
| Ubulette | it's trivial but boring to keep up-to-date in .head | 14:25 |
| asac | yeah ... feel free to add the line then | 14:29 |
| asac | lets hope that clean will bring us back to unpatches configure in non-embedded tarball layout | 14:30 |
| Ubulette | well, I have added update_configure.patch last week only | 14:33 |
| asac | [reed]: who do request review from? i guess :bs should do the superreview | 14:35 |
| Ubulette | what for ? | 14:35 |
| asac | [reed]: it touches mozilla/xulrunner/installer/ | 14:35 |
| asac | mozilla bug 408062 | 14:36 |
| ubotu | Mozilla bug 408062 in Build Config "Provide short-hand includetype=unstable .pc files for libxul and libxul-embedding" [Enhancement,New] http://bugzilla.mozilla.org/show_bug.cgi?id=408062 | 14:36 |
| Ubulette | oh, ok | 14:36 |
| asac | [reed]: ok i requested review from :bs for now | 14:42 |
| Ubulette | asac, http://launchpadlibrarian.net/10861589/buildlog_ubuntu-hardy-amd64.firefox-3.0_3.0~b2~rc1%2Bnobinonly-0ubuntu1~fta1_FAILEDTOBUILD.txt.gz | 14:53 |
| Ubulette | ? | 14:54 |
| Ubulette | i386 and lpia are fine | 14:56 |
| Ubulette | i'll retry it | 14:56 |
| [reed] | asac: yeah, bs | 14:57 |
| Ubulette | http://www.sofaraway.org/ubuntu/tmp/ff3-b2-rc1.png | 15:18 |
| [reed] | lol @ the fire covering up stuff | 15:19 |
| [reed] | I should remove that close arrow | 15:19 |
| Ubulette | yep | 15:20 |
| Ubulette | i miss tab mix plus | 15:21 |
| Ubulette | asac, do you have a problem with hardy ? | 16:14 |
| asac | yes :) ... why? | 16:14 |
| Ubulette | amd64 seems broken | 16:15 |
| Ubulette | http://people.ubuntu.com/~ubuntu-archive/testing/hardy_probs.html | 16:15 |
| asac | hmm ... i can only partially upgrade ... but otherwise it works well here | 16:15 |
| asac | strange ... what does that list mean? | 16:16 |
| Ubulette | look at http://launchpadlibrarian.net/10862144/buildlog_ubuntu-hardy-amd64.firefox-3.0_3.0%7Eb2%7Erc1%2Bnobinonly-0ubuntu1%7Efta1_FAILEDTOBUILD.txt.gz | 16:16 |
| === \sh is now known as \sh_away | ||
| asac | Ubulette: ok found out that its gtk breakage which should be fixed soon | 16:42 |
| asac | will take a bit to clear the backlog though | 16:43 |
| Ubulette | asac, did you clean the xulrunner-1.9 branch ? | 17:07 |
| asac | nope ... starting now ... got dragged into more exciting things ;) | 17:09 |
| asac | sorry ... now going ahead | 17:10 |
| asac | Ubulette: dev branch is correct, except the topmost commit, right? | 17:13 |
| Ubulette | yes | 17:13 |
| asac | Ubulette: ok, now i have a problem ... | 17:15 |
| Ubulette | ? | 17:16 |
| asac | merging everything up to hardy release brings me to changelog with version X on top | 17:16 |
| asac | how should i add a changelog entry (that has lower version) | 17:17 |
| asac | reschedule the topmost changelog entry? e.g. append ~something to version + flip to gutsy ? | 17:17 |
| asac | otherwise the order would get broken i guess | 17:17 |
| Ubulette | i don't understand | 17:17 |
| Ubulette | you want to merge hardy into gutsy right ? | 17:18 |
| asac | a) add new changelog entry with ~something version on top (changelog order is broken) | 17:18 |
| asac | yes | 17:18 |
| asac | hmm actually its only broken order for version ... not date | 17:18 |
| asac | so lets keep it | 17:18 |
| Ubulette | so start with the last published version (a8 something) and merge .dev into it | 17:18 |
| asac | not sure if it will cause issues if you specify -vXXXX during upload | 17:18 |
| asac | yes | 17:18 |
| asac | thats what i did | 17:18 |
| asac | now i want to do all the adaptions that should not go back to hardy in that commit | 17:19 |
| asac | in case one merges back | 17:19 |
| Ubulette | you just have to edit changelog a bit and commit | 17:19 |
| asac | yes i know :) | 17:21 |
| asac | nevermind | 17:21 |
| asac | Ubulette: ok bzr is not smart enough ... merging back applies the changes i did during merge commit | 17:23 |
| asac | damn ... the changelog popped-up | 17:23 |
| Ubulette | why do you want to merge back ? | 17:25 |
| asac | ok i think that means: good bye non-cherry-picked back-merges | 17:26 |
| Ubulette | do you merge back all your firefox branches ? | 17:26 |
| Ubulette | ff2 | 17:26 |
| asac | Ubulette: i don't want to merge back, but i want to merge back in case i develop fixes on more stable branch :) | 17:26 |
| Ubulette | develop for hardy then, so use .dev | 17:27 |
| Ubulette | http://www.mozilla.org/MPL/license-policy.html | 17:27 |
| asac | Ubulette: yes, we can live with cherry-picking back (which shouldn't happen that often anyways) | 17:29 |
| asac | but other development models like having a set of forks that evolve always want to merge back and force and left and right :) | 17:30 |
| Ubulette | do we really have 10 active members in this team ? | 17:33 |
| asac | Ubulette: depends on how you define active | 17:45 |
| asac | hjmf still does eventual bugs | 17:45 |
| Ubulette | i don't know, that's on LP | 17:45 |
| asac | gnomefreak will hopefully be back soon | 17:45 |
| asac | bluekuja_: is somewhat active as well | 17:45 |
| asac | tonyyarusso does mozilla related work every now and then | 17:45 |
| asac | JenFraggle is sometimes in channel ... same for admiral chicago | 17:47 |
| asac | others are most likely MIA | 17:47 |
| armin76 | plop | 19:18 |
| asac | h | 19:21 |
| asac | i | 19:21 |
| armin76 | hrm...what's the difference between pinstripe and winstripe? | 19:21 |
| asac | one of those is for mac | 19:21 |
| armin76 | pinstripe :) | 19:24 |
| asac | sure ;)? | 19:25 |
| armin76 | http://mxr.mozilla.org/mozilla/source/toolkit/themes/Makefile.in | 19:27 |
| armin76 | MacOS X Pinstripe (toolkit/themes/pinstripe) | 19:27 |
| jimmy_ | asac: ping | 19:54 |
| asac | jimmy_: pong | 20:11 |
| jimmy_ | asac: i am looking at the new gconf_backend stuff you gave me, it is essentially the same patch as Suse's | 20:12 |
| jimmy_ | and it seems to be written for very old code too, so i had to manually patch it | 20:13 |
| jimmy_ | but i end up with what we currently have | 20:13 |
| jimmy_ | the patch i got from suse was from the 10.2 release, maybe they updated their as well after he posted this? | 20:14 |
| asac | when was 10.2 released? | 20:15 |
| jimmy_ | let me look it up | 20:15 |
| jimmy_ | 2006-12-11 | 20:18 |
| asac | ok ... and the current one doesn't work? | 20:19 |
| jimmy_ | it works for 2.0.0.6 code base | 20:19 |
| jimmy_ | but i couldn't get it to work in 3.0 base | 20:20 |
| jimmy_ | but i didn't spent enough time drilling down on it | 20:20 |
| asac | ok ... if you say that the patch is otherwise identical then we need to figure out why | 20:20 |
| Ubulette | hmm, someone tried my preview debs with gnome and got no icons: http://pix.nofrag.com/c/d/9/f930b1981dbab04bfa3536222ead9.html | 20:21 |
| Ubulette | [reed], rings a bell ? | 20:21 |
| jimmy_ | let me take a look this afternoon | 20:21 |
| jimmy_ | i think probably what happened is Robert rewrote the gconf code Novell had and posted this patch, and then Suse integrated this into their own gconf_patch in 10.2 release | 20:24 |
| asac | jimmy_: btw, you can build midbrowser --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9b1/ ... and install latest xulrunner-1.9-dev from mozillateam ppa ... the build should then just take a minute | 20:38 |
| asac | i tested that yesterday | 20:38 |
| asac | jimmy_: mozillateam ppa is https://edge.launchpad.net/~mozillateam/+archive | 20:38 |
| asac | Ubulette: ok currently pushing fixed stable branch | 20:43 |
| Ubulette | good | 20:43 |
| asac | Ubulette: will cherry pick the revision 152 to .dev | 20:43 |
| asac | please cherry pick it as well | 20:43 |
| asac | or merge or whatever | 20:43 |
| asac | i should have done it on .dev though ... but well, here we go | 20:44 |
| * asac off doing some laundry | 20:45 | |
| asac | jimmy_: in browser/installer/unix/packages-static you removed bin/components/nsBookmarkTransactionManager.js | 22:00 |
| jimmy_ | asac: did I? | 22:00 |
| asac | well you eliminated it in the merge | 22:03 |
| asac | :) | 22:03 |
| asac | no idea if it was added by us once ..., but i think so | 22:04 |
| asac | (i am currently redoing the merge using git and copying your files in if they make sense) | 22:04 |
| asac | apparently we added bin/components/libsystem-pref-gconf.so | 22:04 |
| asac | (probably because of the gconf component) | 22:04 |
| asac | and the line above was in the conflict and was: bin/components/nsBookmarkTransactionManager.js | 22:05 |
| jimmy_ | i had to merge it with FF 3.0 src too, so if I removed it, then it probably meant FF 3.0 also removed it | 22:08 |
| jimmy_ | because i remember in FF 3.0, they rewrote the whole bookmark and history with places | 22:09 |
| asac | lets see ... i will keep it for now | 22:09 |
| jimmy_ | yeah, i just checked, they removed it in FF3.0 | 22:10 |
| asac | you dropped * locale/@AB_CD@/mozapps/downloads/settingsChange.dtd (%chrome/overrides/settingsChange.dtd) in browser/locales/jar.mn | 22:12 |
| asac | any reasoning? or just a glitch? | 22:13 |
| asac | so you say the BookmarkTransationMAnager js file isn't in packages-static anymore? | 22:13 |
| asac | jimmy_: ok, the first messy one i don't understand. after resolving conflicts i get | 22:25 |
| asac | http://paste.ubuntu.com/2676/ | 22:25 |
| asac | /tmp/firefox-ported/extensions/pref/system-pref/src/Makefile.in (is your file) | 22:25 |
| jimmy_ | ok, this is the gconf patch, the midbrowser src had the gconf patch applied | 22:26 |
| jimmy_ | the FF 3.0beta1 code i tar up, didn't have those patched | 22:26 |
| jimmy_ | that's why it wasn't working | 22:26 |
| jimmy_ | i couldn't get it to work, so I just left the system-pref alone, so this is the original FF3.0 code | 22:27 |
| asac | hmm ... ok i will just go on with the merge and see :) | 22:29 |
| jimmy_ | yeah, i just copied over the changes we made in mid browser to the 2.0.0.6 source into the 3.0 FF code base | 22:41 |
| jimmy_ | so if anything is removed, it is because FF 3.0 dropped it | 22:41 |
| jimmy_ | unless i accidently removed it during the merge :), but i tried to make sure i didn't | 22:42 |
| asac | jimmy_: http://paste.ubuntu.com/2679/ this a midbrowser specific removal? | 22:56 |
| asac | (thats again after remove ... so midbrowser 3 removed it from ffox 3) | 22:56 |
| jimmy_ | FF 3 removed it from FF 2, so I did the same thing in MID browser 3 from MID browser 2 | 23:00 |
| jimmy_ | i have a staff meeting now, brb in a hour | 23:00 |
| Ubulette | asac, you didn't merge once again ? | 23:01 |
| asac | he? | 23:14 |
| asac | jimmy_: no ff3 still had that specific line ... nevermind | 23:15 |
| asac | jimmy_: so just a glitch ... fixed | 23:15 |
| Ubulette | asac, donno. I got 39 revisions removed and 42..51 new. I expected 1, maybe 2 | 23:16 |
| asac | Ubulette: no ... i fixed the branch | 23:16 |
| asac | previously i accidentially removed all from 42..51 because i pushed the .dev branch | 23:16 |
| asac | now i took revision 50 from the original branch (as it was before) and merged the .dev branch on it | 23:17 |
| asac | so previously 42..50 were lost | 23:17 |
| asac | i resurrected them now | 23:17 |
| Ubulette | ok | 23:18 |
| Ubulette | asac, didn't you say that you patched totem for xul 1.9 ? | 23:23 |
| asac | yes | 23:27 |
| Ubulette | will it land ? | 23:28 |
| asac | yes | 23:31 |
| asac | wanted to fix addons dirs first | 23:31 |
| Ubulette | amd64 fixed | 23:36 |
| Ubulette | b2 rc1 seems good. the guy without icons fixed it by removing the Tester extension. | 23:37 |
| asac | ok | 23:39 |
| Ubulette | far better than b1 in fact | 23:43 |
| asac | hopefully :) | 23:44 |
| asac | jimmy_: ok the merge is building :) ... lets see | 23:48 |
| asac | i kept the midbrowser directory of you unmodified for now ... we can then work on the git branch to get things right | 23:48 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
