diff options
author | Herrie <github.com@herrie.org> | 2016-08-02 17:14:24 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-08-15 12:32:00 +0200 |
commit | 42dd9f3f1b69da923090aac46314370ff3f7a7ca (patch) | |
tree | bfbec73fabe774dee4c8e55ee34fec5c52c35148 /meta-oe/recipes-support/pidgin | |
parent | 7f3023003cb1c0c2428b09055b9808c9c4ec0245 (diff) | |
download | meta-openembedded-42dd9f3f1b69da923090aac46314370ff3f7a7ca.tar.gz |
pidgin: upgrade to 2.11.0
* add PACKAGECONFIG for nss
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/pidgin')
-rw-r--r-- | meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb (renamed from meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb) | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb b/meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb index cd4614070..d8b64b7c0 100644 --- a/meta-oe/recipes-support/pidgin/pidgin_2.10.12.bb +++ b/meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb | |||
@@ -1,4 +1,4 @@ | |||
1 | DESCRIPTION = "multi-protocol instant messaging client" | 1 | SUMMARY = "multi-protocol instant messaging client" |
2 | SECTION = "x11/network" | 2 | SECTION = "x11/network" |
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" |
@@ -13,10 +13,10 @@ SRC_URI = "\ | |||
13 | file://pidgin-cross-python-265.patch \ | 13 | file://pidgin-cross-python-265.patch \ |
14 | " | 14 | " |
15 | 15 | ||
16 | SRC_URI[md5sum] = "14e0f5cfb2ed065e4dc80391a806ac76" | 16 | SRC_URI[md5sum] = "7b167474db669aab2f71fa46835fb83f" |
17 | SRC_URI[sha256sum] = "2c7523f0fefe89749c03b2b738ab9f7bd186da435be4762f1487eee31e77ffdd" | 17 | SRC_URI[sha256sum] = "f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333" |
18 | 18 | ||
19 | PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn \ | 19 | PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ |
20 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ | 20 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ |
21 | " | 21 | " |
22 | PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" | 22 | PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" |
@@ -34,9 +34,10 @@ PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" | |||
34 | PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" | 34 | PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" |
35 | PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" | 35 | PACKAGECONFIG[startup-notification] = "--enable-startup-notification,--disable-startup-notification,startup-notification" |
36 | PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses" | 36 | PACKAGECONFIG[consoleui] = "--enable-consoleui --with-ncurses-headers=${STAGING_INCDIR},--disable-consoleui,ncurses" |
37 | PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls" | 37 | PACKAGECONFIG[gnutls] = "--enable-gnutls --with-gnutls-includes=${STAGING_INCDIR} --with-gnutls-libs=${STAGING_LIBDIR},--disable-gnutls,gnutls,libpurple-plugin-ssl-gnutls" |
38 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" | 38 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus dbus-glib" |
39 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | 39 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" |
40 | PACKAGECONFIG[nss] = "--enable-nss,--disable-nss,nss nspr,libpurple-plugin-ssl-nss" | ||
40 | 41 | ||
41 | EXTRA_OECONF = " \ | 42 | EXTRA_OECONF = " \ |
42 | --disable-perl \ | 43 | --disable-perl \ |
@@ -47,7 +48,6 @@ EXTRA_OECONF = " \ | |||
47 | --disable-meanwhile \ | 48 | --disable-meanwhile \ |
48 | --disable-nm \ | 49 | --disable-nm \ |
49 | --disable-screensaver \ | 50 | --disable-screensaver \ |
50 | --enable-nss=no \ | ||
51 | " | 51 | " |
52 | 52 | ||
53 | do_configure_prepend() { | 53 | do_configure_prepend() { |
@@ -81,7 +81,7 @@ FILES_finch-dbg = "${bindir}/.debug/finch \ | |||
81 | 81 | ||
82 | FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ | 82 | FILES_${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ |
83 | ${datadir}/applications" | 83 | ${datadir}/applications" |
84 | RRECOMMENDS_${PN} = "${PN}-data libpurple-plugin-ssl-gnutls libpurple-protocol-irc libpurple-protocol-xmpp" | 84 | RRECOMMENDS_${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" |
85 | 85 | ||
86 | FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" | 86 | FILES_${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" |
87 | FILES_${PN}-dev += "${libdir}/${PN}/*.la" | 87 | FILES_${PN}-dev += "${libdir}/${PN}/*.la" |