glib-2.0: upgrade to 2.28.0

Drop the ptest patches and instead use --enable-installed-tests, updating
run-ptest to invoke gnome-desktop-testing-runner.

Drop the x32 build patch, upstream has integrated a similar fix.

(From OE-Core rev: 33bb8d5da050519043bb913bae4f5692bbd899ad)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 2 insertions, 105 deletions

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch b/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch
deleted file mode 100644
index 40c5b9fdb1..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Add 'ptest' target to Makefile, to run tests without checking dependencies.
-Add 'install-ptest' target, to copy needed files to ptest dir.
-
-Signed-off-by: Björn Stenberg <bjst@enea.com>
-Upstream-Status: Pending
----
- Makefile.decl |   43 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
---- a/Makefile.decl     2012-03-12 01:42:39.000000000 +0100
-+++ b/Makefile.decl     2012-11-26 13:42:08.436865192 +0100
-@@ -25,6 +25,49 @@
- test-nonrecursive:
- endif
- 
-+ptest: ptest-nonrecursive
-+       @ for subdir in $(SUBDIRS) .; do \
-+           test -d "$$subdir" -a "$$subdir" != "." -a "$$subdir" != "po" && \
-+           ( test -d $$subdir && cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) \
-+         done
-+
-+ptest-nonrecursive:
-+       @test -z "${TEST_PROGS}" || ${GTESTER} --keep-going --verbose ${TEST_PROGS}
-+
-+install-ptest: install-ptest-nonrecursive
-+       @test -z "$(SUBDIRS)" || for subdir in $(SUBDIRS); do \
-+           test "$$subdir" == "." || \
-+           (cd $$subdir && $(MAKE) DESTDIR=$(DESTDIR)/$$subdir $@ ) \
-+       done
-+
-+# install files used for ptest:
-+# - copy EXTRA_DIST (for test data in glib/tests)
-+# - run dist-hook (for glib/tests/bookmarks/ and glib/tests/markups)
-+# - copy TEST_PROGS (the test programs)
-+# - copy INSTALL_PROGS (for glib/gtester)
-+# - avoid libtool wrappers by copying binaries from .libs
-+# - strip Makefile: target from all Makefiles
-+install-ptest-nonrecursive:
-+       @mkdir -p $(DESTDIR)
-+       @if [ -n "${TEST_PROGS}" ]; then \
-+               if [ -n "${EXTRA_DIST}" ]; then \
-+                       cp ${EXTRA_DIST} $(DESTDIR); \
-+               fi; \
-+               grep -q dist-hook: Makefile && \
-+                       $(MAKE) distdir=$(DESTDIR) dist-hook; \
-+               if [ -d .libs ] ; then \
-+                       cd .libs; \
-+               fi; \
-+               cp ${TEST_PROGS} $(DESTDIR); \
-+       fi;
-+       @if [ -n "${INSTALL_PROGS}" ]; then \
-+               if [ -d .libs ]  ; then \
-+                       cd .libs; \
-+               fi; \
-+               cp ${INSTALL_PROGS} $(DESTDIR); \
-+       fi
-+       @test -f Makefile && sed 's/^Makefile:/_Makefile:/' <Makefile >$(DESTDIR)/Makefile
-+
- # test-report: run tests in subdirs and generate report
- # perf-report: run tests in subdirs with -m perf and generate report
- # full-report: like test-report: with -m perf and -m slow
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
deleted file mode 100644
index 0c243cddae..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Pending
-
-Pass CC & CFLAGS vars so that tune parameters get used.
-This fixes compilation with x32 toolchain.
-
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
-
-Index: glib-2.30.0/glib/Makefile.am
-===================================================================
---- glib-2.30.0.orig/glib/Makefile.am
-+++ glib-2.30.0/glib/Makefile.am
-@@ -359,10 +359,10 @@ INSTALL_PROGS=
- 
- if ENABLE_DTRACE
- glib_probes.h: glib_probes.d Makefile
--       $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
-+       $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
-        @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
- glib_probes.o: glib_probes.d Makefile
--       $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
-+       $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
- BUILT_SOURCES += glib_probes.h glib_probes.o
- CLEANFILES += glib_probes.h glib_probes.h.tmp
- libglib_2_0_la_LIBADD += glib_probes.o
-Index: glib-2.30.0/gobject/Makefile.am
-===================================================================
---- glib-2.30.0.orig/gobject/Makefile.am
-+++ glib-2.30.0/gobject/Makefile.am
-@@ -141,10 +141,10 @@ gobject_c_sources = \
- 
- if ENABLE_DTRACE
- gobject_probes.h: gobject_probes.d Makefile
--       $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
-+       $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
-        @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
- gobject_probes.o: gobject_probes.d Makefile
--       $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
-+       $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
- BUILT_SOURCES += gobject_probes.h gobject_probes.o
- CLEANFILES += gobject_probes.h
- libgobject_2_0_la_LIBADD += gobject_probes.o
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
index 3deb586999..130ae09b6c 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
+++ b/meta/recipes-core/glib-2.0/glib-2.0/run-ptest
@@ -1,3 +1,3 @@
-#!/bin/sh
+#! /bin/sh
 
-make -k ptest
+gnome-desktop-testing-runner glib