From 5a13336eb8ad6c91d0fb11708e0b8ca2451bd5db Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Tue, 28 Apr 2015 07:57:50 -0700 Subject: clutter: update to 1.22.0 ANNOUNCE: https://mail.gnome.org/archives/clutter-list/2015-March/msg00010.html * Update run-installed-tests-with-tap-output.patch Signed-off-by: Tim Orling --- .../run-installed-tests-with-tap-output.patch | 16 ++++++++-------- meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb | 10 ---------- meta/recipes-graphics/clutter/clutter-1.0_1.22.0.bb | 10 ++++++++++ 3 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.22.0.bb (limited to 'meta') diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch index 80acab867c..eb2e0c29a1 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch +++ b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch @@ -4,17 +4,17 @@ Upstream-status: Pending Signed-off-by: Tim Orling -Index: clutter-1.20.0/build/autotools/glib-tap.mk +Index: clutter-1.22.0/build/autotools/glib-tap.mk =================================================================== ---- clutter-1.20.0.orig/build/autotools/glib-tap.mk -+++ clutter-1.20.0/build/autotools/glib-tap.mk -@@ -128,7 +128,8 @@ installed_test_meta_DATA = $(installed_t +--- clutter-1.22.0.orig/build/autotools/glib-tap.mk ++++ clutter-1.22.0/build/autotools/glib-tap.mk +@@ -127,7 +127,8 @@ installed_test_meta_DATA = $(installed_t + %.test: %$(EXEEXT) Makefile $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ echo 'Type=session' >> $@.tmp; \ - echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> $@.tmp; \ -- echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \ -+ echo 'Exec=$(installed_testdir)/$< --tap' >> $@.tmp; \ -+ echo 'Output=TAP' >> $@.tmp; \ +- echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$<' >> $@.tmp; \ ++ echo 'Exec=env G_ENABLE_DIAGNOSTIC=0 CLUTTER_ENABLE_DIAGNOSTIC=0 $(installed_testdir)/$< --tap' >> $@.tmp; \ ++ echo 'Output=TAP' >> $0.tmp; \ mv $@.tmp $@) CLEANFILES += $(installed_test_meta_DATA) diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb deleted file mode 100644 index 5f39a3a8ac..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb +++ /dev/null @@ -1,10 +0,0 @@ -require clutter-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b" -SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293" - -SRC_URI += "file://install-examples.patch \ - file://run-installed-tests-with-tap-output.patch \ - file://run-ptest" diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.22.0.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.22.0.bb new file mode 100644 index 0000000000..1a7bada5aa --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.22.0.bb @@ -0,0 +1,10 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "788c488d795103e4c201fae1b032cb89" +SRC_URI[archive.sha256sum] = "5225fef91f717118654a5b98e24f2018d09ca3c37d61ecff84f77069de0fbf54" + +SRC_URI += "file://install-examples.patch \ + file://run-installed-tests-with-tap-output.patch \ + file://run-ptest" -- cgit 1.2.3-korg