Patchwork [1/2] gnome-desktop-testing: upgrade to 2014.1

login
register
mail settings
Submitter Ross Burton
Date Feb. 7, 2014, 11:06 a.m.
Message ID <1391771210-18624-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/66487/
State Accepted
Commit 3ec94b6013dd0cafe608a1d4ec5958111588fef6
Headers show

Comments

Ross Burton - Feb. 7, 2014, 11:06 a.m.
no-introspection.patch has been merged upstream.

Update license checksum as copyright dates have been updated.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../files/no-introspection.patch                    |   19 -------------------
 ...ng_2013.1.bb => gnome-desktop-testing_2014.1.bb} |    9 ++++-----
 2 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
 rename meta/recipes-support/gnome-desktop-testing/{gnome-desktop-testing_2013.1.bb => gnome-desktop-testing_2014.1.bb} (60%)

Patch

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 67b64f2..0000000
--- a/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-Introspection is a hard requirement to build gnome-desktop-testing upstream, but
-it isn't needed anymore.
-
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-diff --git a/configure.ac b/configure.ac
-index 7460c69..6249caf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,8 +27,6 @@ AC_SUBST(WARN_CFLAGS)
- LT_PREREQ([2.2.4])
- LT_INIT([disable-static])
- 
--GOBJECT_INTROSPECTION_REQUIRE([1.34.0])
--
- PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0 >= 2.34.0])
- GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36"
- 
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
similarity index 60%
rename from meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb
rename to meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2014.1.bb
index 36e13b1..30ca808 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"
 HOMEPAGE = "https://wiki.gnome.org/GnomeGoals/InstalledTests"
 LICENSE = "LGPLv2+"
 
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz \
-           file://no-introspection.patch"
-SRC_URI[md5sum] = "c6824f7bfac95bf0fcf6ed0c255979c1"
-SRC_URI[sha256sum] = "632e7224de8614a8e4b7cdf87fc32551531efa9290fba0da4dae56234c584b7b"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "a608ad72a77e23a1aecdfd8d07a94baf"
+SRC_URI[sha256sum] = "1a3eed73678dd22d09d6a7ec4f899557df3e8b4a802affa76d0f163b31286539"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
-                    file://src/gnome-desktop-testing-runner.c;endline=19;md5=ab86a2e00ab9cbb94f008d785004b181"
+                    file://src/gnome-desktop-testing-runner.c;endline=19;md5=67311a600b83fd0068dfc7e5b84ffb3f"
 
 DEPENDS = "glib-2.0"