summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-03-06 14:57:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:52 -0800
commitf0ccd96a6434e45bc885c5b6128630c4ad510da8 (patch)
treea76174a7e9daf11ee52199a0ef02ac9e385cc869 /meta
parent1f9d6427f4e5af91050748f0c5f995298a1be85e (diff)
downloadpoky-f0ccd96a6434e45bc885c5b6128630c4ad510da8.tar.gz
libfm: fix dependencies
libfm uses glib-gettextize so explicitly depend on glib-2.0-native. Instead of depending on gettext-native, inherit gettext. (From OE-Core rev: 9c367c92df0ca8afe0a75b066fdc9e21560d57ff) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/libfm/libfm-extra_1.2.5.bb4
-rw-r--r--meta/recipes-support/libfm/libfm_1.2.5.bb4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-support/libfm/libfm-extra_1.2.5.bb b/meta/recipes-support/libfm/libfm-extra_1.2.5.bb
index 0134572f1f..c0fd83ef34 100644
--- a/meta/recipes-support/libfm/libfm-extra_1.2.5.bb
+++ b/meta/recipes-support/libfm/libfm-extra_1.2.5.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPLv2+"
5LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007" 5LIC_FILES_CHKSUM = "file://src/fm-extra.h;beginline=8;endline=21;md5=ef1f84da64b3c01cca447212f7ef6007"
6 6
7SECTION = "x11/libs" 7SECTION = "x11/libs"
8DEPENDS = "glib-2.0 intltool-native gettext-native" 8DEPENDS = "glib-2.0-native glib-2.0 intltool-native"
9 9
10SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ 10SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \
11 file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ 11 file://0001-nls.m4-Take-it-from-gettext-0.15.patch \
@@ -18,6 +18,6 @@ S = "${WORKDIR}/libfm-${PV}"
18 18
19EXTRA_OECONF = "--with-extra-only --with-gtk=no" 19EXTRA_OECONF = "--with-extra-only --with-gtk=no"
20 20
21inherit autotools pkgconfig gtk-doc 21inherit autotools pkgconfig gtk-doc gettext
22 22
23do_configure[dirs] =+ "${S}/m4" 23do_configure[dirs] =+ "${S}/m4"
diff --git a/meta/recipes-support/libfm/libfm_1.2.5.bb b/meta/recipes-support/libfm/libfm_1.2.5.bb
index c1deea6853..596408353f 100644
--- a/meta/recipes-support/libfm/libfm_1.2.5.bb
+++ b/meta/recipes-support/libfm/libfm_1.2.5.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b \
9 9
10 10
11SECTION = "x11/libs" 11SECTION = "x11/libs"
12DEPENDS = "glib-2.0 pango gtk+3 menu-cache intltool-native libexif libfm-extra gettext-native" 12DEPENDS = "glib-2.0 glib-2.0-native pango gtk+3 menu-cache intltool-native libexif libfm-extra"
13 13
14SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \ 14SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \
15 file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \ 15 file://0001-Correctly-check-the-stamp-file-that-indicates-if-we-.patch \
@@ -19,7 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmanfm/libfm-${PV}.tar.xz \
19SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807" 19SRC_URI[md5sum] = "a1ba9ae5e920f38b647dd511edd6c807"
20SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a" 20SRC_URI[sha256sum] = "c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a"
21 21
22inherit autotools pkgconfig gtk-doc distro_features_check 22inherit autotools pkgconfig gtk-doc gettext distro_features_check
23ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 23ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
24 24
25EXTRA_OECONF = "--with-gtk=3" 25EXTRA_OECONF = "--with-gtk=3"