diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2 | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2')
-rw-r--r-- | meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch | 23 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch | 37 |
2 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch new file mode 100644 index 0000000000..f0b878d376 --- /dev/null +++ b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001 | ||
2 | From: Dominique Leuenberger <dimstar@opensuse.org> | ||
3 | Date: Sun, 27 Nov 2011 14:24:57 +0000 | ||
4 | Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | --- | ||
9 | diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c | ||
10 | index 1f7a41f..56a9286 100644 | ||
11 | --- a/engines/clearlooks/src/animation.c | ||
12 | +++ b/engines/clearlooks/src/animation.c | ||
13 | @@ -28,7 +28,7 @@ | ||
14 | #include "animation.h" | ||
15 | |||
16 | #ifdef HAVE_WORKING_ANIMATION | ||
17 | -#include <glib/gtimer.h> | ||
18 | +#include <glib.h> | ||
19 | |||
20 | struct _AnimationInfo { | ||
21 | GTimer *timer; | ||
22 | -- | ||
23 | cgit v0.9.0.2 | ||
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch new file mode 100644 index 0000000000..5c557ba689 --- /dev/null +++ b/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | ||
4 | diff -Nurd gtk-engines-2.20.2/configure.ac gtk-engines-2.20.2/configure.ac | ||
5 | --- gtk-engines-2.20.2/configure.ac 2010-10-01 15:42:37.000000000 +0300 | ||
6 | +++ gtk-engines-2.20.2/configure.ac 2013-08-20 02:50:27.930510565 +0300 | ||
7 | @@ -166,6 +166,9 @@ | ||
8 | |||
9 | AC_SUBST(DEVELOPMENT_CFLAGS) | ||
10 | |||
11 | +AC_SUBST([exported_symbols_tests], [[$(EXPORTED_SYMBOLS_TESTS)]]) | ||
12 | +AC_SUBST([torture_test_tests], [[$(TORTURE_TEST_TESTS)]]) | ||
13 | + | ||
14 | AM_CONFIG_HEADER([engines/support/config.h]) | ||
15 | |||
16 | AC_CONFIG_FILES([ | ||
17 | diff -Nurd gtk-engines-2.20.2/test/Makefile.am gtk-engines-2.20.2/test/Makefile.am | ||
18 | --- gtk-engines-2.20.2/test/Makefile.am 2010-09-19 18:18:21.000000000 +0300 | ||
19 | +++ gtk-engines-2.20.2/test/Makefile.am 2013-08-20 02:50:36.842510865 +0300 | ||
20 | @@ -66,7 +66,7 @@ | ||
21 | # Prefix with exported_ | ||
22 | EXPORTED_SYMBOLS_TESTS = $(patsubst %,exported_%,$(BUILD_ENGINES)) | ||
23 | |||
24 | -TESTS += $(EXPORTED_SYMBOLS_TESTS) | ||
25 | +TESTS += @exported_symbols_tests@ | ||
26 | |||
27 | |||
28 | ############################################################# | ||
29 | @@ -88,7 +88,7 @@ | ||
30 | TORTURE_TEST_TESTS = torture_buildin $(patsubst %,torture_%,$(TORTURE_TEST_ENGINES)) | ||
31 | |||
32 | # Add TORTURE_TEST_ENGINES to list of tests | ||
33 | -TESTS += $(TORTURE_TEST_TESTS) | ||
34 | +TESTS += @torture_test_tests@ | ||
35 | |||
36 | # Possible other tests: | ||
37 | # - An extensive theme switch tests that loads/unloads the engine | ||