--- Log opened Sun Feb 21 00:00:57 2010 |
00:05 | | Taki^ [Meh@Nightstar-39d785ef.consolidated.net] has joined #code |
00:07 | | Taki^ [Meh@Nightstar-39d785ef.consolidated.net] has quit [Client closed the connection] |
00:24 | | Taki^ [Meh@Nightstar-39d785ef.consolidated.net] has joined #code |
00:26 | | Taki^ [Meh@Nightstar-39d785ef.consolidated.net] has quit [Client closed the connection] |
00:33 | | Taki^ [Meh@Nightstar-39d785ef.consolidated.net] has joined #code |
00:35 | | Taki^ [Meh@Nightstar-39d785ef.consolidated.net] has quit [Connection reset by peer] |
00:42 | | Taki^ [Meh@Nightstar-39d785ef.consolidated.net] has joined #code |
00:43 | | Taki^ [Meh@Nightstar-39d785ef.consolidated.net] has quit [Client closed the connection] |
00:50 | | Serah [Z@26ECB6.A4B64C.298B52.D80DA0] has quit [Ping timeout: 121 seconds] |
01:07 | | AnnoDomini [annodomini@Nightstar-a24b15c3.adsl.tpnet.pl] has quit [[NS] Quit: Killed by a newt, while paralyzed by a monster's gaze.] |
01:25 | | Serah [Z@3A600C.A966FF.5BF32D.8E7ABA] has joined #code |
01:44 | | thalass [thalass@Nightstar-26e5a17c.bigpond.net.au] has joined #code |
01:48 | < thalass> | Vorn: svn patch returns this error: |
01:49 | < thalass> | "Perhaps you used the wrong -p or --strip option? The text leading up to this was: |diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj |
01:49 | < thalass> | |index 83ef5af..47d5f9f 100644 |
01:49 | < thalass> | then some other stuff repeating the first line with --- or +++ in front of it. |
01:50 | < thalass> | I used -p0 as the first line of the patch file doesn't have anything in it (apparently it normally has a directory structure, where you chose whether to skip any of it or somesuch. |
02:02 | | gnolam [lenin@Nightstar-38637aa0.priv.bahnhof.se] has quit [[NS] Quit: Z?] |
02:16 | <@Vornicus> | hrmng |
02:17 | <@Vornicus> | Idunno, this would require 1. knowledge of svn's patch facility and its expected stuff, and 2. what the file looks like. I have neither. |
02:20 | < Alek> | http://pastie.org/834932 |
02:20 | | * Alek coughs. |
02:20 | < thalass> | heh |
02:21 | < Alek> | oops, incomplete. |
02:21 | < Alek> | http://pastie.org/834934 |
03:04 | | Vornicus is now known as Vornicus-Latens |
03:12 | | Attilla [Attilla@FBC920.81F6E9.E71C31.AB32E1] has quit [Connection reset by peer] |
04:26 | < ToxicFrog> | thalass, Vornicus-Latens: you're trying to apply a patch generated by "git diff" or "git format-patch" or similar using svn? |
04:35 | < thalass> | uhhh |
04:35 | < thalass> | It's a patch for OTTD from the forums... |
04:35 | < thalass> | what you said went 'woosh' over my head |
04:35 | < thalass> | But yes. Using svn under linux (as per the ottd wiki) |
04:35 | < ToxicFrog> | Pastebin the patch file? |
04:36 | < ToxicFrog> | Based on the line you pasted ("diff --git"), whoever generated the patchfile is using git locally rather than svn |
04:38 | < thalass> | ah |
04:39 | <@Derakon> | Heh. Photoshop v1.0 got remade in 3 days...for the iPhone. http://developer.anscamobile.com/documentation/making-of-photoshop-20th-annivers ary |
04:39 | <@Derakon> | ...okay, just the "Levels" control panel. |
04:39 | <@Derakon> | Oh, well. |
04:39 | < thalass> | http://www.pastebin.com/m49444888 |
04:42 | < ToxicFrog> | thalass: try -p1 |
04:43 | < ToxicFrog> | The directory structure -p modifies isn't in the first line, it's in the --- and +++ lines |
04:43 | < ToxicFrog> | --- a/projects/openttd_vs80.vcproj |
04:43 | < ToxicFrog> | +++ b/projects/openttd_vs80.vcproj |
04:44 | < ToxicFrog> | You need to strip the a/ and b/, and -p1 will do that |
04:47 | < thalass> | oh |
04:47 | < thalass> | okidoki I'll try that |
04:49 | < ToxicFrog> | (I take it you are fairly new to diffs and patching and whatnot) |
04:50 | < ToxicFrog> | If all else fails you can put your copy under git and use 'git apply' |
04:50 | < thalass> | I'm fairly new to everything linux |
04:50 | < thalass> | :P |
05:19 | < ToxicFrog> | It's more a software development thing than a linux thing |
05:27 | < thalass> | I'm even less familiar with that haha |
05:27 | < thalass> | But it seems to have worked |
05:27 | | * thalass compiles |
05:35 | < thalass> | nooooo |
05:35 | < thalass> | errors |
05:35 | < thalass> | expected unqualified-id before '<<' token. Plus others! |
05:35 | | * thalass weep |
06:07 | < ToxicFrog> | What's the first error you get? |
06:07 | < ToxicFrog> | If it's, say, a missing header, that'll generally cause lots of other errors that will all be fixed by providing that header file |
06:09 | < ToxicFrog> | thalass: my guess would be that you're missing a bunch of -devel packages |
06:47 | | celticminstrel [celticminstre@Nightstar-f8b608eb.cable.rogers.com] has quit [[NS] Quit: *hums* Can't stay now!] |
08:40 | < thalass> | the first error is: "/ome/thalass/openttd/src/station_cmd.cpp:684: error: expectedunqualified-id before '<<' token" |
08:41 | < thalass> | then "/directoryfoo/station_cpp:244: warning: 'StringID GenerateStationName(Station*, TileIndex, StationNaming)' defined but not used" |
08:41 | < thalass> | with two more "defined but not used" errors |
09:20 | | AnnoDomini [annodomini@Nightstar-2577e9ab.adsl.tpnet.pl] has joined #code |
09:20 | | mode/#code [+o AnnoDomini] by Reiver |
09:30 | | You're now known as TheWatcher |
09:44 | | Thaqui [Thaqui@27B34E.D54D49.F53FA1.6A113C] has quit [Connection closed] |
11:53 | | Rhamphoryncus [rhamph@Nightstar-8931f88f.abhsia.telus.net] has quit [Client exited] |
11:53 | | gnolam [lenin@Nightstar-38637aa0.priv.bahnhof.se] has joined #code |
12:56 | | thalass is now known as Thalassleep |
12:56 | | Thalassleep [thalass@Nightstar-26e5a17c.bigpond.net.au] has quit [[NS] Quit: Leaving] |
13:08 | | Attilla [Attilla@FBC920.642D35.3E213B.6B9884] has joined #code |
13:09 | | mode/#code [+o Attilla] by Reiver |
13:24 | | Vornicus-Latens is now known as Vornicus |
13:34 | | aj [aj@Nightstar-a11b699d.singnet.com.sg] has joined #code |
13:35 | | aj [aj@Nightstar-a11b699d.singnet.com.sg] has left #code [""IRC is like a cigarette - You know it's bad, but you just can't stop."-bash.org"] |
14:23 | | Tarinaky [Tarinaky@Nightstar-5ee021c2.adsl.virginmedia.net] has quit [Connection closed] |
14:28 | | Serah [Z@3A600C.A966FF.5BF32D.8E7ABA] has quit [Ping timeout: 121 seconds] |
15:04 | | celticminstrel [celticminstre@Nightstar-f8b608eb.cable.rogers.com] has joined #code |
15:12 | | Serah [Z@26ECB6.A4B64C.298B52.D80DA0] has joined #code |
15:13 | | Serah is now known as NotSearh |
15:27 | < ToxicFrog> | Hmm. Iup is actually pretty handy. |
15:44 | | Vornicus [vorn@ServerAdministrator.Nightstar.Net] has quit [[NS] Quit: Leaving] |
15:46 | | Vornicus [vorn@ServerAdministrator.Nightstar.Net] has joined #code |
15:46 | | mode/#code [+o Vornicus] by Reiver |
17:03 | | Tarinaky [Tarinaky@Nightstar-5ee021c2.adsl.virginmedia.net] has joined #code |
17:42 | | CWB50287 [CWB50287@Nightstar-018f66c6.dhcp.insightbb.com] has joined #code |
17:43 | | CWB50287 [CWB50287@Nightstar-018f66c6.dhcp.insightbb.com] has left #code [] |
19:36 | | Tarinaky [Tarinaky@Nightstar-5ee021c2.adsl.virginmedia.net] has quit [Connection closed] |
20:14 | | celticminstrel [celticminstre@Nightstar-f8b608eb.cable.rogers.com] has quit [[NS] Quit: *whistles* Did you hear something?] |
20:26 | | Rhamphoryncus [rhamph@Nightstar-8931f88f.abhsia.telus.net] has joined #code |
20:32 | | Attilla [Attilla@FBC920.642D35.3E213B.6B9884] has quit [Connection reset by peer] |
20:32 | | Attilla [Attilla@FBC920.642D35.3E213B.6B9884] has joined #code |
20:32 | | mode/#code [+o Attilla] by Reiver |
21:01 | | Vornicus is now known as Finerty |
21:24 | | Derakon is now known as Derakon[AFK] |
21:32 | | celticminstrel [celticminstre@Nightstar-f8b608eb.cable.rogers.com] has joined #code |
21:34 | | Rhamphoryncus [rhamph@Nightstar-8931f88f.abhsia.telus.net] has quit [Client exited] |
22:41 | | Tarinaky [Tarinaky@Nightstar-5ee021c2.adsl.virginmedia.net] has joined #code |
22:55 | | NotSearh is now known as Eden |
23:05 | <@AnnoDomini> | Is it possible to change (or just specify) the code page for a specific console application? |
23:07 | < Zed> | you talking about windows? |
23:07 | < Zed> | cuz if you figure it out, maybe we could come up with a solution for the no-fullscreen-console-apps problem in vista/7 |
23:11 | <@AnnoDomini> | I found a solution - to my problem, anyway. |
23:11 | <@AnnoDomini> | Launch cmd, use that button in the upper left to bring up a context menu and change the font to Lucida Console under Properties. |
23:12 | <@AnnoDomini> | Then, you can change the codepage with 'chcp <number>'. |
23:38 | < Zed> | That's a neat solution. |
23:39 | < Zed> | I'm really wanting to sit down maybe and write a directx fullscreen wrapper for console apps |
23:39 | < Zed> | Using the codepage from standard text... I just need to find a good resource for making a copy of that codepage. |
23:39 | <@AnnoDomini> | Now I have the problem of 'the fonts look ugly'. |
23:40 | < Zed> | Terminal.ttf works all right, in most situations |
23:40 | < Zed> | I also want to make a Terminal font that strips out the versions that aren't original |
23:40 | < Zed> | cuz the 8 point looks normal |
23:40 | < Zed> | the rest are weird |
23:42 | <@AnnoDomini> | In general, my problem is that I want to run Nethack locally, in console, and make it look more or less as pretty as it is on NAO through PuTTY. |
23:43 | < Namegduf> | Setup Cygwin and an SSHD, SSH to localhost? |
23:43 | < Namegduf> | Ugly, but if I were stuck using Cygwin, I'd do that. |
23:43 | | You're now known as TheWatcher[T-2] |
23:44 | < ToxicFrog> | AnnoDomini: figure out what font and codepage PuTTY was using, set cmd to use that? |
23:44 | < ToxicFrog> | Install rxvt? |
23:45 | <@AnnoDomini> | I set PuTTY to use Courier New. |
23:45 | <@AnnoDomini> | I set the windows console to use the exact same font. |
23:45 | <@AnnoDomini> | Unfortunately, the results are different. |
23:46 | <@AnnoDomini> | Somewhere along the way, scaling fucks up in windows console. |
23:47 | | You're now known as TheWatcher[zZzZ] |
23:51 | | * AnnoDomini tries Console2 instead, gets problems with codepage again, as it appears that Console2 can't change it. |
--- Log closed Mon Feb 22 00:00:11 2010 |