summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2015-06-02 11:33:31 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-08 17:34:05 +0100
commit9634494087e56bc2dabb6ce929e8404f500f4c35 (patch)
tree5f3f5ab14619e9d7572c51f2c54412ed761701ea /meta/recipes-graphics/xorg-lib
parent1a6bcd7037e5288823a42eb83bfa07104b91ae13 (diff)
downloadpoky-9634494087e56bc2dabb6ce929e8404f500f4c35.tar.gz
xkeyboard-config: Upgrade 2.14 -> 2.15
Drop what remains of the patch the removed some GPLv3 content: both eu and ph layout licenses have been corrected. (From OE-Core rev: fdc7f529be77be49b6c43cd24a4600ed97a35ed5) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch51
-rw-r--r--meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb (renamed from meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb)8
2 files changed, 3 insertions, 56 deletions
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch b/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
deleted file mode 100644
index 596dc7bda1..0000000000
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1Remove GPLv3 content so the package remains MIT licensed.
2
3symbols/eu has been relicensed upstream.
4Remove symbols/ph until that is relicensed upstream.
5
6Upstream-Status; Backport
7Signed-off-by: Ross Burton <ross.burton@intel.com>
8
9From b3a21c1137c011d9220775fd8b2e704ff75c088c Mon Sep 17 00:00:00 2001
10From: Sergey Udaltsov <sergey.udaltsov@gmail.com>
11Date: Tue, 26 May 2015 20:57:46 +0100
12Subject: Removed GPLv3 line
13
14https://bugs.freedesktop.org/show_bug.cgi?id=31073
15
16diff --git a/symbols/ph b/symbols/ph
17index 6b3defa..a5fe5dc 100644
18--- a/symbols/ph
19+++ b/symbols/ph
20@@ -2,8 +2,6 @@
21 // Philippines National Keyboard Layout v1.0.0 (2010-10-23) //
22 // http://laibcoms.com/sandbox/the-philippines-national-keyboard-layout //
23 // //
24-// License: GNU/GPLv3 //
25-// //
26 // Loosely based on ISO/IEC 9995-3:2009 //
27 // * glyphs that are not used in Philippine Languages and //
28 // Philippine English were not included //
29--
30cgit v0.10.2
31
32From 5da6d510b460cad1b31288618cc364e586576826 Mon Sep 17 00:00:00 2001
33From: Sergey Udaltsov <sergey.udaltsov@gmail.com>
34Date: Sat, 9 May 2015 00:35:25 +0100
35Subject: fixed the license (removed GPL)
36
37https://bugs.freedesktop.org/show_bug.cgi?id=31658
38
39diff --git a/symbols/eu b/symbols/eu
40index 0a4d31a..5b767f1 100644
41--- a/symbols/eu
42+++ b/symbols/eu
43@@ -1,6 +1,5 @@
44 // Based on <http://eurkey.steffen.bruentjen.eu/>
45 // Copyright: Copyright 2012 Steffen Bruentjen (eurkey (at) steffen dot bruentjen dot de)
46-// License: GPLv3 <http://www.gnu.org/licenses/gpl-3.0.html>
47 // modified by Christoph Roeper <spam (at) roeper dot biz> (use firstName to mail)
48
49 default partial alphanumeric_keys modifier_keys
50--
51cgit v0.10.2
diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
index a9607449f0..f41699039a 100644
--- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb
+++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb
@@ -12,11 +12,9 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-confi
12LICENSE = "MIT & MIT-style" 12LICENSE = "MIT & MIT-style"
13LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" 13LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9"
14 14
15SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2 \ 15SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2"
16 file://0001-Remove-GPLv3-content.patch \ 16SRC_URI[md5sum] = "4af1deeb7c5f4cad62e65957d98d6758"
17 " 17SRC_URI[sha256sum] = "0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf"
18SRC_URI[md5sum] = "2869c03d85b606f929aab054ef6e1b60"
19SRC_URI[sha256sum] = "dc91458a214c56a35727f9e523fc647615de64137057ca6ee4d4d4474a4bb2ae"
20 18
21SECTION = "x11/libs" 19SECTION = "x11/libs"
22DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" 20DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native"