summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/lib/oeqa/selftest/recipetool.py4
-rw-r--r--meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license22
-rw-r--r--meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch13
-rw-r--r--meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch14
-rw-r--r--meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb43
6 files changed, 2 insertions, 95 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index 7574032c1e..8adafaec64 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -214,7 +214,6 @@ DISTRO_PN_ALIAS_pn-libxft = "Mandriva=libxft Debian=libxft2 Ubuntu=libxft2"
214DISTRO_PN_ALIAS_pn-libxi = "Ubuntu=libxi Fedora=libXi" 214DISTRO_PN_ALIAS_pn-libxi = "Ubuntu=libxi Fedora=libXi"
215DISTRO_PN_ALIAS_pn-libxkbcommon = "Fedora=libxkbcommon Debian=libxkbcommon" 215DISTRO_PN_ALIAS_pn-libxkbcommon = "Fedora=libxkbcommon Debian=libxkbcommon"
216DISTRO_PN_ALIAS_pn-libxscrnsaver = "Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva=libxscrnsaver" 216DISTRO_PN_ALIAS_pn-libxscrnsaver = "Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva=libxscrnsaver"
217DISTRO_PN_ALIAS_pn-libxsettings-client = "Debian=libxsettings-client0 Ubuntu=libxsettings-client0 Mandriva=libXsettings-client0"
218DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc" 217DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc"
219DISTRO_PN_ALIAS_pn-linux-dummy = "Intel" 218DISTRO_PN_ALIAS_pn-linux-dummy = "Intel"
220DISTRO_PN_ALIAS_pn-linux-firmware = "Fedora=linux-firmware Ubuntu=linux-firmware" 219DISTRO_PN_ALIAS_pn-linux-firmware = "Fedora=linux-firmware Ubuntu=linux-firmware"
diff --git a/meta/lib/oeqa/selftest/recipetool.py b/meta/lib/oeqa/selftest/recipetool.py
index 9436301937..2e38758aec 100644
--- a/meta/lib/oeqa/selftest/recipetool.py
+++ b/meta/lib/oeqa/selftest/recipetool.py
@@ -383,7 +383,7 @@ class RecipetoolTests(RecipetoolBase):
383 @testcase(1194) 383 @testcase(1194)
384 def test_recipetool_create_git(self): 384 def test_recipetool_create_git(self):
385 # Ensure we have the right data in shlibs/pkgdata 385 # Ensure we have the right data in shlibs/pkgdata
386 bitbake('libpng pango libx11 libxext jpeg libxsettings-client libcheck') 386 bitbake('libpng pango libx11 libxext jpeg libcheck')
387 # Try adding a recipe 387 # Try adding a recipe
388 tempsrc = os.path.join(self.tempdir, 'srctree') 388 tempsrc = os.path.join(self.tempdir, 'srctree')
389 os.makedirs(tempsrc) 389 os.makedirs(tempsrc)
@@ -397,7 +397,7 @@ class RecipetoolTests(RecipetoolBase):
397 checkvars['S'] = '${WORKDIR}/git' 397 checkvars['S'] = '${WORKDIR}/git'
398 checkvars['PV'] = '1.11+git${SRCPV}' 398 checkvars['PV'] = '1.11+git${SRCPV}'
399 checkvars['SRC_URI'] = srcuri 399 checkvars['SRC_URI'] = srcuri
400 checkvars['DEPENDS'] = set(['libcheck', 'libjpeg-turbo', 'libpng', 'libx11', 'libxsettings-client', 'libxext', 'pango']) 400 checkvars['DEPENDS'] = set(['libcheck', 'libjpeg-turbo', 'libpng', 'libx11', 'libxext', 'pango'])
401 inherits = ['autotools', 'pkgconfig'] 401 inherits = ['autotools', 'pkgconfig']
402 self._test_recipe_contents(recipefile, checkvars, inherits) 402 self._test_recipe_contents(recipefile, checkvars, inherits)
403 403
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 @@
1Upstream-Status: Inappropriate [configuration]
2
3Index: 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 @@
1Upstream-Status: Pending
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -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 @@
1SUMMARY = "utility functions for the Xsettings protocol"
2DESCRIPTION = "Libraries used for applications making use of the Xsettings configuration \
3setting propagation protocol. Controls setting of double click timeout, drag-and-drop \
4threshold, and default foreground and background colors for all applications running within a \
5desktop."
6HOMEPAGE = "http://matchbox-project.org/sources/optional-dependencies/"
7BUGTRACKER = "http://bugzilla.yoctoproject.org/"
8SECTION = "x/libs"
9LICENSE = "MIT-style"
10LIC_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"
15DEPENDS = "virtual/libx11"
16
17PR = "r5"
18
19headers = "xsettings-common.h xsettings-client.h"
20
21SRC_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
27SRC_URI[md5sum] = "c14aa9db6c097e0306dac97fb7da1add"
28SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43"
29
30S = "${WORKDIR}/Xsettings-client-0.10"
31
32inherit autotools gettext distro_features_check
33# depends on virtual/libx11
34REQUIRED_DISTRO_FEATURES = "x11"
35
36do_patch[postfuncs] += "update_copying_file"
37update_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