--- Log opened Fri Nov 03 00:00:06 2017 00:31 -!- Horwitz [~mich1@p200300800E531C00022268FFFE64E7C4.dip0.t-ipconnect.de] has quit [Ping timeout: 246 seconds] 00:38 #navit: < Navit> The following compiles failed: http://download.navit-project.org/logs/navit/android_armv5te/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/osm-exp/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/src/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/openmoko/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/win32/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/n 00:38 #navit: < Navit> oad.navit-project.org/logs/navit/android_armv4t/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/android_x86/svn/navit-svn-.failed http://download.navit-project.org/logs/navit/tomtom/svn/navit-svn-.failed 00:38 #navit: < Navit> See compile results history at http://download.navit-project.org/logs/navit/stats.html 00:44 -!- Horwitz [~mich1@p200300800E085B00022268FFFE64E7C4.dip0.t-ipconnect.de] has joined #navit 00:44 -!- mode/#navit [+o Horwitz] by ChanServ 01:27 -!- j_f-f [~quassel@rs-7.jff-webhosting.net] has quit [Ping timeout: 248 seconds] 01:35 -!- j_f-f [~quassel@rs-7.jff-webhosting.net] has joined #navit 02:47 -!- noradtux [~noradtux@port-23082.pppoe.wtnet.de] has quit [Ping timeout: 260 seconds] 02:48 -!- noradtux [~noradtux@2a02:2028:849:7e01:ec4:7aff:fe33:3dc1] has joined #navit 06:00 #navit: < jkoan> Hi naggety you probably want to update your repo and try your build again. Since yesterday the openssl dependency is gone: "https://github.com/navit-gps/navit/compare/2b6c039494...0b6027ff53" 06:09 -!- xenos1984 [~xenos1984@2001:bb8:2002:200:6651:6ff:fe53:a120] has joined #navit 07:26 -!- naggety [501b206e@gateway/web/freenode/ip.80.27.32.110] has joined #navit 08:17 #navit: < naggety> hi! jkoan: I have just redownloaded navit and that error has disappeared. Now I have another ones. 08:17 #navit: < naggety> kazer: sure we collaborate 08:44 -!- ilovekiruna [~ilovekiru@h131n8-ll-a31.ias.bredband.telia.com] has quit [Quit: Konversation terminated!] 11:49 #navit: < jkoan> What is the next issue? 11:56 #navit: < naggety> some missing headers of libc 11:57 #navit: < naggety> I'm doing make clean, make 11:58 #navit: < naggety> I think that some files were not copied all right, because after rebuilding the toolchain those headers are present 11:59 #navit: < naggety> I will ask if there are more problems when finished this clean building 12:41 #navit: < jkoan> Okay :) 12:53 -!- naggety [501b206e@gateway/web/freenode/ip.80.27.32.110] has quit [Quit: Page closed] 13:04 -!- naggety [501b206e@gateway/web/freenode/ip.80.27.32.110] has joined #navit 13:25 -!- ilovekiruna [~ilovekiru@h131n8-ll-a31.ias.bredband.telia.com] has joined #navit 13:26 #navit: < naggety> I cannot see the logs directly in the browser as I used to do. Now I can only download them. Does it happens only to me? 13:34 #navit: < ilovekiruna> naggety, same here 13:36 #navit: < naggety> Ok, so it's a change in the server. I reinstalled my OS so I thought it should be my browser. 13:43 #navit: < ilovekiruna> naggety: which OS are you using? 13:43 #navit: < naggety> kde neon 13:44 #navit: < naggety> it's basically kubuntu 13:48 #navit: < ilovekiruna> ah, ok, that sounds not so time consuming 13:48 #navit: < ilovekiruna> for me would be quite a bit more tideous 13:49 #navit: < naggety> you use gentoo right? 13:50 #navit: < naggety> I have never been enough brave 13:50 #navit: < naggety> xD 13:50 #navit: < naggety> Maybe someday I will try with Arch 14:04 #navit: < ilovekiruna> exactly 14:04 #navit: < ilovekiruna> am on gentoo 14:04 #navit: < ilovekiruna> but before i was on sabayon 14:04 #navit: < ilovekiruna> that made the switch less painful ;-) 14:08 -!- naggety [501b206e@gateway/web/freenode/ip.80.27.32.110] has quit [Ping timeout: 260 seconds] 14:19 #navit: < ilovekiruna> what i am too afraid of is slackware 14:49 -!- xenos1984 [~xenos1984@2001:bb8:2002:200:6651:6ff:fe53:a120] has quit [Quit: Leaving.] 15:22 #navit: < ilovekiruna> kazer: when back, check the presentation_final.pdf in the cloud. it is the final version i uploaded for now 15:36 #navit: < jkoan> ilovekiruna: do you want me to also look at it? 15:37 #navit: < ilovekiruna> jkoan: sure, u can ofc have a look 15:37 #navit: < ilovekiruna> has kazer also given u access to his owncloud-instance? 15:39 #navit: < jkoan> Nope, but could you share it with me? I pm you 16:03 -!- xenos1984 [~xenos1984@22-164-191-90.dyn.estpak.ee] has joined #navit 16:05 -!- noradtux [~noradtux@2a02:2028:849:7e01:ec4:7aff:fe33:3dc1] has quit [Quit: Bye] 16:06 -!- noradtux [~noradtux@port-3764.pppoe.wtnet.de] has joined #navit 16:14 -!- ilovekiruna [~ilovekiru@h131n8-ll-a31.ias.bredband.telia.com] has quit [Ping timeout: 264 seconds] 16:30 #navit: < kazer> hi there 16:33 #navit: < jkoan> Hi kazer 16:37 #navit: < kazer> ilovekiruna did a nice job. That's definitely 45 minutes material there 17:32 #navit: < charles__> Navit insists on re-centering at the GPS co-ordinates every so often. Is there any way to turn that off temporarily? 17:32 #navit: < kazer> yep 17:33 #navit: < kazer> https://wiki.navit-project.org/index.php/Configuration/Full_list_of_options#vehicle : follow 17:33 #navit: < kazer> well that will manage how often your position will be recentered. there's another option 17:34 #navit: < kazer> https://wiki.navit-project.org/index.php/Configuration/Full_list_of_options#navit : timeout 17:34 #navit: < kazer> this is actually probably what you want 17:34 #navit: < kazer> timeout controls how many seconds the map will stay where you moved it before going back to the gps 17:35 #navit: < charles__> Nothing in the GUI, then? 17:35 #navit: < kazer> on android, there's even another approach activated by default. If you move the map, an icon appears, and the map will stay there until you click that icon 17:35 #navit: < kazer> what would you like in the ui? a way to configure that setting, or the android approach? 17:36 #navit: < charles__> The android approach would work. Or a check box for "follows GPS" or some such. 17:37 #navit: < kazer> there's a checkbox like this, i agree that it's a bit hidden currently. Settings > Rules > Map follows vehicle 17:38 #navit: < kazer> the android approach is to add an OSD button that's visible only when this setting is deactivated. Clicking that osd reactivates the setting and hides the osd 17:38 #navit: < charles__> Um, I don't have a "Settings" pull down menu. GTK here. 17:39 #navit: < kazer> oh right gtk... damn it sorry 17:41 #navit: < kazer> so yeah no menu right now. would you like to add an entry? we could do it together 17:42 #navit: < charles__> Sure. Shouldn't take too long. 17:42 #navit: < kazer> yup. here's how to fetch the setting : https://github.com/navit-gps/navit/blob/trunk/navit/gui/internal/gui_internal_command.c#L373 17:42 #navit: < charles__> Start w/ setting up a branch correctly. :-) 17:43 #navit: < kazer> :D 17:48 #navit: < charles__> OK. What do I do with that? 17:48 #navit: < charles__> It's been a while since I fiddle with GTK. 17:49 #navit: < kazer> same here :D 17:49 #navit: < kazer> we could start by adding a meny entry in 'Display' 17:50 #navit: < kazer> 'Lock on road' would be a good source of inspiration 17:50 #navit: < charles__> Sounds like a good place to start. 17:51 #navit: < kazer> Menu entry is added here : https://github.com/navit-gps/navit/blob/trunk/navit/gui/gtk/gui_gtk_action.c#L234 17:51 #navit: < kazer> and implemented here : https://github.com/navit-gps/navit/blob/trunk/navit/gui/gtk/gui_gtk_action.c#L118 17:51 #navit: < kazer> i think that copying that block and changing the attr should do the job 17:54 #navit: < charles__> Function name: follow_gps_action, or follow_vehicle_action? 17:55 #navit: < kazer> follow_vehicle_action would be better, as gps is more opiniated 17:56 #navit: < charles__> Will do. 17:56 #navit: < kazer> and technically, follow is an attribute of the vehicle. So great question actually. 17:56 #navit: < charles__> Hmmm, will this work w/ multiple "vehicles"? 17:57 #navit: < kazer> it will track the 'active' one. the active one is the one used for routing. we only compute the route for one vehicle, even if you have more than one enabled 17:57 #navit: < kazer> enabled != active 17:58 #navit: < charles__> Ah, makes sense. Other vehicles might be piped in, e.g. via friendsd. 17:58 #navit: < kazer> exactly 17:58 #navit: < kazer> for local tests, 'Demo' vehicle is super helpful for example too 17:59 #navit: < charles__> Might be useful for rally managers, bike race managers. "Where's Fred""Parked outside this bar." 18:01 #navit: < kazer> haha yeah 18:01 #navit: < charles__> OK, that compiles. I don't see it on the menu, though. 18:02 #navit: < kazer> odd 18:02 #navit: < charles__> OK, typo..... 18:04 #navit: < charles__> Nope. 18:06 #navit: < kazer> oh! 18:06 #navit: < kazer> forgot this : https://github.com/navit-gps/navit/blob/trunk/navit/gui/gtk/gui_gtk_action.c#L385 18:07 #navit: < charles__> That will help. :-) 18:10 #navit: < charles__> Hmmm, got a warning I don't recall seeing: "/home/charles/versioned/navit/navit/navigation.c: In function ‘round_distance_reduced’: /home/charles/versioned/navit/navit/navigation.c:979:18: warning: array subscript is below array bounds [-Warray-bounds] return distances[i-1]; ^ 18:11 #navit: < kazer> interesting 18:11 #navit: < charles__> Possibly from the stuff I pulled today? 18:12 #navit: < charles__> I see other warnings. Shall I collect them for you? 18:13 #navit: < kazer> we do have a few warning to fix indeed. I'm not sure that it's worth tracking them in a ticket though, as they are easy to find (remove the .o, recompile) 18:13 #navit: < kazer> but thanks :) 18:14 #navit: < charles__> OK. I like warning-free compilations. Sometimes warnings mask a bigger problem. 18:14 #navit: < kazer> definitely agree 18:15 #navit: < kazer> actually that one would be easy to fix 18:16 #navit: < kazer> we could use a ternary in the return : return distances[ i>0 ? i-1 : 0]; 18:16 #navit: < charles__> Should work. Good catch, GCC. :-) 18:16 #navit: < kazer> GCC is quite smart :) 18:17 #navit: < kazer> want to submit a PR later to address this one ? (we like to keep PRs on scope) 18:17 #navit: < charles__> OK, the menu entry now shows up. Just below Display -> Lock on road. 18:17 #navit: < kazer> perfect 18:17 #navit: < kazer> does it work as expected ? 18:17 #navit: < charles__> No. Will have to look at the action function again. 18:18 #navit: < kazer> ok. let me know if i can help 18:18 #navit: < kazer> btw : it's () not [] to fix the warning, obviously :D 18:18 #navit: < kazer> wait no 18:18 #navit: < kazer> oh damn it. 18:20 #navit: < charles__> OK, the function toggles the wrong attribute. Looking.... 18:22 #navit: < charles__> OK, got it. I should have toggled attr_follow_cursor. Works now. 18:44 #navit: < kazer> great! 18:45 #navit: < charles__> Your fix for that subscript warning compiles. Don't know how to test it, though. 18:46 #navit: < charles__> OK, how to fold the new menu item back into the repo? 18:46 #navit: < kazer> we could write a functional test for it, but it's probably overkill 18:48 #navit: < charles__> You could probably get rid of that "if (i==0)" statement as well. 18:50 #navit: < kazer> you're right. Seems useless 18:50 #navit: < kazer> so for the menu item : 18:51 #navit: < kazer> - check that you're on the right branch :) : git status 18:52 #navit: < kazer> - commit the changes in the gtk ui. We like to use a specific commit format (helps with changelogs). Here, "add:gtk:add menu entry to toggle vehicle tracking" would work for example 18:52 #navit: < kazer> - push the branch 18:52 #navit: < kazer> - open the PR from the website 18:53 #navit: < kazer> i still need to write the wiki page about new contributions, i'll get to it soon 18:57 #navit: < kazer> btw : please make sure to document new functions, here's an example : https://github.com/navit-gps/navit/blob/trunk/navit/navigation.c#L1012-L1022 18:57 #navit: < kazer> we use that with doxygen to generate dev docs : http://doxygen.navit-project.org/ 18:59 #navit: < charles__> Your branch is up-to-date with 'origin/trunk'. 19:00 #navit: < kazer> makes sense as you don't have commits yet. It does says that you are on a branch, right? 19:00 #navit: < charles__> Nope. not on any branches. 19:01 #navit: < charles__> I should probably create a new one for this anyway. 19:01 #navit: < kazer> yep, always use a branch 19:02 #navit: < charles__> so, something like: gtkAddFollowVehicleToggle 19:02 -!- MarcR [~marc@p5DD90501.dip0.t-ipconnect.de] has joined #navit 19:03 #navit: < charles__> Ah, gave you the wrong line. Yeah, I am on branch trunk 19:08 #navit: < kazer> charles__: i tossed some notes there hopefully it'll help. we can expand it together : https://wiki.navit-project.org/index.php/Programming_guidelines#Contributing 19:08 #navit: < kazer> have you commited the changes yet ? 19:08 #navit: < kazer> hey MarcR 19:10 #navit: < charles__> Committed the changes locally. Have not pushed. 19:11 #navit: < charles__> Started on doxy comment. Will commit that before I push. 19:12 #navit: < MarcR> hey kazer 19:12 #navit: < charles__> #Contributing looks good. Need to tell 'em how to get write access. 19:13 #navit: < kazer> good point charles__ 19:13 #navit: < kazer> regarding your branch : "Committed the changes locally" : in trunk ? or in your branch? 19:15 #navit: < MarcR> kazer: working on my qt editing enviroment atm. I have installed Ubuntu 17.10 - which way do you prefer to install qt creator? 19:16 #navit: < kazer> i personally installed it via qt's online installer, not the package manager 19:17 #navit: < kazer> but we don't need to worry too much about it as long as you're using Qt 5.6+ (if you're using an older version you might be missing some components) 19:18 #navit: < MarcR> nice, online installer is up and running. so now i need to select a Qt version, and tools. 19:18 #navit: < kazer> MarcR: https://download.qt.io/archive/online_installers/2.0/qt-unified-linux-x64-2.0.5-2-online.run.mirrorlist if you want to use the installer 19:18 #navit: < kazer> woops i was too late :) 19:19 #navit: < MarcR> qt-unified-linux-x64-3.0.1-online.run 19:19 #navit: < kazer> MarcR: it would be super helpful to put your install notes in the wiki ;) 19:19 #navit: < kazer> oh they releases a new ones. my notes are from 6+ months ago 19:20 #navit: < kazer> we could add a section there : https://wiki.navit-project.org/index.php/QML2_GUI about setting up the environment to tweak the UI 19:21 #navit: < MarcR> kazer: If I can help other onces, with my expirience, why not. 19:22 #navit: < kazer> i'm sure it'll be useful yeah 19:22 #navit: < kazer> also i'm a big believer in small incremental improvements. start with a couple of raw notes, next time improve it a little, and at some point you have a good doc 19:23 #navit: < MarcR> good point 19:24 #navit: < charles__> In my branch. For a change. :-) 19:24 #navit: < charles__> Comment written & committed. 19:25 #navit: < MarcR> so I should install qt5. 19:25 #navit: < MarcR> so I should install qt5.6 19:25 #navit: < MarcR> ? 19:26 #navit: < kazer> MarcR: 5.6 will work, i have 5.7 locally 19:26 #navit: < MarcR> then 5.7 ;-) 19:26 #navit: < kazer> charles__: cool. time to push the branch then! 19:27 #navit: < MarcR> kazer: you will be my - Kazer! Problem! Help! - Support Guy ;-) 19:27 #navit: < charles__> MarcR: Suggest you not use anything more recent than Debian Stable. 19:28 #navit: < MarcR> I only use stable releases, if possible. 19:28 #navit: < kazer> MarcR: haha yeah my pleasure 19:29 #navit: < MarcR> So I only install qt 5.7 and under tools Qt Installer Framework 3.0 - correct ? 19:29 #navit: < kazer> sounds good yeah 19:29 #navit: < kazer> we need 5.6 only because of a specific feature for screen rotation IIRC 19:30 #navit: < MarcR> oh btw, Raspberry 7" Offical Touch 800x460 - ordered :) 19:31 #navit: < charles__> Debian Stretch (stable) qt5-default is at 5.7.1. 19:31 #navit: < MarcR> uh 3.2gb install - that will take a while ... :-P 19:31 #navit: < kazer> MarcR: nice. what's your plan for the screen enclosure? 19:32 #navit: < MarcR> good question ;-) 19:32 #navit: < MarcR> I think, for "beta testing" it will be a small wood frame. - if that works. I have a friend with a 3D printer. :-D 19:33 #navit: < charles__> kazer: I missed a magic incantation shomewhere. git refused the push. 19:35 #navit: < charles__> I am on my new branch locally, but not on github. 19:35 #navit: < charles__> To https://github.com/navit-gps/navit.git ! [rejected] trunk -> trunk (non-fast-forward) error: failed to push some refs to 'https://github.com/navit-gps/navit.git' hint: Updates were rejected because a pushed branch tip is behind its remote hint: counterpart. Check out this branch and integrate the remote changes hint: (e.g. 'git pull ...') before pushing again. h 19:36 #navit: < kazer> MarcR: oh nice! that's what i used to build the new enclosure for my screen as well. 19:36 #navit: < kazer> charles__: alert! this is about trunk ! :) 19:36 #navit: < kazer> charles__: can you pastebin your full git status ? 19:38 #navit: < charles__> https://pastebin.com/LC6c0f3d 19:38 #navit: < charles__> Whole sequence. 19:41 #navit: < charles__> I suspect I should have gone back to trunk to pull. 19:49 #navit: < MarcR> there we go. qt creator up and running 20:01 #navit: < kazer> charles__: line 7 shows that your changes still need to be committed for the branch 20:02 #navit: < kazer> line 24 shows that your branch does not exist in our repo yet (which makes sense) 20:02 #navit: < MarcR> kazer: is it better to setup an extra kit for the raspberry 7" touch display? or should I just use desktop Qt 5.7.1 GCC 64bit Kit? 20:04 #navit: < charles__> kazer: How do I make my branch show up on your repo? 20:07 #navit: < kazer> MarcR: desktop QT should work, as anyway we define most of the controls we use ourselves. Here's the example for the buttons used in the menu : https://github.com/navit-gps/navit/blob/trunk/navit/gui/qt5_qml/skins/MainButton.qml 20:07 #navit: < kazer> build from scratch using basic shapes 20:08 #navit: < kazer> charles__: my concern is that you might have a commit on trunk. let's double check 20:08 #navit: < kazer> go back to trunk : git checkout trunk 20:08 #navit: < kazer> look at the history : git log 20:08 #navit: < kazer> is the latest commit from you, earlier today? 20:09 #navit: < charles__> No. Three commits from S. Leske, yesterday. 20:09 #navit: < charles__> I suspect If I do a pull now, that will work. 20:10 #navit: < kazer> ok good. so let's go back to your branch 20:10 #navit: < charles__> OK.... 20:10 #navit: < kazer> did you commit something today in that branch ? 20:10 #navit: < charles__> Yes. 20:11 #navit: < kazer> ok. git status shows that a commit needs to be pushed? 20:11 #navit: < charles__> Um, no. 20:11 #navit: < kazer> ok, so we need to commit. Let's commit only GTK changes in that branch to avoid scope creep 20:12 #navit: < charles__> Right, that's all I've done so far. 20:12 #navit: < charles__> I have two commits. They won't push. 20:12 #navit: < kazer> modified: navit/navigation.c so it looks like you also touched this one, which is nice but we'll have to push that seperately 20:13 #navit: < charles__> Right. That's your fix for the warning. I can back that out. 20:13 #navit: < kazer> it's alright, just exclude it from the commit 20:13 #navit: < kazer> i mean don't include it in the commit :) 20:14 #navit: < kazer> this way you can still create a new branch after and push it 20:14 #navit: < charles__> It is. I did "git add .... " for the one file I wanted. 20:14 #navit: < kazer> perfect. so you committed now. You should be ready to push 20:15 #navit: < charles__> That's what I thought. 20:15 #navit: < kazer> git push ? (depending of your config, it might complain that there's no remote branch) 20:15 #navit: < kazer> if it does complain, git push --set-upstream origin gtkAddFollowVehicleToggle 20:15 #navit: < charles__> Same complaint. 20:15 #navit: < kazer> complaint is There is no tracking information for the current branch. ? 20:16 #navit: < charles__> I think I should "git co trunk ; git pull ; git co gtk...." 20:16 #navit: < kazer> didn't we just do that ? 20:16 #navit: < kazer> also trunk shouldn't matter 20:16 #navit: < charles__> No. I asked if I should, but didn't get a response, so I didn't. 20:16 #navit: < kazer> you can push a branch that's behind trunk 20:16 #navit: < kazer> oh 20:17 #navit: < charles__> OK, trying it now.... 20:17 #navit: < charles__> Got a good pull. 20:18 #navit: < charles__> Back to my branch. I ran git push, but was told, "Everything up-to-date". 20:19 #navit: < charles__> Can you do a pull locally & see if my branch is there? 20:19 #navit: < kazer> your branch isn't there. can you show me git status ? 20:20 #navit: < charles__> charles@hawk:~/versioned/navit$ git st On branch gtkAddFollowVehicleToggle Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to discard changes in working directory) modified: navit/gui/gtk/gui_gtk_statusbar.c modified: navit/navigation.c Untracked files: (use "git add ..." to include in what will be committed) navit-build/ no changes adde 20:21 #navit: < charles__> "git log" shows my two commits, as before. 20:21 #navit: < kazer> really odd. 20:21 #navit: < kazer> modified: navit/gui/gtk/gui_gtk_statusbar.c 20:21 #navit: < kazer> let's try git add navit/gui/gtk/gui_gtk_statusbar.c 20:22 #navit: < kazer> git status? (pastebin makes it easier to read :) ) 20:22 #navit: < charles__> Not part of this change, though. 20:22 #navit: < kazer> what do you mean not part of this change? 20:23 #navit: < charles__> This change is about adding a menu item. The statusbar chang is to fix that integer maths problem. 20:24 #navit: < charles__> https://pastebin.com/hx7kjfG7 20:34 #navit: < charles__> Out to run errands, back in an hour or so. 20:34 -!- MarcR is now known as MarcR|away 20:35 #navit: < kazer> charles__: oh right 20:36 #navit: < kazer> charles__: could you share a zip/tar of your navit tree? might help me troubleshoot your issue 21:08 -!- tryagain [~quassel@217.107.194.121] has joined #navit 21:09 -!- tryagain [~quassel@217.107.194.121] has quit [Remote host closed the connection] 21:19 #navit: < charles__> kazer: Tarball at https://wli.ddns.info:17740/navit.crc.2017.11.03.tar.bz2 21:23 #navit: < kazer> ok let me see 21:24 #navit: < kazer> woopsie, 404 21:24 #navit: < charles__> Hmmm.... 21:35 #navit: < charles__> kazer: OK, try again. 21:36 #navit: < charles__> And now to see to it that doesn't happen again. 21:41 #navit: < kazer> works. downloading 21:42 #navit: < charles__> Never make the same mistake twice. Make some other mistake next time; you might like it better. 21:42 #navit: < kazer> exactly :) 21:51 #navit: < kazer> charles__: here's your code : https://github.com/navit-gps/navit/tree/gtkAddFollowVehicleToggle 21:51 #navit: < kazer> i only did https://github.com/navit-gps/navit/tree/gtkAddFollowVehicleToggle 21:51 #navit: < kazer> erm 21:51 #navit: < kazer> i meant git push --set-upstream origin gtkAddFollowVehicleToggle 21:52 #navit: < kazer> you can submit the PR from the link i shared 21:56 #navit: < charles__> OK, something to add into your write-up. 21:57 #navit: < kazer> well that's depending of your git config 21:57 #navit: < charles__> Ah. As far as I know, I have a pretty plain vanilla ~/.git 21:58 #navit: < kazer> yeah, the thing is that the behavior changed in git 2.0+ 21:59 #navit: < kazer> i'll update the doc to advise to use git push -u since we expect folks to work on new branch everytime. it should address this 21:59 #navit: < charles__> Sounds good. 21:59 #navit: < kazer> and you can be my guinea pig with the compiler warning fix that you still have pending :) 22:00 #navit: < kazer> doc updated 22:00 #navit: < kazer> to work on a new feature (like here the warning fix) you should always go back to trunk, pull, and then create the branch 22:01 #navit: < kazer> otherwise the new branch will be based on the current branch. makes sense? 22:03 #navit: < charles__> Pull request accomplished. https://github.com/navit-gps/navit/pull/362 22:04 #navit: < kazer> thanks 22:04 #navit: < charles__> Yes, makes a lot of sense. What I am used to is: branch locally, modify, beat the thing over the head locally, then merge back into trunk, then push. 22:05 #navit: < charles__> I have no problem w/ pushing the experimental branch, I'm just not accustomed to it. 22:07 #navit: < kazer> looks like a workflow with maybe only one dev. pushing the branch has the benefit that others can review/comment before it acually gets merged 22:07 #navit: < kazer> PR merged, nice work. 22:09 #navit: < charles__> Thx. 22:09 #navit: < charles__> Yeah, better for team reviews, etc. 22:09 #navit: < charles__> Do the tests generate the doxy docs? It's been a while since I used it. 22:15 #navit: < kazer> doxygen docs are generated when we build on trunk currently 22:15 #navit: < kazer> https://github.com/navit-gps/navit/blob/trunk/.circleci/config.yml#L134-L139 22:16 #navit: < kazer> looks like function prototypes are missing from the output (we recently updated our doxygen builds) i'm looking into it 22:40 #navit: < kazer> fixed : http://doxygen.navit-project.org/gui__gtk__action_8c.html#a5cfcf16fd5f2e398f164b16bff07da3b 22:46 #navit: < charles__> Looks good. However, I screwed up on the comment. 22:47 #navit: < kazer> easy to fix :) 22:47 #navit: < charles__> I can fix the comment. Let's make sure I get the git stuff right. :-) 22:47 #navit: < kazer> practicing, that's the only way to learn :) 22:51 #navit: < charles__> Had to do the "git push --set-upstream origin gtkAddFollowVehicleToggle". 22:52 #navit: < kazer> yeah, cause we usually delete branches after merging content 22:53 #navit: < kazer> don't forget to create the PR when it's ready 22:56 -!- xenos1984 [~xenos1984@22-164-191-90.dyn.estpak.ee] has quit [Quit: Leaving.] 23:03 #navit: < charles__> OK. Well, I did the PR. It reported a conflict, which I resolved. So I think the changes are in the branch. 23:04 #navit: < kazer> ok let's see 23:05 #navit: < kazer> i think that your conflict was because you committed a change on the branch after i merged it 23:05 #navit: < charles__> The line for dummy should read: " * @param dummy Ignore the pointer behind the curtain." 23:05 #navit: < charles__> That makes sense. 23:06 #navit: < kazer> yep looks good : https://github.com/navit-gps/navit/pull/363/files 23:07 #navit: < charles__> OK, now what? 23:07 #navit: < charles__> I'm about ready for some dinner. Can we call this one good? 23:09 #navit: < kazer> yep, just merged it 23:09 #navit: < kazer> enjoy dinner :) 23:10 #navit: < charles__> Later, alligator. 23:11 #navit: < kazer> haha 23:36 -!- j_f-f [~quassel@rs-7.jff-webhosting.net] has quit [Ping timeout: 240 seconds] 23:49 -!- j_f-f [~quassel@rs-7.jff-webhosting.net] has joined #navit --- Log closed Sat Nov 04 00:00:08 2017