summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch23
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch37
-rw-r--r--meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb55
3 files changed, 0 insertions, 115 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
deleted file mode 100644
index f0b878d376..0000000000
--- a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/glib-2.32.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 8d49a386f467cbf8e0842d2218126f643e50f834 Mon Sep 17 00:00:00 2001
2From: Dominique Leuenberger <dimstar@opensuse.org>
3Date: Sun, 27 Nov 2011 14:24:57 +0000
4Subject: Fix build with glib 2.31: Only glib.h can be #include'd. Fixes bug #664914
5
6Upstream-Status: Backport
7
8---
9diff --git a/engines/clearlooks/src/animation.c b/engines/clearlooks/src/animation.c
10index 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--
23cgit 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
deleted file mode 100644
index 5c557ba689..0000000000
--- a/meta/recipes-gnome/gtk-engines/gtk-engines-2.20.2/substitute-tests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -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([
17diff -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
diff --git a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb b/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
deleted file mode 100644
index c0ac911a64..0000000000
--- a/meta/recipes-gnome/gtk-engines/gtk-engines_2.20.2.bb
+++ /dev/null
@@ -1,55 +0,0 @@
1SUMMARY = "GTK+ theme engines"
2HOMEPAGE = "http://www.gnome.org/"
3BUGTRACKER = "https://bugzilla.gnome.org/"
4
5LICENSE = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
7
8SECTION = "x11/base"
9DEPENDS = "intltool-native gtk+ gettext-native"
10
11PR = "r3"
12
13PACKAGES += "${PN}-schemas"
14PACKAGES_DYNAMIC += "^gtk-engine-.* ^gtk-theme-.*"
15
16RDEPENDS_gtk-theme-redmond = "gtk-engine-redmond95"
17RDEPENDS_gtk-theme-metal = "gtk-engine-metal"
18RDEPENDS_gtk-theme-mist = "gtk-engine-mist"
19RDEPENDS_gtk-theme-crux = "gtk-engine-crux-engine"
20RDEPENDS_gtk-theme-lighthouseblue = "gtk-engine-lighthouseblue"
21RDEPENDS_gtk-theme-thinice = "gtk-engine-thinice"
22RDEPENDS_gtk-theme-industrial = "gtk-engine-industrial"
23RDEPENDS_gtk-theme-clearlooks = "gtk-engine-clearlooks"
24
25FILES_${PN} = ""
26FILES_${PN}-dev += "${libdir}/gtk-2.0/*/engines/*.la"
27FILES_${PN}-schemas = "${datadir}/gtk-engines/*.xml"
28
29CFLAGS_prepend = "-DHAVE_ANIMATION "
30
31RDEPENDS_${PN}-dev = ""
32
33inherit gnomebase
34GNOME_COMPRESS_TYPE="bz2"
35
36inherit distro_features_check
37ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
38
39# This picks stable releases in the 2.x series (but not 2.90 onwards,
40# which were GNOME 3 betas).
41UPSTREAM_CHECK_REGEX = "(?P<pver>2\.([0-8]*[02468])+(\.\d+)+)"
42
43python populate_packages_prepend() {
44 engines_root = os.path.join(d.getVar('libdir', True), "gtk-2.0/2.10.0/engines")
45 themes_root = os.path.join(d.getVar('datadir', True), "themes")
46
47 do_split_packages(d, engines_root, '^lib(.*)\.so$', 'gtk-engine-%s', 'GTK %s theme engine', extra_depends='')
48 do_split_packages(d, themes_root, '(.*)', 'gtk-theme-%s', 'GTK theme %s', allow_dirs=True, extra_depends='')
49 # TODO: mark theme packages as arch all
50}
51
52SRC_URI += "file://glib-2.32.patch \
53 file://substitute-tests.patch"
54SRC_URI[archive.md5sum] = "5deb287bc6075dc21812130604c7dc4f"
55SRC_URI[archive.sha256sum] = "15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5"