summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2015-12-04 15:38:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-16 12:12:16 +0000
commit2bea0066b00a4b53d92ca85b540a44c24feb233f (patch)
treef7e8f1a0449b07fc7b0dc64cad1289b8e41a07e8 /meta
parent2d04c838e1ad57a0c789fcc7ddceb0bd7e96fd95 (diff)
downloadpoky-2bea0066b00a4b53d92ca85b540a44c24feb233f.tar.gz
puzzles: update to current commit
gtk+3 support has been added upstream, so add an option for that. (From OE-Core rev: 0dc44aeb49a8a254ca3345870b62282b04d4b61f) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch9
-rw-r--r--meta/recipes-sato/puzzles/puzzles_git.bb8
2 files changed, 6 insertions, 11 deletions
diff --git a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch b/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
index d246feeb09..c134acde2f 100644
--- a/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
+++ b/meta/recipes-sato/puzzles/files/fix-compiling-failure-with-option-g-O.patch
@@ -29,15 +29,6 @@ diff --git a/gtk.c b/gtk.c
29index a2eba2c..c54bf63 100644 29index a2eba2c..c54bf63 100644
30--- a/gtk.c 30--- a/gtk.c
31+++ b/gtk.c 31+++ b/gtk.c
32@@ -381,7 +381,7 @@ static void clear_backing_store(frontend *fe)
33
34 static void setup_backing_store(frontend *fe)
35 {
36- cairo_t *cr;
37+ cairo_t *cr = NULL;
38 int i;
39
40 fe->pixmap = gdk_pixmap_new(fe->area->window, fe->pw, fe->ph, -1);
41@@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp) 32@@ -2481,7 +2481,7 @@ char *fgetline(FILE *fp)
42 int main(int argc, char **argv) 33 int main(int argc, char **argv)
43 { 34 {
diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index 56fae88d19..1e3bac7458 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -1,7 +1,7 @@
1SUMMARY = "Simon Tatham's Portable Puzzle Collection" 1SUMMARY = "Simon Tatham's Portable Puzzle Collection"
2HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/" 2HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
3 3
4DEPENDS = "gtk+ libxt" 4DEPENDS = "libxt"
5 5
6# The libxt requires x11 in DISTRO_FEATURES 6# The libxt requires x11 in DISTRO_FEATURES
7REQUIRED_DISTRO_FEATURES = "x11" 7REQUIRED_DISTRO_FEATURES = "x11"
@@ -13,7 +13,7 @@ SRC_URI = "git://git.tartarus.org/simon/puzzles.git \
13 file://fix-compiling-failure-with-option-g-O.patch \ 13 file://fix-compiling-failure-with-option-g-O.patch \
14 file://0001-Use-labs-instead-of-abs.patch \ 14 file://0001-Use-labs-instead-of-abs.patch \
15" 15"
16SRCREV = "c296301a06ce49b87c954c9d15452521dfeddf1a" 16SRCREV = "346584bf6e38232be8773c24fd7dedcbd7b3d9ed"
17PE = "1" 17PE = "1"
18PV = "0.0+git${SRCPV}" 18PV = "0.0+git${SRCPV}"
19 19
@@ -21,6 +21,10 @@ S = "${WORKDIR}/git"
21 21
22inherit autotools-brokensep distro_features_check 22inherit autotools-brokensep distro_features_check
23 23
24PACKAGECONFIG ??= "gtk2"
25PACKAGECONFIG[gtk2] = "--with-gtk=2,,gtk+,"
26PACKAGECONFIG[gtk3] = "--with-gtk=3,,gtk+3,"
27
24do_configure_prepend () { 28do_configure_prepend () {
25 ./mkfiles.pl 29 ./mkfiles.pl
26} 30}