diff options
author | Kai Kang <kai.kang@windriver.com> | 2022-03-30 17:39:32 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-03-30 07:51:38 -0700 |
commit | ce604d453c9d119e992bdcd7e0e0a01960b8d2de (patch) | |
tree | 58f9ab7f702d3e8a7d38887685f0df3155cf5cee /meta-oe/licenses | |
parent | 957e8de43ea394b268f2571396a2aa12d609474a (diff) | |
download | meta-openembedded-ce604d453c9d119e992bdcd7e0e0a01960b8d2de.tar.gz |
wxwidgets: 3.1.4 -> 3.1.5
* correct LICENSE name which should be 'WXWindows' according to
https://www.wxwidgets.org/about/licence/
remove the 'wxWidgets' license file and use the one in oe-core
* native wx-conf from wxwidgets is required by python3-wxgtk4, so extend
wxwidgets-native and remove packageconfig opengl for -native.
* add patch to correct library names
* add packageconfig 'curl'
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/licenses')
-rw-r--r-- | meta-oe/licenses/wxWidgets | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/meta-oe/licenses/wxWidgets b/meta-oe/licenses/wxWidgets deleted file mode 100644 index 0f6b9d6a8..000000000 --- a/meta-oe/licenses/wxWidgets +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | wxWindows Library Licence, Version 3.1 | ||
2 | ====================================== | ||
3 | |||
4 | Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al | ||
5 | |||
6 | Everyone is permitted to copy and distribute verbatim copies | ||
7 | of this licence document, but changing it is not allowed. | ||
8 | |||
9 | WXWINDOWS LIBRARY LICENCE | ||
10 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | ||
11 | |||
12 | This library is free software; you can redistribute it and/or modify it | ||
13 | under the terms of the GNU Library General Public Licence as published by | ||
14 | the Free Software Foundation; either version 2 of the Licence, or (at | ||
15 | your option) any later version. | ||
16 | |||
17 | This library is distributed in the hope that it will be useful, but | ||
18 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
19 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library | ||
20 | General Public Licence for more details. | ||
21 | |||
22 | You should have received a copy of the GNU Library General Public Licence | ||
23 | along with this software, usually in a file named COPYING.LIB. If not, | ||
24 | write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
25 | Boston, MA 02110-1301 USA. | ||
26 | |||
27 | EXCEPTION NOTICE | ||
28 | |||
29 | 1. As a special exception, the copyright holders of this library give | ||
30 | permission for additional uses of the text contained in this release of | ||
31 | the library as licenced under the wxWindows Library Licence, applying | ||
32 | either version 3.1 of the Licence, or (at your option) any later version of | ||
33 | the Licence as published by the copyright holders of version | ||
34 | 3.1 of the Licence document. | ||
35 | |||
36 | 2. The exception is that you may use, copy, link, modify and distribute | ||
37 | under your own terms, binary object code versions of works based | ||
38 | on the Library. | ||
39 | |||
40 | 3. If you copy code from files distributed under the terms of the GNU | ||
41 | General Public Licence or the GNU Library General Public Licence into a | ||
42 | copy of this library, as this licence permits, the exception does not | ||
43 | apply to the code that you add in this way. To avoid misleading anyone as | ||
44 | to the status of such modified files, you must delete this exception | ||
45 | notice from such code and/or adjust the licensing conditions notice | ||
46 | accordingly. | ||
47 | |||
48 | 4. If you write modifications of your own for this library, it is your | ||
49 | choice whether to permit this exception to apply to your modifications. | ||
50 | If you do not wish that, you must delete the exception notice from such | ||
51 | code and/or adjust the licensing conditions notice accordingly. | ||
52 | |||
53 | |||
54 | |||