aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-07-20 20:28:41 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-07-22 00:02:00 +0200
commit2b2788d8da836638f50a85b7a93826731feeff9a (patch)
tree2996f957469436401c83120a2d2b809c8e000377 /meta-oe
parent84fdd629fc3014be4bbfd976f56070daeca2a27d (diff)
downloadmeta-openembedded-contrib-2b2788d8da836638f50a85b7a93826731feeff9a.tar.gz
meta-openembedded-contrib-2b2788d8da836638f50a85b7a93826731feeff9a.tar.bz2
meta-openembedded-contrib-2b2788d8da836638f50a85b7a93826731feeff9a.zip
pidgin: upgrade to 2.10.9 and fold pidgin.inc into it
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb (renamed from meta-oe/recipes-support/pidgin/pidgin.inc)41
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb23
2 files changed, 28 insertions, 36 deletions
diff --git a/meta-oe/recipes-support/pidgin/pidgin.inc b/meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb
index 8eac64a553..b635352374 100644
--- a/meta-oe/recipes-support/pidgin/pidgin.inc
+++ b/meta-oe/recipes-support/pidgin/pidgin_2.10.9.bb
@@ -2,23 +2,38 @@ DESCRIPTION = "multi-protocol instant messaging client"
SECTION = "x11/network"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus intltool-native"
-INC_PR = "r3"
+DEPENDS = "python startup-notification avahi gtk+ ncurses gnutls virtual/libintl gstreamer dbus intltool-native farsight2 libidn"
inherit autotools gettext pkgconfig gconf perlnative
+SRC_URI = "\
+ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
+ file://sanitize-configure.ac.patch \
+ file://pidgin.desktop-set-icon.patch \
+ file://purple-OE-branding-25.patch \
+ file://pidgin-cross-python-265.patch \
+"
+
+SRC_URI[md5sum] = "10a4a69d077893f6dd3438cd8af94e81"
+SRC_URI[sha256sum] = "dc362ed8577f623eea4554a79e917073aa726825074fea402f2e515f0f51f319"
+
EXTRA_OECONF = " \
- --enable-vv \
- --disable-perl \
- --disable-tcl \
- --disable-gevolution \
- --disable-schemas-install \
- --x-includes=${STAGING_INCDIR} \
- --x-libraries=${STAGING_LIBDIR} \
- --enable-gnutls=yes \
- --with-ncurses-headers=${STAGING_INCDIR} \
- --with-gnutls-includes=${STAGING_INCDIR} \
- --with-gnutls-libs=${STAGING_LIBDIR} \
+ --enable-vv \
+ --disable-perl \
+ --disable-tcl \
+ --disable-gevolution \
+ --disable-schemas-install \
+ --x-includes=${STAGING_INCDIR} \
+ --x-libraries=${STAGING_LIBDIR} \
+ --enable-gnutls=yes \
+ --with-ncurses-headers=${STAGING_INCDIR} \
+ --with-gnutls-includes=${STAGING_INCDIR} \
+ --with-gnutls-libs=${STAGING_LIBDIR} \
+ --disable-gtkspell \
+ --disable-meanwhile \
+ --disable-nm \
+ --disable-screensaver \
+ --enable-nss=no \
"
do_configure_prepend() {
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb b/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb
deleted file mode 100644
index 3ce3cc39a2..0000000000
--- a/meta-oe/recipes-support/pidgin/pidgin_2.7.9.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require pidgin.inc
-PR = "${INC_PR}.3"
-
-DEPENDS += "farsight2 libidn"
-
-SRC_URI = "\
- ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
- file://sanitize-configure.ac.patch \
- file://pidgin.desktop-set-icon.patch \
- file://purple-OE-branding-25.patch \
- file://pidgin-cross-python-265.patch \
-"
-
-SRC_URI[md5sum] = "9bc6cf953ed7d383b215fa8487bf8829"
-SRC_URI[sha256sum] = "9722d7f199a6704e29900c80f270d9409d5c28caab77f495b68108d81ba3e19e"
-
-EXTRA_OECONF += "\
- --disable-gtkspell \
- --disable-meanwhile \
- --disable-nm \
- --disable-screensaver \
- --enable-nss=no \
-"