* [PATCH 1/5] gnome-desktop-testing: add
@ 2013-10-07 17:49 Ross Burton
2013-10-07 17:49 ` [PATCH 2/5] glib-2.0: upgrade to 2.28.0 Ross Burton
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Ross Burton @ 2013-10-07 17:49 UTC (permalink / raw)
To: openembedded-core
gnome-desktop-testing is a test runner for GNOME-style Installed Tests, and will
be used by run-ptest to execute these unit test suites.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../files/no-introspection.patch | 19 +++++++++++++++++++
.../gnome-desktop-testing_2013.1.bb | 18 ++++++++++++++++++
2 files changed, 37 insertions(+)
create mode 100644 meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
create mode 100644 meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb
diff --git a/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch b/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
new file mode 100644
index 0000000..67b64f2
--- /dev/null
+++ b/meta/recipes-support/gnome-desktop-testing/files/no-introspection.patch
@@ -0,0 +1,19 @@
+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_2013.1.bb
new file mode 100644
index 0000000..36e13b1
--- /dev/null
+++ b/meta/recipes-support/gnome-desktop-testing/gnome-desktop-testing_2013.1.bb
@@ -0,0 +1,18 @@
+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"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
+ file://src/gnome-desktop-testing-runner.c;endline=19;md5=ab86a2e00ab9cbb94f008d785004b181"
+
+DEPENDS = "glib-2.0"
+
+inherit autotools pkgconfig
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[journald] = "--with-systemd-journal,--without-systemd-journal,systemd,systemd"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/5] glib-2.0: upgrade to 2.28.0
2013-10-07 17:49 [PATCH 1/5] gnome-desktop-testing: add Ross Burton
@ 2013-10-07 17:49 ` Ross Burton
2013-10-15 6:31 ` Iorga, Cristian
2013-10-07 17:49 ` [PATCH 3/5] atk: upgrade to 2.10.0 Ross Burton
` (2 subsequent siblings)
3 siblings, 1 reply; 9+ messages in thread
From: Ross Burton @ 2013-10-07 17:49 UTC (permalink / raw)
To: openembedded-core
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../glib-2.0/glib-2.0/Makefile-ptest.patch | 61 ------------------
.../glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch | 42 -------------
meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 4 +-
meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 66 --------------------
meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb | 65 +++++++++++++++++++
meta/recipes-core/glib-2.0/glib.inc | 9 ++-
6 files changed, 73 insertions(+), 174 deletions(-)
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
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 40c5b9f..0000000
--- 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 0c243cd..0000000
--- 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 3deb586..130ae09 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
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
deleted file mode 100644
index d62c1fd..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-require glib.inc
-
-PE = "1"
-
-DEPENDS += "libffi zlib"
-DEPENDS_class-native += "libffi-native"
-DEPENDS_class-nativesdk += "nativesdk-libffi nativesdk-zlib ${BPN}-native"
-
-SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-
-SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
- file://configure-libtool.patch \
- file://glib-2.0_fix_for_x32.patch \
- file://fix-conflicting-rand.patch \
- file://Makefile-ptest.patch \
- file://add-march-i486-into-CFLAGS-automatically.patch \
- file://run-ptest \
- file://glib-2.0-configure-readlink.patch \
- "
-
-SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
-
-SRC_URI[md5sum] = "2f4b15f7ef43d8702d067ab987bf7aba"
-SRC_URI[sha256sum] = "f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e"
-
-BBCLASSEXTEND = "native nativesdk"
-
-RDEPENDS_${PN}-ptest += "\
- tzdata \
- tzdata-americas \
- tzdata-asia \
- tzdata-europe \
- tzdata-posix \
- python-pygobject \
- python-dbus \
- "
-
-RDEPENDS_${PN}-ptest_append_libc-glibc = "\
- eglibc-gconv-utf-16 \
- eglibc-charmap-utf-8 \
- eglibc-gconv-cp1255 \
- eglibc-charmap-cp1255 \
- eglibc-gconv-utf-32 \
- eglibc-gconv-utf-7 \
- eglibc-charmap-invariant \
- eglibc-localedata-translit-cjk-variants \
- "
-EXTRA_OECONF_append_class-target_libc-uclibc = " --with-libiconv=gnu"
-
-do_configure_prepend() {
- sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
-}
-
-do_install_append() {
- # remove some unpackaged files
- rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
- rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
- # and empty dirs
- rm -rf ${D}${libdir}/gio
-
- # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
- # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
- if [ -f ${D}${bindir}/glib-mkenums ]; then
- sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
- fi
-}
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
new file mode 100644
index 0000000..4b9b112
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
@@ -0,0 +1,65 @@
+require glib.inc
+
+PE = "1"
+
+DEPENDS += "libffi zlib"
+DEPENDS_class-native += "libffi-native"
+DEPENDS_class-nativesdk += "nativesdk-libffi nativesdk-zlib ${BPN}-native"
+
+SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+
+SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
+ file://configure-libtool.patch \
+ file://fix-conflicting-rand.patch \
+ file://add-march-i486-into-CFLAGS-automatically.patch \
+ file://glib-2.0-configure-readlink.patch \
+ file://run-ptest \
+ "
+
+SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
+
+SRC_URI[md5sum] = "c50d2805a76763e9b4cc4385d4ea215d"
+SRC_URI[sha256sum] = "7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32"
+
+BBCLASSEXTEND = "native nativesdk"
+
+RDEPENDS_${PN}-ptest += "\
+ gnome-desktop-testing \
+ tzdata \
+ tzdata-americas \
+ tzdata-asia \
+ tzdata-europe \
+ tzdata-posix \
+ python-pygobject \
+ python-dbus \
+ "
+
+RDEPENDS_${PN}-ptest_append_libc-glibc = "\
+ eglibc-gconv-utf-16 \
+ eglibc-charmap-utf-8 \
+ eglibc-gconv-cp1255 \
+ eglibc-charmap-cp1255 \
+ eglibc-gconv-utf-32 \
+ eglibc-gconv-utf-7 \
+ eglibc-charmap-invariant \
+ eglibc-localedata-translit-cjk-variants \
+ "
+EXTRA_OECONF_append_class-target_libc-uclibc = " --with-libiconv=gnu"
+
+do_configure_prepend() {
+ sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
+}
+
+do_install_append() {
+ # remove some unpackaged files
+ rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
+ rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
+ # and empty dirs
+ rm -rf ${D}${libdir}/gio
+
+ # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
+ # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
+ if [ -f ${D}${bindir}/glib-mkenums ]; then
+ sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
+ fi
+}
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index e57d2ac..ad0671a 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -27,9 +27,9 @@ S = "${WORKDIR}/glib-${PV}"
CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
-PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-modular-tests', '--disable-modular-tests', d)}"
+PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}"
EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
-EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux --disable-modular-tests"
+EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \
${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
@@ -37,10 +37,13 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \
${libdir}/gio/modules/lib*${SOLIBSDEV} \
${libdir}/gio/modules/*.la"
FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \
- ${libdir}/gio/modules/.debug"
+ ${libdir}/gio/modules/.debug \
+ ${libdir}/glib-2.0/installed-tests/glib/.debug"
FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py"
FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \
${datadir}/bash-completion"
+FILES_${PN}-ptest += "${libdir}/glib-2.0/installed-tests \
+ ${datadir}/installed-tests/glib"
ARM_INSTRUCTION_SET = "arm"
USE_NLS = "yes"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/5] atk: upgrade to 2.10.0.
2013-10-07 17:49 [PATCH 1/5] gnome-desktop-testing: add Ross Burton
2013-10-07 17:49 ` [PATCH 2/5] glib-2.0: upgrade to 2.28.0 Ross Burton
@ 2013-10-07 17:49 ` Ross Burton
2013-10-07 17:49 ` [PATCH 4/5] at-spi2-core: " Ross Burton
2013-10-07 17:49 ` [PATCH 5/5] at-spi2-gtk: " Ross Burton
3 siblings, 0 replies; 9+ messages in thread
From: Ross Burton @ 2013-10-07 17:49 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-support/atk/atk_2.10.0.bb | 23 +++++++++++++++++++++++
meta/recipes-support/atk/atk_2.8.0.bb | 23 -----------------------
2 files changed, 23 insertions(+), 23 deletions(-)
create mode 100644 meta/recipes-support/atk/atk_2.10.0.bb
delete mode 100644 meta/recipes-support/atk/atk_2.8.0.bb
diff --git a/meta/recipes-support/atk/atk_2.10.0.bb b/meta/recipes-support/atk/atk_2.10.0.bb
new file mode 100644
index 0000000..2e8216a
--- /dev/null
+++ b/meta/recipes-support/atk/atk_2.10.0.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "An accessibility toolkit for GNOME."
+HOMEPAGE = "http://live.gnome.org/GAP/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+SECTION = "x11/libs"
+
+LICENSE = "GPLv2+ & LGPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
+ file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
+ file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
+
+DEPENDS = "glib-2.0"
+
+inherit gnomebase gtk-doc
+
+GNOME_COMPRESS_TYPE = "xz"
+
+SRC_URI[archive.md5sum] = "e77833d4445ebe6842e9f9a0667b0be7"
+SRC_URI[archive.sha256sum] = "636917a5036bc851d8491194645d284798ec118919a828be5e713b6ecc5b50b0"
+
+BBCLASSEXTEND = "native"
+
+EXTRA_OECONF = "--disable-glibtest \
+ --disable-introspection"
diff --git a/meta/recipes-support/atk/atk_2.8.0.bb b/meta/recipes-support/atk/atk_2.8.0.bb
deleted file mode 100644
index 9a36ae4..0000000
--- a/meta/recipes-support/atk/atk_2.8.0.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-DESCRIPTION = "An accessibility toolkit for GNOME."
-HOMEPAGE = "http://live.gnome.org/GAP/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-SECTION = "x11/libs"
-
-LICENSE = "GPLv2+ & LGPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
- file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
- file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
-
-DEPENDS = "glib-2.0"
-
-inherit gnomebase gtk-doc
-
-GNOME_COMPRESS_TYPE = "xz"
-
-SRC_URI[archive.md5sum] = "c652bd25530825d604dae1c1ebd2da02"
-SRC_URI[archive.sha256sum] = "b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4"
-
-BBCLASSEXTEND = "native"
-
-EXTRA_OECONF = "--disable-glibtest \
- --disable-introspection"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/5] at-spi2-core: upgrade to 2.10.0.
2013-10-07 17:49 [PATCH 1/5] gnome-desktop-testing: add Ross Burton
2013-10-07 17:49 ` [PATCH 2/5] glib-2.0: upgrade to 2.28.0 Ross Burton
2013-10-07 17:49 ` [PATCH 3/5] atk: upgrade to 2.10.0 Ross Burton
@ 2013-10-07 17:49 ` Ross Burton
2013-10-07 17:49 ` [PATCH 5/5] at-spi2-gtk: " Ross Burton
3 siblings, 0 replies; 9+ messages in thread
From: Ross Burton @ 2013-10-07 17:49 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-support/atk/at-spi2-core_2.10.0.bb | 17 +++++++++++++++++
meta/recipes-support/atk/at-spi2-core_2.8.0.bb | 17 -----------------
2 files changed, 17 insertions(+), 17 deletions(-)
create mode 100644 meta/recipes-support/atk/at-spi2-core_2.10.0.bb
delete mode 100644 meta/recipes-support/atk/at-spi2-core_2.8.0.bb
diff --git a/meta/recipes-support/atk/at-spi2-core_2.10.0.bb b/meta/recipes-support/atk/at-spi2-core_2.10.0.bb
new file mode 100644
index 0000000..a6ff734
--- /dev/null
+++ b/meta/recipes-support/atk/at-spi2-core_2.10.0.bb
@@ -0,0 +1,17 @@
+SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
+
+MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "bb3b6f5679ecfc7dabcf76a1b6bfe2db"
+SRC_URI[sha256sum] = "964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db"
+
+DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
+
+inherit autotools gtk-doc
+
+EXTRA_OECONF = "--disable-introspection --disable-xevie"
+
+FILES_${PN} += "${datadir}/dbus-1/services/*.service"
diff --git a/meta/recipes-support/atk/at-spi2-core_2.8.0.bb b/meta/recipes-support/atk/at-spi2-core_2.8.0.bb
deleted file mode 100644
index 8403d65..0000000
--- a/meta/recipes-support/atk/at-spi2-core_2.8.0.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
-
-MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "93b57d5d56d15d1222ddf2386e2f869f"
-SRC_URI[sha256sum] = "1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458"
-
-DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
-
-inherit autotools gtk-doc
-
-EXTRA_OECONF = "--disable-introspection --disable-xevie"
-
-FILES_${PN} += "${datadir}/dbus-1/services/*.service"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/5] at-spi2-gtk: upgrade to 2.10.0
2013-10-07 17:49 [PATCH 1/5] gnome-desktop-testing: add Ross Burton
` (2 preceding siblings ...)
2013-10-07 17:49 ` [PATCH 4/5] at-spi2-core: " Ross Burton
@ 2013-10-07 17:49 ` Ross Burton
3 siblings, 0 replies; 9+ messages in thread
From: Ross Burton @ 2013-10-07 17:49 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-support/atk/at-spi2-atk_2.10.0.bb | 19 +++++++++++++++++++
meta/recipes-support/atk/at-spi2-atk_2.8.1.bb | 19 -------------------
2 files changed, 19 insertions(+), 19 deletions(-)
create mode 100644 meta/recipes-support/atk/at-spi2-atk_2.10.0.bb
delete mode 100644 meta/recipes-support/atk/at-spi2-atk_2.8.1.bb
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.10.0.bb b/meta/recipes-support/atk/at-spi2-atk_2.10.0.bb
new file mode 100644
index 0000000..f8cb4e6
--- /dev/null
+++ b/meta/recipes-support/atk/at-spi2-atk_2.10.0.bb
@@ -0,0 +1,19 @@
+SUMMARY = "AT-SPI 2 Toolkit Bridge"
+LICENSE = "LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
+
+MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
+SRC_URI[md5sum] = "38e4f7e2898f7ba3cc3ec269d9402789"
+SRC_URI[sha256sum] = "dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94"
+
+DEPENDS = "dbus glib-2.0 atk at-spi2-core"
+
+inherit autotools
+
+PACKAGES =+ "${PN}-gnome ${PN}-gtk2"
+
+FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules"
+FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
diff --git a/meta/recipes-support/atk/at-spi2-atk_2.8.1.bb b/meta/recipes-support/atk/at-spi2-atk_2.8.1.bb
deleted file mode 100644
index 32cbe3b..0000000
--- a/meta/recipes-support/atk/at-spi2-atk_2.8.1.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "AT-SPI 2 Toolkit Bridge"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
-
-MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz"
-SRC_URI[md5sum] = "854e36a2538bea50bc08d33aa9499bb2"
-SRC_URI[sha256sum] = "eb659b94fde6dc0a2f584c9121a5e6d39a4c8aa297d21d8f9032f7a8a775fd06"
-
-DEPENDS = "dbus glib-2.0 atk at-spi2-core"
-
-inherit autotools
-
-PACKAGES =+ "${PN}-gnome ${PN}-gtk2"
-
-FILES_${PN}-gnome = "${libdir}/gnome-settings-daemon-3.0/gtk-modules"
-FILES_${PN}-gtk2 = "${libdir}/gtk-2.0/modules/libatk-bridge.*"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/5] glib-2.0: upgrade to 2.28.0
2013-10-07 17:49 ` [PATCH 2/5] glib-2.0: upgrade to 2.28.0 Ross Burton
@ 2013-10-15 6:31 ` Iorga, Cristian
2013-10-15 8:37 ` Fathi Boudra
0 siblings, 1 reply; 9+ messages in thread
From: Iorga, Cristian @ 2013-10-15 6:31 UTC (permalink / raw)
To: Burton, Ross, openembedded-core
Hello,
This patch has been merged with incorrect version in commit description.
Upgraded to version 2.38.0, not version 2.28.0, as in description.
Regards,
Cristian
-----Original Message-----
From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Ross Burton
Sent: Monday, October 07, 2013 8:49 PM
To: openembedded-core@lists.openembedded.org
Subject: [OE-core] [PATCH 2/5] 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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../glib-2.0/glib-2.0/Makefile-ptest.patch | 61 ------------------
.../glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch | 42 -------------
meta/recipes-core/glib-2.0/glib-2.0/run-ptest | 4 +-
meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb | 66 --------------------
meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb | 65 +++++++++++++++++++
meta/recipes-core/glib-2.0/glib.inc | 9 ++-
6 files changed, 73 insertions(+), 174 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/Makefile-ptest.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
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 40c5b9f..0000000
--- 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 0c243cd..0000000
--- 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 3deb586..130ae09 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
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
deleted file mode 100644
index d62c1fd..0000000
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.36.4.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-require glib.inc
-
-PE = "1"
-
-DEPENDS += "libffi zlib"
-DEPENDS_class-native += "libffi-native"
-DEPENDS_class-nativesdk += "nativesdk-libffi nativesdk-zlib ${BPN}-native"
-
-SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
-
-SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
- file://configure-libtool.patch \
- file://glib-2.0_fix_for_x32.patch \
- file://fix-conflicting-rand.patch \
- file://Makefile-ptest.patch \
- file://add-march-i486-into-CFLAGS-automatically.patch \
- file://run-ptest \
- file://glib-2.0-configure-readlink.patch \
- "
-
-SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
-
-SRC_URI[md5sum] = "2f4b15f7ef43d8702d067ab987bf7aba"
-SRC_URI[sha256sum] = "f654d2542329012d8475736a165dfbf82fadf3ee940c2e0e6ddd4b2fde5cad7e"
-
-BBCLASSEXTEND = "native nativesdk"
-
-RDEPENDS_${PN}-ptest += "\
- tzdata \
- tzdata-americas \
- tzdata-asia \
- tzdata-europe \
- tzdata-posix \
- python-pygobject \
- python-dbus \
- "
-
-RDEPENDS_${PN}-ptest_append_libc-glibc = "\
- eglibc-gconv-utf-16 \
- eglibc-charmap-utf-8 \
- eglibc-gconv-cp1255 \
- eglibc-charmap-cp1255 \
- eglibc-gconv-utf-32 \
- eglibc-gconv-utf-7 \
- eglibc-charmap-invariant \
- eglibc-localedata-translit-cjk-variants \
- "
-EXTRA_OECONF_append_class-target_libc-uclibc = " --with-libiconv=gnu"
-
-do_configure_prepend() {
- sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
-}
-
-do_install_append() {
- # remove some unpackaged files
- rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
- rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
- # and empty dirs
- rm -rf ${D}${libdir}/gio
-
- # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
- # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
- if [ -f ${D}${bindir}/glib-mkenums ]; then
- sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/glib-mkenums
- fi
-}
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
new file mode 100644
index 0000000..4b9b112
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.38.0.bb
@@ -0,0 +1,65 @@
+require glib.inc
+
+PE = "1"
+
+DEPENDS += "libffi zlib"
+DEPENDS_class-native += "libffi-native"
+DEPENDS_class-nativesdk += "nativesdk-libffi nativesdk-zlib ${BPN}-native"
+
+SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+
+SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
+ file://configure-libtool.patch \
+ file://fix-conflicting-rand.patch \
+ file://add-march-i486-into-CFLAGS-automatically.patch \
+ file://glib-2.0-configure-readlink.patch \
+ file://run-ptest \
+ "
+
+SRC_URI_append_class-native = " file://glib-gettextize-dir.patch"
+
+SRC_URI[md5sum] = "c50d2805a76763e9b4cc4385d4ea215d"
+SRC_URI[sha256sum] = "7513a7de5e814ccb48206340a8773ea523d6a7bf04dc74565de69b899bc2ff32"
+
+BBCLASSEXTEND = "native nativesdk"
+
+RDEPENDS_${PN}-ptest += "\
+ gnome-desktop-testing \
+ tzdata \
+ tzdata-americas \
+ tzdata-asia \
+ tzdata-europe \
+ tzdata-posix \
+ python-pygobject \
+ python-dbus \
+ "
+
+RDEPENDS_${PN}-ptest_append_libc-glibc = "\
+ eglibc-gconv-utf-16 \
+ eglibc-charmap-utf-8 \
+ eglibc-gconv-cp1255 \
+ eglibc-charmap-cp1255 \
+ eglibc-gconv-utf-32 \
+ eglibc-gconv-utf-7 \
+ eglibc-charmap-invariant \
+ eglibc-localedata-translit-cjk-variants \
+ "
+EXTRA_OECONF_append_class-target_libc-uclibc = " --with-libiconv=gnu"
+
+do_configure_prepend() {
+ sed -i -e '1s,#!.*,#!${USRBINPATH}/env python,'
+${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in
+}
+
+do_install_append() {
+ # remove some unpackaged files
+ rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc
+ rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo
+ # and empty dirs
+ rm -rf ${D}${libdir}/gio
+
+ # Some distros have both /bin/perl and /usr/bin/perl, but we set perl
+location
+ # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
+ if [ -f ${D}${bindir}/glib-mkenums ]; then
+ sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,'
+${D}${bindir}/glib-mkenums
+ fi
+}
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index e57d2ac..ad0671a 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -27,9 +27,9 @@ S = "${WORKDIR}/glib-${PV}"
CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
-PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-modular-tests', '--disable-modular-tests', d)}"
+PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}"
EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
-EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux --disable-modular-tests"
+EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
FILES_${PN} = "${libdir}/lib*${SOLIBS} ${datadir}/glib-2.0/schemas \
${datadir}/glib-2.0/gettext/mkinstalldirs ${datadir}/glib-2.0/gettext/po/Makefile.in.in"
@@ -37,10 +37,13 @@ FILES_${PN}-dev += "${libdir}/glib-2.0/include \
${libdir}/gio/modules/lib*${SOLIBSDEV} \
${libdir}/gio/modules/*.la"
FILES_${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb \
- ${libdir}/gio/modules/.debug"
+ ${libdir}/gio/modules/.debug \
+ ${libdir}/glib-2.0/installed-tests/glib/.debug"
FILES_${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py"
FILES_${PN}-bash-completion = "${sysconfdir}/bash_completion.d \
${datadir}/bash-completion"
+FILES_${PN}-ptest += "${libdir}/glib-2.0/installed-tests \
+ ${datadir}/installed-tests/glib"
ARM_INSTRUCTION_SET = "arm"
USE_NLS = "yes"
--
1.7.10.4
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 2/5] glib-2.0: upgrade to 2.28.0
2013-10-15 6:31 ` Iorga, Cristian
@ 2013-10-15 8:37 ` Fathi Boudra
2013-10-15 9:43 ` Burton, Ross
0 siblings, 1 reply; 9+ messages in thread
From: Fathi Boudra @ 2013-10-15 8:37 UTC (permalink / raw)
To: Iorga, Cristian; +Cc: openembedded-core
On 15 October 2013 09:31, Iorga, Cristian <cristian.iorga@intel.com> wrote:
> Hello,
>
> This patch has been merged with incorrect version in commit description.
> Upgraded to version 2.38.0, not version 2.28.0, as in description.
> Regards,
> Cristian
>
> -----Original Message-----
> From: openembedded-core-bounces@lists.openembedded.org [mailto:openembedded-core-bounces@lists.openembedded.org] On Behalf Of Ross Burton
> Sent: Monday, October 07, 2013 8:49 PM
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 2/5] 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.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
it fails to build on Aarch64:
| gdbusprivate.c: In function 'write_message_print_transport_debug':
| gdbusprivate.c:2164:12: error: format '%lu' expects argument of type
'long unsigned int', but argument 2 has type 'gssize'
[-Werror=format=]
| g_type_name (G_TYPE_FROM_INSTANCE
(g_io_stream_get_output_stream (data->worker->stream))));
| ^
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/5] glib-2.0: upgrade to 2.28.0
2013-10-15 8:37 ` Fathi Boudra
@ 2013-10-15 9:43 ` Burton, Ross
2013-10-15 11:05 ` Riku Voipio
0 siblings, 1 reply; 9+ messages in thread
From: Burton, Ross @ 2013-10-15 9:43 UTC (permalink / raw)
To: Fathi Boudra; +Cc: openembedded-core
On 15 October 2013 09:37, Fathi Boudra <fathi.boudra@linaro.org> wrote:
> it fails to build on Aarch64:
> | gdbusprivate.c: In function 'write_message_print_transport_debug':
> | gdbusprivate.c:2164:12: error: format '%lu' expects argument of type
> 'long unsigned int', but argument 2 has type 'gssize'
> [-Werror=format=]
> | g_type_name (G_TYPE_FROM_INSTANCE
> (g_io_stream_get_output_stream (data->worker->stream))));
> | ^
I don't have any aarch64 hardware to test on, can you work with
upstream to get a fix and submit it here?
Ross
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 2/5] glib-2.0: upgrade to 2.28.0
2013-10-15 9:43 ` Burton, Ross
@ 2013-10-15 11:05 ` Riku Voipio
0 siblings, 0 replies; 9+ messages in thread
From: Riku Voipio @ 2013-10-15 11:05 UTC (permalink / raw)
To: Burton, Ross; +Cc: openembedded-core
On 15 October 2013 12:43, Burton, Ross <ross.burton@intel.com> wrote:
> On 15 October 2013 09:37, Fathi Boudra <fathi.boudra@linaro.org> wrote:
>> it fails to build on Aarch64:
>> | gdbusprivate.c: In function 'write_message_print_transport_debug':
>> | gdbusprivate.c:2164:12: error: format '%lu' expects argument of type
>> 'long unsigned int', but argument 2 has type 'gssize'
>> [-Werror=format=]
>> | g_type_name (G_TYPE_FROM_INSTANCE
>> (g_io_stream_get_output_stream (data->worker->stream))));
>> | ^
>
> I don't have any aarch64 hardware to test on, can you work with
> upstream to get a fix and submit it here?
This is fixed upstream in:
https://git.gnome.org/browse/glib/commit/?id=0167c3340d8201dca8e9031b61703bbc5ed6ce33
I'll submit a patch in a moment.
Riku
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-10-15 11:05 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-07 17:49 [PATCH 1/5] gnome-desktop-testing: add Ross Burton
2013-10-07 17:49 ` [PATCH 2/5] glib-2.0: upgrade to 2.28.0 Ross Burton
2013-10-15 6:31 ` Iorga, Cristian
2013-10-15 8:37 ` Fathi Boudra
2013-10-15 9:43 ` Burton, Ross
2013-10-15 11:05 ` Riku Voipio
2013-10-07 17:49 ` [PATCH 3/5] atk: upgrade to 2.10.0 Ross Burton
2013-10-07 17:49 ` [PATCH 4/5] at-spi2-core: " Ross Burton
2013-10-07 17:49 ` [PATCH 5/5] at-spi2-gtk: " Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.