From 1a9b00a1f818aa330902c987532d0993b3537d00 Mon Sep 17 00:00:00 2001 From: Brett Zamir Date: Mon, 4 May 2020 09:19:16 +0800 Subject: [PATCH] - License: Remove "CC-BY-SA-2.0" as explicit license type, but make note about unclear provenance of some images - Docs: Update license badges to reflect lack of (known) CC-BY-SA-2.0 usage - Replace CC-BY-SA-2.0 polygon image (thanks, @mowijo !) --- CHANGES.md | 3 + README.md | 9 +- badges/licenses-badge.svg | 2 +- editor/images/README.txt | 4 +- editor/images/polygon.png | Bin 557 -> 922 bytes editor/images/polygon.svg | 245 ++++++++------------------------------ licenseInfo.json | 1 - package.json | 2 +- 8 files changed, 64 insertions(+), 202 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 2db121f0..e1912f24 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -10,12 +10,14 @@ licenses. See the new license badges on the README for a summary of the licenses including either bundled devDependencies or all `devDependencies` (we have no direct npm `dependencies` currently). +- License: Add note about unclear provenance of some images - License: Relicense ext-mathjax from Apache-2.0 to MIT per - License: Clarify in `@license` that `ext-server_moinsave.js` is "(MIT OR GPL-2.0-or-later)" per subsequent text - License: Reorder license listing in `jquery.contextMenu.js` so that more permissive is noticeable first +- License: Replace CC-BY-SA-2.0 polygon image (thanks, @mowijo !) - BREAKING CHANGE: Remove `$.pref` in favor of new `svgEditor.pref` (avoiding polluting jQuery). (Might be moved to own module in future.) @@ -55,6 +57,7 @@ summary of all licenses including bundled). - Docs: Reprioritize `docs` in commit lists (prioritize user-facing) - Docs: Update Pavol's email address (@prusnak) +- Docs: Update license badges to reflect lack of (known) CC-BY-SA-2.0 usage - Docs: Update Contributing, Testing (renamed to Development), Linting and ReleaseInstructions - Update: Cypress code coverage plugin diff --git a/README.md b/README.md index 9c040bf1..1d449624 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,12 @@ (see also [licenses for dev. deps.](https://raw.githubusercontent.com/SVG-Edit/svgedit/master/badges/licenses-badge-dev.svg?sanitize=true)) -(Note: The protective license `CC-BY-SA-2.0` is due to our containing at least -one image under this stricter license; to avoid its conditions, we'd -appreciate a replacement image. See [#377](https://github.com/SVG-Edit/svgedit/issues/377)) +(Note: The license provenance of the images in `/editor/images` may not be +fully clear, even with the origin of some of the images listed as being from . We would like to +replace these images if their provenance cannot be determined or is found to +be under a protective license. If you know of the original terms, or can help +create SVG replacement images, please let us know at: +[#377](https://github.com/SVG-Edit/svgedit/issues/377).) [![issuehunt-to-marktext](https://issuehunt.io/static/embed/issuehunt-button-v1.svg)](https://issuehunt.io/r/SVG-Edit/svgedit) diff --git a/badges/licenses-badge.svg b/badges/licenses-badge.svg index 7d0cbfa0..2c21f8ff 100644 --- a/badges/licenses-badge.svg +++ b/badges/licenses-badge.svg @@ -1 +1 @@ -License typesLicense types(project, deps, and bundled devDeps)(project, deps, and bundled devDeps)PermissivePermissive1. Apache-2.01. Apache-2.02. ISC2. ISC3. MIT3. MIT4. X114. X11WeaklyWeaklyprotectiveprotective1. LGPL-3.0-or-later1. LGPL-3.0-or-laterProtectiveProtective1. CC-BY-SA-2.01. CC-BY-SA-2.0 \ No newline at end of file +License typesLicense types(project, deps, and bundled devDeps)(project, deps, and bundled devDeps)PermissivePermissive1. Apache-2.01. Apache-2.02. ISC2. ISC3. MIT3. MIT4. X114. X11WeaklyWeaklyprotectiveprotective1. LGPL-3.0-or-later1. LGPL-3.0-or-later \ No newline at end of file diff --git a/editor/images/README.txt b/editor/images/README.txt index 184e3e72..7c5b5739 100644 --- a/editor/images/README.txt +++ b/editor/images/README.txt @@ -41,8 +41,8 @@ none.png open.png paste.png path.png -polygon.png http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/tools/draw-polygon.png -polygon.svg http://tango.freedesktop.org/static/cvs/tango-art-libre/22x22/tools/draw-polygon.svg +polygon.png https://github.com/SVG-Edit/svgedit/issues/377 +polygon.svg https://github.com/SVG-Edit/svgedit/issues/377 rect.png redo.png rotate.png diff --git a/editor/images/polygon.png b/editor/images/polygon.png index 533ea1f6ba790f115d3feb939e167ca1b507cc2e..609b3e55258e8f73855d7aa15544cfa4fd68b33f 100644 GIT binary patch literal 922 zcmV;L17-Y)P)P000&U1^@s6HNQ8u00004b3#c}2nYxW zdBn)Y21NkP2K72M}@sagv7LoQn{3L0Eyv5GhoxA)#_&leqpd}+PVMa z`SZuE5WFsgdj&vutH3^`es~42TOMZVJKulP7;@s(E8hO`Wlx7c)YL`v5*! z|K)FfKt#^$-rcu%a`Lp;vu9VU<9!#o+#(Jg`nI0QWb;~^j{$(KZH6J1hK9ay+W`Pz z=gyCiNDOkvp;v3QcZk+{?9!#{eh>t0Apnp}Ue%R~zPJGaFuAg_>fXKkur1)}(?2mk z|F;A%^*&@t2!1b>x@FrzE?>R@rQ{rdC+|a0tC`WUvFpa#?K`8R*L1C>lk01&;Y=!@ zFNkz{W?R6sXE|iE^AbR6E99k={K3S;?QJ3B<2Rv{{0qSBRtRb}Gn!0Z)!P}_+fiL? ztZzU7jK6sCkH}=QEdjaQB4%cuNB|SfAh}3HK5lhnsnjhfxUe>0}uiTtwl&gp|v)2UAHze^4-}) zBJnsDi!DW?(IwCG@|~TXc>(}ytt=D@ao_j5E0s!DsZ{DR#(b!??$BC$#+aDz`!Wne z9)=+?#sb%M4d=Wng!oq}RZ>c=NGV^%VzHu9swkyg_B^jZM3y#tzO|MEkfl;dYORIi wIGl(W5iu#HUoMveA%ylkPXo|IWH#&d8h`o8*_OOXSO5S307*qoM6N<$f<8>K2mk;8 literal 557 zcmV+|0@D47P)NklFVT+qrWwafxE{p5?;~7SV5;%}2qewTz zt-bMf`^nuHj^xW#Rh!zBbVuoXWOw7ox+fmTcqk)B6_xcv%UV>Zhw6Gpu~`@z{%w?+ zwzQ!&E$OSi=#xU-7K05i6$@i;1AqV@pMU^AxqFnEb9vt^d?>w}h8Q#W$>|{~l%|<$ z79unH0Py3gew+qFE3+(=2%80X{%Eb7^zf4&b@IH4c)gA72&?liO5`xRG9qOBGgE&G zFnV7~>KhC`9$6Ncoxs^cuqVf-=EzXT!=+9gmnt1h61?1FACA}^h0Ws~{R5UbNdzq)zo%Bhh>+L`g!8k8bDrRG&Q)&UCN*3}eAp=vYo} z(Rn)7XBEhiAr1I=mRnd$JF3Zv3<7Isx?-;Nu+?MtT1V+3PYd8tVLe(2mZIfgW5qN! vU{~~|-E2CW%Cw|~A4DefTFqkk55LAQ - + height="22.000000px" + id="svg8728" + sodipodi:docname="polygon.svg" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)"> + + This file is released under the MIT license. + + + id="linearGradient928"> + id="stop924" /> - - - - + id="stop926" /> - - - - - - - - - - - - - - - - + gradientTransform="matrix(1.0033963,-0.00853162,0.00155275,0.18261755,-0.31483228,15.390226)" + r="9.9786386" + fy="18.71875" + fx="10.531251" + cy="18.71875" + cx="10.531251" + id="radialGradient919" + xlink:href="#linearGradient928" /> - - - - - image/svg+xml - - Draw Rectangle - 2005-10-10 - - - Andreas Nilsson - - - - - draw - rectangle - square - - - - - - - - - - - - - - + id="path911" + style="opacity:1;fill:url(#radialGradient919);fill-opacity:1;stroke:none;stroke-width:0.98000002;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:304.81887817;stroke-opacity:1" + ry="1.9786382" + rx="9.9786386" + cy="18.71875" + cx="10.281251" /> - + d="M 10.312501,3.499999 18.198468,9.2294899 15.186297,18.5 5.438705,18.5 2.4265338,9.2294894 Z" + id="path909" + style="opacity:1;fill:#ffffda;fill-opacity:1;stroke:#000000;stroke-width:1.00000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:304.81887817;stroke-opacity:1" /> diff --git a/licenseInfo.json b/licenseInfo.json index 7563c72a..a5050316 100644 --- a/licenseInfo.json +++ b/licenseInfo.json @@ -14,7 +14,6 @@ "(MIT OR GPL-2.0)": ["editor/jquery-ui/jquery-ui-1.8.17.custom.min.js", "editor/jquerybbq/jquery.bbq.min.js", "editor/js-hotkeys/jquery.hotkeys.min.js"], "(MIT OR GPL-2.0-or-later)": ["editor/contextmenu/jQuery.contextMenu.js", "editor/extensions/ext-server_moinsave.js"], "Apache-2.0": ["editor/contextmenu.js", "editor/extensions/ext-foreignobject.js", "editor/extensions/ext-grid.js", "editor/extensions/ext-markers.js", "screencasts/svgopen2010/index.html", "editor/jgraduate/jQuery.jGraduate.js", "editor/extensions/mathjax/MathJax.min.js", "editor/extensions/mathjax/TeX-AMS-MML_SVG.js"], - "CC-BY-SA-2.0": ["editor/images/polygon.svg"], "ISC": ["editor/external/query-result/esm/index.js"], "LGPL-3.0-or-later": ["editor/jspdf/jspdf.plugin.svgToPdf.js"], "X11": ["editor/jspdf/jspdf.min.js"] diff --git a/package.json b/package.json index 6162c1d9..05cd3680 100644 --- a/package.json +++ b/package.json @@ -114,7 +114,7 @@ "Brett Zamir", "Fabien Jacq" ], - "license": "(MIT AND Apache-2.0 AND CC-BY-SA-2.0 AND ISC AND LGPL-3.0-or-later AND X11)", + "license": "(MIT AND Apache-2.0 AND ISC AND LGPL-3.0-or-later AND X11)", "bugs": { "url": "https://github.com/SVG-Edit/svgedit/issues" },