diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2017-02-12 22:02:09 +0100 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-13 18:43:37 +0100 |
| commit | 928849af3a96a7f7f728172047a8f75aa72b88a9 (patch) | |
| tree | c4e636f465fcea8a168feb15898e132cb4d9a7c1 | |
| parent | f35f4fbb7de8540e2c3e16f9c4d974f5686d965c (diff) | |
| download | meta-openembedded-contrib-928849af3a96a7f7f728172047a8f75aa72b88a9.tar.gz | |
libglade: fix build and cleanup
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch | 30 | ||||
| -rw-r--r-- | meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb | 11 |
2 files changed, 38 insertions, 3 deletions
diff --git a/meta-oe/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch b/meta-oe/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch new file mode 100644 index 0000000000..473827448e --- /dev/null +++ b/meta-oe/recipes-gnome/libglade/libglade-2.6.4/0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch @@ -0,0 +1,30 @@ +From ceefcb19cebf8bc3d45ee502f8eabd3bc5bd0aac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Sat, 11 Feb 2017 16:42:12 +0100 +Subject: [PATCH] configure.in: remove deprecated GNOME_COMMON_INIT +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- + configure.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 8905f1c..3901398 100644 +--- a/configure.in ++++ b/configure.in +@@ -15,7 +15,6 @@ AC_CONFIG_HEADERS([config.h]) + + AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2]) + +-GNOME_COMMON_INIT + + if test "$enable_debug" != "no"; then + AC_DEFINE([DEBUG],[1],[enable use of LIBGLADE_DEBUG environment variable]) +-- +2.9.3 + diff --git a/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb b/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb index 8cd023a509..b730d5b52a 100644 --- a/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb +++ b/meta-oe/recipes-gnome/libglade/libglade_2.6.4.bb @@ -15,17 +15,22 @@ inherit autotools pkgconfig gnomebase gtk-doc distro_features_check ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" GNOME_COMPRESS_TYPE="bz2" -SRC_URI += "file://glade-cruft.patch file://no-xml2.patch file://python_environment.patch" +SRC_URI += " \ + file://glade-cruft.patch \ + file://no-xml2.patch \ + file://python_environment.patch \ + file://0001-configure.in-remove-deprecated-GNOME_COMMON_INIT.patch \ +" SRC_URI[archive.md5sum] = "d1776b40f4e166b5e9c107f1c8fe4139" SRC_URI[archive.sha256sum] = "64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec" EXTRA_OECONF += "--without-libxml2 --disable-gtk-doc" -CFLAGS += "-lz" +CFLAGS += "-lz -lgmodule-2.0" PACKAGES += " ${PN}-data" FILES_${PN} = "${libdir}/lib*.so.*" FILES_${PN}-data = "${datadir}/xml/libglade/glade-2.0.dtd" FILES_${PN}-dev += "${bindir}/libglade-convert" -#RDEPENDS_${PN} = "${PN}-data" + |