Re: Rebase of kopete branch and push it to master
On Thu, Jan 25, 2018 at 11:26 AM, Pali Rohárwrote: > On Friday 19 January 2018 21:56:10 Ben Cooksley wrote: >> On Fri, Jan 19, 2018 at 12:06 PM, Pali Rohár wrote: >> > On Thursday 18 January 2018 20:50:35 Ben Cooksley wrote: >> >> Hi all, >> >> >> >> I have now completed the merge from Pali's clone repository into the >> >> 'master' branch of the main Kopete repository. >> >> Phabricator processing of all the commits has been completed without >> >> incident. >> > >> > Hi! Thank you very very much! >> > >> >> Pali, please revise the metadata accordingly in sysadmin/repo-metadata >> > >> > See quoted comments/questions below >> > >> > https://phabricator.kde.org/source/sysadmin-repo-metadata/browse/master/projects/kde/kdenetwork/kopete/metadata.yaml >> > >> >> description: 'h1. Kopete - The KDE Instant Messenger >> > >> > What does "h1." means? Looks like some wiki(?) syntax for heading. No >> > idea if it should be there or not. >> >> That is a leftover from when this data was generated from the >> descriptions used by projects.kde.org, which ran Redmine/Chiliproject. >> It means nothing to anything we run these days and should be cleaned up. >> >> > >> >> - displayname: "Pali Roh\xE1r" >> > >> > What is encoding of that YAML file? Is not UTF-8 supported? >> >> The conversion tool we used was conservative in regards to handling >> information and encoded everything that couldn't be represented in >> Latin-1 I believe. >> I've entered UTF-8 characters into other files, and they certainly >> should be encoded in and support, UTF-8. > > Ok. Is some step from my side needed now? Please feel free to update that file to use the UTF-8 version of your name should you wish to do so. > >> > >> > Otherwise looks correct. >> > >> > https://phabricator.kde.org/source/sysadmin-repo-metadata/browse/master/projects/kde/kdenetwork/kopete/i18n.json >> > >> >> {"trunk": "master", "stable": "Applications/17.08", "stable_kf5": "none", >> >> "trunk_kf5": "none"} >> > >> > I do not fully understand content of this JSON file, but there is no >> > KDE4 trunk version in repository anymore. master branch now points to >> > trunk KF5 version and there is no 17.12 (stable) version. >> >> Luigi has now updated this I believe. >> >> > >> >> (for i18n) and kde-build-metadata (for the CI and kdesrc-build users) >> > >> > It is https://phabricator.kde.org/source/kde-build-metadata/ right? What >> > should I check there? >> >> In that repository you need to check two things: >> >> 1) logical-module-structure, JSON formatted, which defines a series of >> rules stating which branches are used by projects. > > Seems correct. Excellent. > >> 2) the dependency-data-* files, which contain the dependency >> definition rules between KDE projects for each branch grouping. >> Anything not defined in here won't be made available on the CI, and >> this data is used by kdesrc-build to sequence the order of things to >> build. >> >> In regards to the dependency data, please note that there is a generic >> wildcard rule at the very bottom which makes essentially all >> Frameworks a dependency of anything in Applications, Extragear or >> Playground so you don't need to declare a dependency on any Framework >> you use. > > This IIRC should be enough. Anyway, if there is CI problem, is report > send to somewhere? Please file a task on Phabricator against the build.kde.org project and we'll take it from there. > >> Hope that clears things up. >> >> Cheers, >> Ben >> >> > >> >> as soon as possible. >> >> >> >> Regards, >> >> Ben >> > >> > -- >> > Pali Rohár >> > pali.ro...@gmail.com > > -- > Pali Rohár > pali.ro...@gmail.com Cheers, Ben
Re: Importing kdiff3 - was - Re: Aw: Re: KDE inclusion
El dimecres, 24 de gener de 2018, a les 17:34:16 CET, Kevin Funk va escriure: > On Wednesday, 24 January 2018 16:24:10 CET Michael Reeves wrote: > > A little confused on where to start with this sponsor thing. > > Huh? 'sponsor thing'? :) > I guess it's regarding the https://community.kde.org/Incubator/Incubation_Process Which to my understanding was supposed to be a voluntary thing but it seems some people are forcing it on every single new project. As I did with the last person that also was confused and annoyed by all this burocracy, just ask me any question you may have. Cheers, Albert > Care to elaborate what you mean? > > Regards, > Kevin > > > On Jan 19, 2018 3:52 PM, "Kevin Funk"wrote: > > > On Wednesday, 17 January 2018 21:40:49 CET Michael Reeves wrote: > > > > Yes I use this myself so I won't simply abandon it. That said I work > > > > in > > > > mostly in Unix world and could use help with the windows specific > > > > testing > > > > although I should be able to setup a build envirionment to do basic > > > > functionality testing. > > > > > > Heya, > > > > > > For that please join #kde-windows and get in touch with kfunk (me) or > > > TheOneRing (Hannah von Reth) there. > > > > > > We could guide setting up the development environment. > > > > > > We use Craft to build Qt/KDE projects on Windows, read more here: > > > https://community.kde.org/Craft > > > > > > Cheers, > > > Kevin > > > > > > > I'll have look at what needs done. Currently working > > > > on getting merging in changes from Thomas as needed. Just got through > > > > bringing it up to date with Joachim's code. Real fun since it's still > > > > > > kde4. > > > > > > > On Jan 15, 2018 5:47 PM, "Albert Astals Cid" wrote: > > > > > > > > El dimarts, 9 de gener de 2018, a les 20:06:36 CET, Michael Reeves va > > > > > > > > escriure: > > > > > I have a version of kdiff3 that I ported to kf5. I like to what > > > > > build > > > > > requirements kf5 as a whole has. Also what would be the process for > > > > > > being > > > > > > > > considered for inclusion in kde? > > > > > > > > So now that we have Joachim's blessing to use the name, the process is > > > > basically outlined at https://community.kde.org/ > > > > > > Incubator/Incubation_Process > > > > > > > but it's basically importing the project into our git and then making > > > > > > sure > > > > > > > it > > > > generally follows our rules & procedures. > > > > > > > > I understand you want to continue maintaining the new kdiff3 and you > > > > are > > > > > > not > > > > > > > just "dumping it" into us, right? > > > > > > > > > > > > Cheers, > > > > > > > > Albert > > > > > > > > El divendres, 12 de gener de 2018, a les 1:21:02 CET, Joachim Eibl va > > > > > > > > escriure: > > > > > Hi, > > > > > > > > > > You have my blessing to use the name KDiff3. > > > > > > -- > > > Kevin Funk | kf...@kde.org | http://kfunk.org
Re: Rebase of kopete branch and push it to master
On Friday 19 January 2018 21:56:10 Ben Cooksley wrote: > On Fri, Jan 19, 2018 at 12:06 PM, Pali Rohárwrote: > > On Thursday 18 January 2018 20:50:35 Ben Cooksley wrote: > >> Hi all, > >> > >> I have now completed the merge from Pali's clone repository into the > >> 'master' branch of the main Kopete repository. > >> Phabricator processing of all the commits has been completed without > >> incident. > > > > Hi! Thank you very very much! > > > >> Pali, please revise the metadata accordingly in sysadmin/repo-metadata > > > > See quoted comments/questions below > > > > https://phabricator.kde.org/source/sysadmin-repo-metadata/browse/master/projects/kde/kdenetwork/kopete/metadata.yaml > > > >> description: 'h1. Kopete - The KDE Instant Messenger > > > > What does "h1." means? Looks like some wiki(?) syntax for heading. No > > idea if it should be there or not. > > That is a leftover from when this data was generated from the > descriptions used by projects.kde.org, which ran Redmine/Chiliproject. > It means nothing to anything we run these days and should be cleaned up. > > > > >> - displayname: "Pali Roh\xE1r" > > > > What is encoding of that YAML file? Is not UTF-8 supported? > > The conversion tool we used was conservative in regards to handling > information and encoded everything that couldn't be represented in > Latin-1 I believe. > I've entered UTF-8 characters into other files, and they certainly > should be encoded in and support, UTF-8. Ok. Is some step from my side needed now? > > > > Otherwise looks correct. > > > > https://phabricator.kde.org/source/sysadmin-repo-metadata/browse/master/projects/kde/kdenetwork/kopete/i18n.json > > > >> {"trunk": "master", "stable": "Applications/17.08", "stable_kf5": "none", > >> "trunk_kf5": "none"} > > > > I do not fully understand content of this JSON file, but there is no > > KDE4 trunk version in repository anymore. master branch now points to > > trunk KF5 version and there is no 17.12 (stable) version. > > Luigi has now updated this I believe. > > > > >> (for i18n) and kde-build-metadata (for the CI and kdesrc-build users) > > > > It is https://phabricator.kde.org/source/kde-build-metadata/ right? What > > should I check there? > > In that repository you need to check two things: > > 1) logical-module-structure, JSON formatted, which defines a series of > rules stating which branches are used by projects. Seems correct. > 2) the dependency-data-* files, which contain the dependency > definition rules between KDE projects for each branch grouping. > Anything not defined in here won't be made available on the CI, and > this data is used by kdesrc-build to sequence the order of things to > build. > > In regards to the dependency data, please note that there is a generic > wildcard rule at the very bottom which makes essentially all > Frameworks a dependency of anything in Applications, Extragear or > Playground so you don't need to declare a dependency on any Framework > you use. This IIRC should be enough. Anyway, if there is CI problem, is report send to somewhere? > Hope that clears things up. > > Cheers, > Ben > > > > >> as soon as possible. > >> > >> Regards, > >> Ben > > > > -- > > Pali Rohár > > pali.ro...@gmail.com -- Pali Rohár pali.ro...@gmail.com signature.asc Description: PGP signature
Re: Importing kdiff3 - was - Re: Aw: Re: KDE inclusion
On Wednesday, 24 January 2018 16:24:10 CET Michael Reeves wrote: > A little confused on where to start with this sponsor thing. Huh? 'sponsor thing'? :) Care to elaborate what you mean? Regards, Kevin > On Jan 19, 2018 3:52 PM, "Kevin Funk"wrote: > > On Wednesday, 17 January 2018 21:40:49 CET Michael Reeves wrote: > > > Yes I use this myself so I won't simply abandon it. That said I work in > > > mostly in Unix world and could use help with the windows specific > > > testing > > > although I should be able to setup a build envirionment to do basic > > > functionality testing. > > > > Heya, > > > > For that please join #kde-windows and get in touch with kfunk (me) or > > TheOneRing (Hannah von Reth) there. > > > > We could guide setting up the development environment. > > > > We use Craft to build Qt/KDE projects on Windows, read more here: > > https://community.kde.org/Craft > > > > Cheers, > > Kevin > > > > > I'll have look at what needs done. Currently working > > > on getting merging in changes from Thomas as needed. Just got through > > > bringing it up to date with Joachim's code. Real fun since it's still > > > > kde4. > > > > > On Jan 15, 2018 5:47 PM, "Albert Astals Cid" wrote: > > > > > > El dimarts, 9 de gener de 2018, a les 20:06:36 CET, Michael Reeves va > > > > > > escriure: > > > > I have a version of kdiff3 that I ported to kf5. I like to what build > > > > requirements kf5 as a whole has. Also what would be the process for > > > > being > > > > > > considered for inclusion in kde? > > > > > > So now that we have Joachim's blessing to use the name, the process is > > > basically outlined at https://community.kde.org/ > > > > Incubator/Incubation_Process > > > > > but it's basically importing the project into our git and then making > > > > sure > > > > > it > > > generally follows our rules & procedures. > > > > > > I understand you want to continue maintaining the new kdiff3 and you are > > > > not > > > > > just "dumping it" into us, right? > > > > > > > > > Cheers, > > > > > > Albert > > > > > > El divendres, 12 de gener de 2018, a les 1:21:02 CET, Joachim Eibl va > > > > > > escriure: > > > > Hi, > > > > > > > > You have my blessing to use the name KDiff3. > > > > -- > > Kevin Funk | kf...@kde.org | http://kfunk.org -- Kevin Funk | kf...@kde.org | http://kfunk.org signature.asc Description: This is a digitally signed message part.