**** BEGIN LOGGING AT Fri Jun 19 02:59:57 2020 Jun 19 07:08:15 Morning! Jun 19 07:48:51 Morning! Jun 19 08:23:30 Tofe: Seems I forgot this one yesterday due to the naming of the branch: https://github.com/webOS-ports/luna-systemui/pull/17 Jun 19 08:23:56 systemui has access to a lot (signals, bluetooth, applications, database, settings etc, so decided to do all here) Jun 19 08:29:15 merged Jun 19 08:33:50 Tofe: Thnx Jun 19 08:34:05 For luna-qml-launcher we were using my herrie/work branch it seems. Jun 19 08:34:40 yes Jun 19 08:35:01 https://github.com/webOS-ports/luna-qml-launcher/compare/herrie/work Jun 19 08:35:09 Which is again different from your PR? Jun 19 08:35:24 So I guess we need to see what we want to do there Jun 19 08:35:57 I reworked my branch, because it was slightly incorrect - but in the end it's identical to yours, because you also reworked my commit Jun 19 08:36:10 so you can drop/reset that branch Jun 19 08:37:31 we already merged ls2-fix so it's a bit late now, and rewriting master isn't a great option Jun 19 08:39:39 Tofe: Well can do a hard-reset :P Jun 19 08:39:42 To previous commit Jun 19 08:39:47 Since anyway SRCREV wasn't bumped Jun 19 08:39:54 true Jun 19 08:40:00 ok, I can do that Jun 19 08:40:54 Well anyway if something breaks we can easily figure out what might be the cuase since it's a single repo Jun 19 08:41:22 Github has issues now it seems :P Jun 19 08:43:11 yes, great timing Jun 19 08:43:46 ok, master branch rolled back Jun 19 08:50:07 https://github.com/webOS-ports/luna-qml-launcher/pull/19 here it is. Maybe you want to squash some of the commits ?... Jun 19 08:51:53 Tofe: Another one: https://github.com/webOS-ports/libwebos-application/pull/1 Jun 19 09:01:09 Tofe: OK squashed some, now a bit cleaner Jun 19 09:06:20 ok, merged, now we have to bump Srcrev :p Jun 19 09:09:00 Tofe: yeah I'm on a big rework for all the branch names etc Jun 19 09:09:15 So should be done soonish when github cooperates Jun 19 09:39:06 I mean for qml-launcher, the current commit in the recipe doesn't exist anymore Jun 19 09:48:46 Tofe: Yeah should have created a new branch really :S Jun 19 09:48:52 But well, ship has sailed LOL Jun 19 09:48:59 work is ready, testing it now Jun 19 09:49:20 See if I didn't make any silly mistakes Jun 19 09:49:23 Then will PR Jun 19 09:49:28 ok :) Jun 19 09:49:49 Should make JaMa happy that I got rid of all the WEBOS_GIT_PARAM_BRANCH except for qml-settings app :P Jun 19 09:51:13 hehe Jun 19 09:54:55 Tofe: This one was good to go right? https://github.com/webOS-ports/nodejs-module-webos-dynaload/pull/3/files Jun 19 09:55:01 I mean good to merge Jun 19 10:03:35 yes Jun 19 10:05:19 Tofe: While I'm at it, should I move messwerk, org.webosports.app.terminal and qt5-plugin-generic-vboxtouch also to webos-ports? Jun 19 10:23:55 Tofe: Done, gave you access as well Jun 19 11:01:13 Herrie: thanks, good idea Jun 19 11:01:31 Tofe: https://github.com/webOS-ports/meta-webos-ports/pull/440 Jun 19 11:01:39 That should make JaMa happier I guess Jun 19 11:02:30 Merged ! Jun 19 11:03:16 I basically created a new class called webos_ports_ose_repo which points to webOS-ports/webOS-OSE by default. So we don't need to specify the WEBOS_GIT_PARAM_BRANCH anymore for webOS-ports/webOS-OSE branches, just simply inheriting webos_ports_ose_repo would work there Jun 19 11:03:29 Also all the herrie/acg and other uncommon branch names are gone now Jun 19 11:08:48 ok great Jun 19 11:09:31 another option would be to just merge the OSE branches in the webOS-ports/master branch Jun 19 11:09:50 but maybe the history isn't common ? Jun 19 11:11:09 Tofe: Yeah history isn't common for quite some of them due to the OSE code drop without history Jun 19 18:04:50 Tofe: Still fighting with the camera bits? But seems you're getting closer? Jun 19 18:08:44 well, I'm trying to have work a bit more fluently Jun 19 18:08:56 and anyway the camera app will probably need a major rework Jun 19 18:09:21 because it's using libcompat right now, or it's trying to **** ENDING LOGGING AT Sat Jun 20 03:00:22 2020