IRC Logs for #crux-devel Sunday, 2009-06-21

*** Rotwang has joined #crux-devel03:56
tilmanmmmmh, jue didn't show up in here all week :|04:21
*** Rotwang has quit IRC05:50
*** Rotwang has joined #crux-devel05:58
*** jtnl has joined #crux-devel11:13
*** jtnl has quit IRC12:02
tek_tilman: maybe you want to check:13:50
tek_NEW       -rw-r--r--      root/root       usr/include/cairo/cairo-xcb-xrender.h13:50
tek_NEW       -rw-r--r--      root/root       usr/include/cairo/cairo-xcb.h13:50
tek_NEW       -rw-r--r--      root/root       usr/lib/pkgconfig/cairo-xcb.pc13:50
tek_=======> ERROR: Building '/usr/ports/opt/cairo/cairo#1.8.8-1.pkg.tar.gz' failed.13:50
*** sepen has joined #crux-devel13:55
Rotwangtek_: if you have *xcb* stuff installed its more than likely to happen ;>>13:58
*** Rotwang has quit IRC17:34
rehabdollwhats the story with libusb 1.0 & usbutils?18:48
*** sepen has quit IRC18:50
jaegerOk, have a git question for you experts23:22
jaegerIf I want to update nipuL's 2.5-multilib trees locally would it be best to merge changes from 2.5 into 2.5-multilib somehow or should I do updates manually?23:23
jaegerobviously the -compat32 ports wouldn't exist in 2.5 but the ones that are duplicated are what I'm referring to23:23
nipuLjaeger: this is my work flow for syncing with 2.523:28
nipuLgit fetch23:28
nipuLgit checkout 2.523:28
nipuLgit tag -f sync23:28
nipuLgit rebase origin/2.523:29
nipuLgit cherry -v sync23:29
nipuL[this will list all commits since sync tag]23:29
nipuLgit checkout 2.5-multilib23:29
nipuL[start cherry picking commits]23:29
nipuLi have a script that also checks version differences between foo and foo-compat3223:30
jaegerhrmm, I'll have to try it out, not as familiar with git as you are23:30
nipuLthere's probably a better way to do it, but it works for me23:31
jaegerok, thanks for the overview :)23:31
nipuLi do it that way because my opt tree is a subset of opt, i only include ports i have installed23:32
nipuLif you're using a complete copy of the repo +compat32 ports, you might be able to merge the 2.5 branch23:33
jaegerI was thinking about doing it that way, keeping it as close to 2.5 official as possible, even if I don't personally use every port23:34
jaegermight end up being easier to maintain23:34
nipuLhaving arc maintainers + merging with the official branch may present some problems23:36
jaegerhow so? I was thinking of only a one-way merge, just to make keeping my local multilib installs updated easier23:37
nipuLwell a branch merge is going to touch all modified ports, an arch maintainer is only going to touch thier ports23:38
nipuLthere is a greater chance of merge conflicts occuring23:38
jaegerI think you're talking about something more complicated than I am, though I might be misunderstanding23:39
jaegerWhen a few updates are made in the official 2.5 branches I want to update my multilib installs to match so I'm not too far behind23:39
jaegerthat's all23:39
nipuLyeah i'm talking about in the future as more people jump on the 64bit23:40
nipuLfor now though, having 2 multilib users, i doubt conflicts would be much of aproblem23:40
jaegerright now I'm just planning to keep my updates local but if you expanded that later it would be good to be more careful23:40

Generated by 2.11.0 by Marius Gedminas - find it at!