summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-04-27 00:05:58 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-15 18:05:23 +0100
commit70f465159ac8ed5604976529d4d25150844c1b43 (patch)
tree76244e165d3813894514b53503a9b6b0df369d13
parente4738fdb8fae3a10c9f879bf2a768352ad68f669 (diff)
downloadpoky-70f465159ac8ed5604976529d4d25150844c1b43.tar.gz
puzzles: Use Gtk+3 by default
Also split the puzzles into two packages (just like the old oh-puzzles). (From OE-Core rev: ceb960d499cc71ba3e1dd144bd22bb0794639ba1) 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>
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb18
1 files changed, 15 insertions, 3 deletions
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 346f43bc9c..a9daacdaf2 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -23,16 +23,28 @@ S = "${WORKDIR}/git"
23 23
24inherit autotools-brokensep distro_features_check pkgconfig 24inherit autotools-brokensep distro_features_check pkgconfig
25 25
26PACKAGECONFIG ??= "gtk2" 26PACKAGECONFIG ??= "gtk3"
27PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+," 27PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+,"
28PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3," 28PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3,"
29 29
30PACKAGES += "${PN}-extra"
31FILES_${PN} = ""
32FILES_${PN}-extra = "${prefix}/bin ${datadir}/applications"
33
34python __anonymous () {
35 var = bb.data.expand("FILES_${PN}", d, 1)
36 data = d.getVar(var, True)
37 for name in ("bridges", "fifteen", "inertia", "map", "samegame", "slant"):
38 data = data + " ${prefix}/bin/%s" % name
39 data = data + " ${datadir}/applications/%s.desktop" % name
40 d.setVar(var, data)
41}
42
43
30do_configure_prepend () { 44do_configure_prepend () {
31 ./mkfiles.pl 45 ./mkfiles.pl
32} 46}
33 47
34FILES_${PN} = "${prefix}/bin/* ${datadir}/applications/*"
35
36do_install () { 48do_install () {
37 rm -rf ${D}/* 49 rm -rf ${D}/*
38 export prefix=${D} 50 export prefix=${D}