From fdc7f529be77be49b6c43cd24a4600ed97a35ed5 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 2 Jun 2015 11:33:31 +0300 Subject: 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. Signed-off-by: Jussi Kukkonen --- .../0001-Remove-GPLv3-content.patch | 51 ---------------------- .../xorg-lib/xkeyboard-config_2.14.bb | 33 -------------- .../xorg-lib/xkeyboard-config_2.15.bb | 31 +++++++++++++ 3 files changed, 31 insertions(+), 84 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config/0001-Remove-GPLv3-content.patch delete mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb create mode 100644 meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb 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 @@ -Remove GPLv3 content so the package remains MIT licensed. - -symbols/eu has been relicensed upstream. -Remove symbols/ph until that is relicensed upstream. - -Upstream-Status; Backport -Signed-off-by: Ross Burton - -From b3a21c1137c011d9220775fd8b2e704ff75c088c Mon Sep 17 00:00:00 2001 -From: Sergey Udaltsov -Date: Tue, 26 May 2015 20:57:46 +0100 -Subject: Removed GPLv3 line - -https://bugs.freedesktop.org/show_bug.cgi?id=31073 - -diff --git a/symbols/ph b/symbols/ph -index 6b3defa..a5fe5dc 100644 ---- a/symbols/ph -+++ b/symbols/ph -@@ -2,8 +2,6 @@ - // Philippines National Keyboard Layout v1.0.0 (2010-10-23) // - // http://laibcoms.com/sandbox/the-philippines-national-keyboard-layout // - // // --// License: GNU/GPLv3 // --// // - // Loosely based on ISO/IEC 9995-3:2009 // - // * glyphs that are not used in Philippine Languages and // - // Philippine English were not included // --- -cgit v0.10.2 - -From 5da6d510b460cad1b31288618cc364e586576826 Mon Sep 17 00:00:00 2001 -From: Sergey Udaltsov -Date: Sat, 9 May 2015 00:35:25 +0100 -Subject: fixed the license (removed GPL) - -https://bugs.freedesktop.org/show_bug.cgi?id=31658 - -diff --git a/symbols/eu b/symbols/eu -index 0a4d31a..5b767f1 100644 ---- a/symbols/eu -+++ b/symbols/eu -@@ -1,6 +1,5 @@ - // Based on - // Copyright: Copyright 2012 Steffen Bruentjen (eurkey (at) steffen dot bruentjen dot de) --// License: GPLv3 - // modified by Christoph Roeper (use firstName to mail) - - default partial alphanumeric_keys modifier_keys --- -cgit 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.14.bb deleted file mode 100644 index a9607449f0..0000000000 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.14.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Keyboard configuration database for X Window" - -DESCRIPTION = "The non-arch keyboard configuration database for X \ -Window. The goal is to provide the consistent, well-structured, \ -frequently released open source of X keyboard configuration data for X \ -Window System implementations. The project is targeted to XKB-based \ -systems." - -HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig" -BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config" - -LICENSE = "MIT & MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" - -SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2 \ - file://0001-Remove-GPLv3-content.patch \ - " -SRC_URI[md5sum] = "2869c03d85b606f929aab054ef6e1b60" -SRC_URI[sha256sum] = "dc91458a214c56a35727f9e523fc647615de64137057ca6ee4d4d4474a4bb2ae" - -SECTION = "x11/libs" -DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" - -EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" - -FILES_${PN} += "${datadir}/X11/xkb" - -inherit autotools pkgconfig gettext - -do_install_append () { - install -d ${D}${datadir}/X11/xkb/compiled - cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg -} diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb new file mode 100644 index 0000000000..f41699039a --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb @@ -0,0 +1,31 @@ +SUMMARY = "Keyboard configuration database for X Window" + +DESCRIPTION = "The non-arch keyboard configuration database for X \ +Window. The goal is to provide the consistent, well-structured, \ +frequently released open source of X keyboard configuration data for X \ +Window System implementations. The project is targeted to XKB-based \ +systems." + +HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig" +BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=xkeyboard-config" + +LICENSE = "MIT & MIT-style" +LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" + +SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "4af1deeb7c5f4cad62e65957d98d6758" +SRC_URI[sha256sum] = "0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf" + +SECTION = "x11/libs" +DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" + +EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" + +FILES_${PN} += "${datadir}/X11/xkb" + +inherit autotools pkgconfig gettext + +do_install_append () { + install -d ${D}${datadir}/X11/xkb/compiled + cd ${D}${datadir}/X11/xkb/rules && ln -sf base xorg +} -- cgit 1.2.3-korg