diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-07-15 15:20:05 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:28:50 +0100 |
commit | 096b4c639b6326b0bc14bcb279e04ca4939ad1aa (patch) | |
tree | a0fe3cf2d43a826c21ef525fdff69b5e84181c81 /meta/recipes-graphics | |
parent | 49d3d7da29a201b393196663d44f265f5a64ed8d (diff) | |
download | poky-096b4c639b6326b0bc14bcb279e04ca4939ad1aa.tar.gz |
libxsettings-client: Remove as unneeded
xsettings-client is not meant to be a shared library and the only
user in oe-core (libmatchbox) now has an in-tree copy.
(From OE-Core rev: ed5cbf977dca8f3d85c8d933071c6e49fb4bd95f)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
4 files changed, 0 insertions, 92 deletions
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license b/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license deleted file mode 100644 index 628de9830d..0000000000 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright © 2001 Red Hat, Inc. | ||
3 | * | ||
4 | * Permission to use, copy, modify, distribute, and sell this software and its | ||
5 | * documentation for any purpose is hereby granted without fee, provided that | ||
6 | * the above copyright notice appear in all copies and that both that | ||
7 | * copyright notice and this permission notice appear in supporting | ||
8 | * documentation, and that the name of Red Hat not be used in advertising or | ||
9 | * publicity pertaining to distribution of the software without specific, | ||
10 | * written prior permission. Red Hat makes no representations about the | ||
11 | * suitability of this software for any purpose. It is provided "as is" | ||
12 | * without express or implied warranty. | ||
13 | * | ||
14 | * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL | ||
15 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT | ||
16 | * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
17 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION | ||
18 | * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN | ||
19 | * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
20 | * | ||
21 | * Author: Owen Taylor, Red Hat, Inc. | ||
22 | */ | ||
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch deleted file mode 100644 index d08d0d5b99..0000000000 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | Index: Xsettings-client-0.10/Makefile.am | ||
4 | =================================================================== | ||
5 | --- Xsettings-client-0.10.orig/Makefile.am 2008-02-07 14:49:54.000000000 +0000 | ||
6 | +++ Xsettings-client-0.10/Makefile.am 2008-02-07 14:50:00.000000000 +0000 | ||
7 | @@ -9,4 +9,4 @@ | ||
8 | |||
9 | libXsettings_client_la_SOURCES= $(source_c) $(source_h) | ||
10 | |||
11 | -libXsettings_client_la_LIBADD = @X_LIBS@ | ||
12 | \ No newline at end of file | ||
13 | +libXsettings_client_la_LIBADD = @X_LIBS@ -lX11 | ||
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch b/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch deleted file mode 100644 index 905d08e616..0000000000 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd Xsettings-client-0.10/configure.ac Xsettings-client-0.10/configure.ac | ||
5 | --- Xsettings-client-0.10/configure.ac 2003-03-28 12:39:51.000000000 +0200 | ||
6 | +++ Xsettings-client-0.10/configure.ac 2013-01-11 07:37:21.491597743 +0200 | ||
7 | @@ -1,7 +1,7 @@ | ||
8 | # Process this file with autoconf to produce a configure script. | ||
9 | AC_INIT(xsettings-client.c) | ||
10 | AM_INIT_AUTOMAKE(Xsettings-client, 0.10) | ||
11 | -AM_CONFIG_HEADER(config.h) | ||
12 | +AC_CONFIG_HEADERS(config.h) | ||
13 | |||
14 | CFLAGS="-Os -Wall" | ||
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb deleted file mode 100644 index 9e9336e5db..0000000000 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | SUMMARY = "utility functions for the Xsettings protocol" | ||
2 | DESCRIPTION = "Libraries used for applications making use of the Xsettings configuration \ | ||
3 | setting propagation protocol. Controls setting of double click timeout, drag-and-drop \ | ||
4 | threshold, and default foreground and background colors for all applications running within a \ | ||
5 | desktop." | ||
6 | HOMEPAGE = "http://matchbox-project.org/sources/optional-dependencies/" | ||
7 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
8 | SECTION = "x/libs" | ||
9 | LICENSE = "MIT-style" | ||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | ||
11 | file://xsettings-client.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | ||
12 | file://xsettings-client.c;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | ||
13 | file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | ||
14 | file://xsettings-common.c;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" | ||
15 | DEPENDS = "virtual/libx11" | ||
16 | |||
17 | PR = "r5" | ||
18 | |||
19 | headers = "xsettings-common.h xsettings-client.h" | ||
20 | |||
21 | SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-0.10.tar.gz \ | ||
22 | file://MIT-style-license \ | ||
23 | file://link-x11.patch;apply=yes \ | ||
24 | file://obsolete_automake_macros.patch \ | ||
25 | " | ||
26 | |||
27 | SRC_URI[md5sum] = "c14aa9db6c097e0306dac97fb7da1add" | ||
28 | SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43" | ||
29 | |||
30 | S = "${WORKDIR}/Xsettings-client-0.10" | ||
31 | |||
32 | inherit autotools gettext distro_features_check | ||
33 | # depends on virtual/libx11 | ||
34 | REQUIRED_DISTRO_FEATURES = "x11" | ||
35 | |||
36 | do_patch[postfuncs] += "update_copying_file" | ||
37 | update_copying_file() { | ||
38 | # This package ships with a GPLv2 COPYING file, but the author says | ||
39 | # it is actual MIT-style license, add the correct license here to | ||
40 | # avoid confusion. | ||
41 | cp -f ${WORKDIR}/MIT-style-license ${S}/COPYING | ||
42 | } | ||
43 | |||