summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-02-07 11:06:49 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-09 09:40:01 +0000
commit3ec94b6013dd0cafe608a1d4ec5958111588fef6 (patch)
tree02f3d80af7133b958e1a7c8247ac935cb15f1974 /meta
parentdf634f3b1e02aa18f84b4b74f13c7260a21691aa (diff)
downloadpoky-3ec94b6013dd0cafe608a1d4ec5958111588fef6.tar.gz
gnome-desktop-testing: upgrade to 2014.1
no-introspection.patch has been merged upstream. Update license checksum as copyright dates have been updated. (From OE-Core rev: c8272e900ed87761d95ba0065a954dc2bb9f760c) 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-support/gnome-desktop-testing/files/no-introspection.patch19
-rw-r--r--meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb (renamed from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb)9
2 files changed, 4 insertions, 24 deletions
diff --git a/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch b/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
deleted file mode 100644
index 67b64f28b8..0000000000
--- a/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Introspection is a hard requirement to build gnome-desktop-testing upstream, but
2it isn't needed anymore.
3
4Upstream-Status: Submitted
5Signed-off-by: Ross Burton <ross.burton@intel.com>
6
7diff --git a/configure.ac b/configure.ac
8index 7460c69..6249caf 100644
9--- a/configure.ac
10+++ b/configure.ac
11@@ -27,8 +27,6 @@ AC_SUBST(WARN_CFLAGS)
12 LT_PREREQ([2.2.4])
13 LT_INIT([disable-static])
14
15-GOBJECT_INTROSPECTION_REQUIRE([1.34.0])
16-
17 PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0 >= 2.34.0])
18 GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
19
diff --git a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
index 36e13b1e65..30ca808134 100644
--- a/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb
+++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
@@ -2,13 +2,12 @@ SUMMARY = "Test runner for GNOME-style installed tests"
2HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests" 2HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests"
3LICENSE = "LGPLv2+" 3LICENSE = "LGPLv2+"
4 4
5SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ 5SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz"
6 file://no-introspection.patch" 6SRC_URI[md5sum] = "a608ad72a77e23a1aecdfd8d07a94baf"
7SRC_URI[md5sum] = "c6824f7bfac95bf0fcf6ed0c255979c1" 7SRC_URI[sha256sum] = "1a3eed73678dd22d09d6a7ec4f899557df3e8b4a802affa76d0f163b31286539"
8SRC_URI[sha256sum] = "632e7224de8614a8e4b7cdf87fc32551531efa9290fba0da4dae56234c584b7b"
9 8
10LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
11 file://src/gnome-desktop-testing-runner.c;endline=19;md5=ab86a2e00ab9cbb94f008d785004b181" 10 file://src/gnome-desktop-testing-runner.c;endline=19;md5=67311a600b83fd0068dfc7e5b84ffb3f"
12 11
13DEPENDS = "glib-2.0" 12DEPENDS = "glib-2.0"
14 13