diff mbox series

[oe,meta-oe,1/2] pidgin-otr: Upgrade to 4.0.2

Message ID 20170914162255.43165-1-raj.khem@gmail.com
State Accepted
Commit 61885d3d6f6e1d214da8962d5553f2bd2e231b54
Headers show
Series [oe,meta-oe,1/2] pidgin-otr: Upgrade to 4.0.2 | expand

Commit Message

Khem Raj Sept. 14, 2017, 4:22 p.m. UTC 
Check for x11 before building, it has a hard dep on
gtk+, which inturn needs x11 or directfb

Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 .../ignore_extra-portability_warnings.patch           | 19 -------------------
 meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb    | 16 ----------------
 meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb    | 15 +++++++++++++++
 3 files changed, 15 insertions(+), 35 deletions(-)
 delete mode 100644 meta-oe/recipes-support/pidgin/pidgin-otr/ignore_extra-portability_warnings.patch
 delete mode 100644 meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb
 create mode 100644 meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb

-- 
2.14.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr/ignore_extra-portability_warnings.patch b/meta-oe/recipes-support/pidgin/pidgin-otr/ignore_extra-portability_warnings.patch
deleted file mode 100644
index db0ad873b..000000000
--- a/meta-oe/recipes-support/pidgin/pidgin-otr/ignore_extra-portability_warnings.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-pidgin-otr: Silence no-extra-portability warnings
-
-Make it build with OE, was not building with warning turned on
-
-Upstream-Status: Pending
-
-Signed-off-by: Jakob Drexel <jake42@rommel.stw.uni-erlangen.de>
-
---- a/configure.ac	2012-09-01 17:03:19.000000000 +0200
-+++ b/configure.ac	2014-01-12 21:59:24.920300215 +0100
-@@ -4,7 +4,7 @@
- 
- AM_CONFIG_HEADER(config.h)
- 
--AM_INIT_AUTOMAKE([-Wall -Werror])
-+AM_INIT_AUTOMAKE([-Wall -Werror -Wno-extra-portability])
- 
- AC_PROG_CC
- 
diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb
deleted file mode 100644
index e8539c902..000000000
--- a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb
+++ /dev/null
@@ -1,16 +0,0 @@ 
-SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging"
-HOMEPAGE = "http://www.cypherpunks.ca/otr/"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24"
-DEPENDS = "libgcrypt libotr pidgin intltool-native glib-2.0-native"
-
-SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \
-    file://ignore_extra-portability_warnings.patch \
-"
-
-SRC_URI[md5sum] = "eadb953376acc474e56041d4c12aa2c8"
-SRC_URI[sha256sum] = "d56b3f092dbe9ee6597641c7d2dd294884dc04ba47aaf4ec571cd54977df4691"
-
-FILES_${PN} = "${libdir}/pidgin/*"
-
-inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
new file mode 100644
index 000000000..5a21cd3fc
--- /dev/null
+++ b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
@@ -0,0 +1,15 @@ 
+SUMMARY = "(OTR) Messaging allows you to have private conversations over instant messaging"
+HOMEPAGE = "https://otr.cypherpunks.ca/"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=92fe174bad6da3763f6e9e9eaff6df24"
+DEPENDS = "libgcrypt libotr pidgin gtk+ intltool-native glib-2.0 glib-2.0-native"
+REQUIRED_DISTRO_FEATURES = "x11"
+
+SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \
+"
+SRC_URI[md5sum] = "7ef14e1334a4bc80e5d530f9a3cfc626"
+SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4"
+
+FILES_${PN} = "${libdir}/pidgin/*"
+
+inherit autotools pkgconfig distro_features_check