Skip to content

[linux] Import kmfl#765

Merged
glasseyes merged 149 commits into
masterfrom
import-kmfl
Jun 13, 2018
Merged

[linux] Import kmfl#765
glasseyes merged 149 commits into
masterfrom
import-kmfl

Conversation

@glasseyes
Copy link
Copy Markdown
Contributor

@glasseyes glasseyes commented Apr 23, 2018

import from CVS on sourceforge to personal repo then updates from debian packages that are more recent

add build.sh, README.md and history.md
now import to keyman

root added 30 commits February 8, 2005 21:13
… to client; change Makefile.am to use correct directories for current version of scim
…ow handled correctly in scim and scim-qtimm
@darcywong00
Copy link
Copy Markdown
Contributor

Some of the linux/build/agent/ files were copied from WeSay, but still talk about building WeSay.

@glasseyes glasseyes changed the title [WIP] [linux] Import kmfl [linux] Import kmfl Apr 27, 2018
Copy link
Copy Markdown
Member

@mcdurdin mcdurdin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking like a good import; one minor change requested.

Comment thread README.md Outdated
## Desktop Platforms ##
[Windows](./windows/src/README.md)
[macOS](./mac/README.md)
[L](./linux/README.md)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should say [Linux]... not [L]

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@darcywong00
Copy link
Copy Markdown
Contributor

@mcdurdin Can we move windows/src/LICENSE.md to the root folder (update date to -2018) and have it apply to all the products?

@mcdurdin
Copy link
Copy Markdown
Member

@darcywong00 not at this time. There's a bunch of things to consider, e.g. KMFL is GPL, others are MIT, and we have other included code around the place that is also different (although compatible). It's not a trivial task :)

Comment thread README.md
Copyright (c) 2018 SIL International. All rights reserved.

Licensed under the [MIT](./windows/src/LICENSE.md) License. No newline at end of file
Licensed under the [MIT](./windows/src/LICENSE.md) License.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to stay but we need to list the exception for Linux at present I think.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added "KMFL is licensed under GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version."

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, here's the final story from Doug:

While the kmfl library is all original, ibus-kmfl is another story. The code is based on code from the ibus-m17n which is released under GPL 2. ibus itself is LGPL 2 so should be compatible with ibus modules released under MIT. Three files in ibus-kmfl use code from ibus-17n: engine.c, engine.h, and main.c.

So we need to use GPL 2 for ibus-kmfl, at least until we rewrite those three files. Everything else should be changed over to MIT. This at least should avoid any issues with cross-license confusion when sharing code between projects, because as far as I can tell, there is no need to share any code between ibus-kmfl and other platforms.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That was done for this PR then #870 does the change of licensing

@mcdurdin mcdurdin modified the milestones: P3S2, P3S3 May 4, 2018
@mcdurdin mcdurdin modified the milestones: P3S3, P3S4 May 18, 2018
ibus-kmfl as a project remains GPL
move some things from engine.c to kmfutil
describe licensing in linux/LICENSE.md
update license info in ./README.md
@mcdurdin mcdurdin modified the milestones: P3S4, P3S5 Jun 4, 2018
@glasseyes glasseyes merged commit 159f780 into master Jun 13, 2018
@mcdurdin mcdurdin deleted the import-kmfl branch June 14, 2018 14:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants