From baa7758845df8c6adc445ace7c025f691a243d31 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 20 Jul 2017 03:44:28 -0400 Subject: libgnomekbd: 2.32 -> 3.22 Remove --disable-schemas-install: ... |QA Issue: libgnomekbd: configure was passed unrecognised options: --disable-schemas-install [unknown-configure-option] ... Signed-off-by: Hongxu Jia Signed-off-by: Martin Jansa --- .../gnome-settings-daemon_2.32.1.bb | 3 --- .../recipes-gnome/libgnome/libgnomekbd_2.32.0.bb | 20 -------------------- .../recipes-gnome/libgnome/libgnomekbd_3.22.0.bb | 17 +++++++++++++++++ 3 files changed, 17 insertions(+), 23 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb create mode 100644 meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb index c1db6d3b4b..9a18972409 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb @@ -40,7 +40,4 @@ FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug" FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.la" FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-2.0/*.a" - -PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted libgnomekbd - the recipe will be removed on 2017-09-01 unless the issue is fixed" - PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted gnome-desktop - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb deleted file mode 100644 index 852d8e1fff..0000000000 --- a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "GNOME keyboard library" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" - -SECTION = "x11/gnome/libs" - -DEPENDS = "gconf gtk+ glib-2.0 libxklavier intltool-native gnome-common-native" - -inherit gnome - -SRC_URI[archive.md5sum] = "de32a6e3e3464b566eecdc4332bf34bd" -SRC_URI[archive.sha256sum] = "ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256" -GNOME_COMPRESS_TYPE="bz2" - -do_configure_append() { - find ${B} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g - find ${B} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g -} - -PNBLACKLIST[libgnomekbd] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130608/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb new file mode 100644 index 0000000000..12ed81d4fd --- /dev/null +++ b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.22.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "GNOME keyboard library" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" + +SECTION = "x11/gnome/libs" + +DEPENDS = "gconf glib-2.0 libxklavier gtk+3 intltool-native" + +inherit gnome gobject-introspection gettext + +GNOME_COMPRESS_TYPE = "xz" + +SRC_URI[archive.md5sum] = "7b1ebf99f4254c99922163c262c7ff04" +SRC_URI[archive.sha256sum] = "340b30dabfebbd4e0e6c0fe34a378966dd5640b5d44595ab8a19b0be255d77df" + +EXTRA_OECONF_remove = "--disable-schemas-install" + -- cgit 1.2.3-korg