| *** c0x has joined #crux-devel | 01:04 | |
| *** c0x` has quit IRC | 01:06 | |
| frinnst | no, i never really tried | 01:29 |
|---|---|---|
| frinnst | tilman has played with it more | 01:29 |
| frinnst | i just unpacked the deb to see if it would run, but it required lots of 32bit libs so i never tried any further :) | 01:30 |
| Romster | jaeger, and me probably have most of them 32bit libs done already frinnst | 01:39 |
| Romster | and if not nogagplz probale has in the emulators repo | 01:40 |
| *** horrorSt1uck has joined #crux-devel | 04:44 | |
| *** horrorStruck has quit IRC | 04:44 | |
| *** horrorStruck has joined #crux-devel | 04:49 | |
| *** horrorSt1uck has quit IRC | 04:51 | |
| *** acrux_ has quit IRC | 04:59 | |
| *** acrux has joined #crux-devel | 04:59 | |
| *** acrux has joined #crux-devel | 04:59 | |
| *** horrorStruck has quit IRC | 05:13 | |
| *** horrorStruck has joined #crux-devel | 05:23 | |
| *** mike_k has joined #crux-devel | 05:57 | |
| *** horrorSt1uck has joined #crux-devel | 06:29 | |
| *** horrorStruck has quit IRC | 06:31 | |
| *** Lukc has quit IRC | 06:33 | |
| *** horrorSt1uck is now known as horrorStruck | 06:33 | |
| jaeger | frinnst: I hacked a bunch of shit together last night and got it working but since I'm not in the beta I can't actually USE it | 08:18 |
| frinnst | tilman is, iirc | 08:22 |
| frinnst | dunno if he got it working on crux, or if he surrendered to ubuntu or whatever :) | 08:23 |
| jaeger | ah :) | 08:25 |
| jaeger | http://jaeger.morpheus.net/linux/crux/steam-crux.jpg | 08:28 |
| frinnst | nice | 08:30 |
| frinnst | and also: bummer | 08:30 |
| frinnst | :) | 08:30 |
| frinnst | Psychonauts? I'll have to add you :) | 08:31 |
| jaeger | It was worth a try | 08:31 |
| jaeger | great game :) I haven't played it in several years but I loved it | 08:31 |
| frinnst | oh sorry, read it as your acconunt name first :) | 08:31 |
| jaeger | ah, hehe | 08:31 |
| * frinnst has never played TF2 | 08:31 | |
| frinnst | not even when it was a quakemod | 08:32 |
| jaeger | nor have I | 08:32 |
| jaeger | it's in the list of supported linux games, though | 08:32 |
| jaeger | I couldn't actually test if I got all the libraries it needed, sound and all, because I can't run a game, but at least the UI did start | 08:50 |
| pitillo | yeah jaeger, I checked the list and I saw it growing | 09:31 |
| pitillo | oh sorry, wrong window | 09:31 |
| * jaeger tries to remember how to do git merge | 10:30 | |
| jaeger | I guess I want to cherry-pick in this case, there are other commits in 2.8 that I don't want to put into 3.0, perhaps | 10:34 |
| jaeger | or maybe it's safe to merge, seems like the others are util-linux dep updates and a wine update | 10:35 |
| jaeger | I'll hold off on that until someone better with git takes a look | 10:36 |
| jue | jaeger: what's the problem? | 10:54 |
| jaeger | I'm just not 100% sure a merge is safe based on the git output, didn't want to get extra crap in the repo | 10:56 |
| jaeger | I did a grub2 update in 2.8 that I wanted to merge into 3.0 but it looks like there are other 2.8 changes that will get pulled in as well | 10:56 |
| jaeger | namely your util-linux-ng -> util-linux updates and a wine update | 10:56 |
| jaeger | as far as I can tell they're safe to merge but wanted to make sure since I haven't done a merge in a long time | 10:56 |
| jue | that's already merged | 10:57 |
| jaeger | last one I see in opt 3.0 is pango from 2 days ago | 10:58 |
| jue | but you might have a not up-to-date local checkout | 10:58 |
| jaeger | in gitweb, too | 10:58 |
| jue | ok, so do a 'git checkout 3.0 ; git fetch; git rebase origin/3.0' first | 10:59 |
| jaeger | yeah, did that. the latest commit in 3.0 is commit f550a0ecacb97e1d9ee14f543fe19d29f181704e | 11:00 |
| jue | hmm, that's the pango commit .... | 11:01 |
| jaeger | gitweb matches this | 11:01 |
| jue | jaeger: I can do the merge if you like? | 11:02 |
| jaeger | so it looks to me like no merge happened after the wine update or the util-linux deps fixes, is that correct? | 11:02 |
| jaeger | just want to make sure I understand the output | 11:02 |
| jue | yep, that's correct | 11:02 |
| jaeger | ok | 11:02 |
| jue | jaeger: btw, I really like contrib/tig, it's a nice ncurses git-browser | 11:04 |
| jaeger | I'll check it out | 11:04 |
| jue | if you start it with 'tig --all' you see all active branches at once | 11:05 |
| jaeger | ahead by 6 commits after the merge, hrmm | 11:06 |
| jaeger | clearly I'm missing something | 11:06 |
| jue | something committed localy but not pushed? | 11:08 |
| jaeger | that was after a rebase | 11:08 |
| jaeger | you mind doing the merge? | 11:08 |
| jaeger | maybe you'll see what I'm missing | 11:08 |
| jue | sure, can do it | 11:09 |
| jaeger | thanks, appreciate it | 11:09 |
| jue | done, only your grub changes has been merged | 11:10 |
| jaeger | weird | 11:10 |
| jaeger | what command do you use to merge? | 11:10 |
| jue | git checkout 3.0 ; git pull . 2.8 | 11:11 |
| jaeger | ah. so 'git merge 2.8' clearly does something else | 11:11 |
| jue | yep, 'git pull' is simpler to use, because it does a fetch/merge with one command | 11:13 |
| jue | jaeger: btw, guess our iso.git isn't updated yet? | 11:36 |
| jaeger | not yet, though I can push those changes tonight if you like | 11:38 |
| jue | yeah, please do it | 11:39 |
| jaeger | ok | 11:40 |
| *** mike_k has quit IRC | 12:42 | |
| *** mike_k has joined #crux-devel | 13:11 | |
| *** mike_k has quit IRC | 13:18 | |
| *** prologic has quit IRC | 14:10 | |
| *** prologic has joined #crux-devel | 14:12 | |
| jaeger | jue: ok, pushed the initial 3.0 changeset to system/iso.git | 17:15 |
| *** horrorStruck has quit IRC | 19:41 | |
| *** horrorStruck has joined #crux-devel | 19:42 | |
| *** ______mavrick61 has quit IRC | 21:24 | |
| *** __mavrick61 has joined #crux-devel | 21:26 | |
| *** prologic has quit IRC | 21:59 | |
| *** prologic has joined #crux-devel | 22:00 | |
Generated by irclog2html.py 2.11.0 by Marius Gedminas - find it at mg.pov.lt!
