diff options
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch | 16 | ||||
-rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.0_1.22.0.bb (renamed from meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb) | 4 |
2 files changed, 10 insertions, 10 deletions
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 <TicoTimo@gmail.com> -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.22.0.bb index 5f39a3a8ac..1a7bada5aa 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.22.0.bb @@ -2,8 +2,8 @@ require clutter-1.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b" -SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293" +SRC_URI[archive.md5sum] = "788c488d795103e4c201fae1b032cb89" +SRC_URI[archive.sha256sum] = "5225fef91f717118654a5b98e24f2018d09ca3c37d61ecff84f77069de0fbf54" SRC_URI += "file://install-examples.patch \ file://run-installed-tests-with-tap-output.patch \ |