diff options
Diffstat (limited to 'import-layers/meta-openembedded/meta-oe/recipes-support/pidgin')
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch | 4 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch | 4 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb (renamed from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb) | 4 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr/ignore_extra-portability_warnings.patch | 19 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb | 21 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb | 15 | ||||
-rw-r--r-- | import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb (renamed from import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb) | 4 |
7 files changed, 23 insertions, 48 deletions
diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch index b78663310..ecdbffb51 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch @@ -11,8 +11,8 @@ Signed-off-by: Jakob Drexel <jake42@rommel.stw.uni-erlangen.de> --- a/toolkit/Makefile.am 2012-05-03 15:52:22.000000000 +0200 +++ b/toolkit/Makefile.am 2014-01-13 12:12:26.030369357 +0100 @@ -1,4 +1,4 @@ --INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ -+INCLUDES = -I../src @LIBGCRYPT_CFLAGS@ +-AM_CPPFLAGS = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ ++AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch index f66e52881..dda17a957 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch @@ -9,8 +9,8 @@ Index: libotr-4.0.0/toolkit/Makefile.am --- libotr-4.0.0.orig/toolkit/Makefile.am 2014-07-16 18:09:59.777858022 +0000 +++ libotr-4.0.0/toolkit/Makefile.am 2014-07-17 06:28:51.359066155 +0000 @@ -1,4 +1,4 @@ --INCLUDES = -I../src @LIBGCRYPT_CFLAGS@ -+INCLUDES = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@ +-AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ ++AM_CPPFLAGS = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@ noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb index dd9eeab7a..c70124421 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb @@ -9,7 +9,7 @@ SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ file://sepbuild.patch \ " -SRC_URI[md5sum] = "00979dca82d70383fcd1b01f3974363c" -SRC_URI[sha256sum] = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4" +SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" +SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5" inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr/ignore_extra-portability_warnings.patch b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr/ignore_extra-portability_warnings.patch deleted file mode 100644 index db0ad873b..000000000 --- a/import-layers/meta-openembedded/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/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb deleted file mode 100644 index 47cdc7242..000000000 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.0.bb +++ /dev/null @@ -1,21 +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" - -PNBLACKLIST[pidgin-otr] ?= "depends on blacklisted pidgin - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -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/*" -FILES_${PN}-dbg = "${libdir}/pidgin/.debug" -FILES_${PN}-dbg += "${libdir}/pidgin/.debug/pidgin-otr.so" -FILES_${PN}-dbg += "/usr/src/debug/pidgin-otr/${PV}-${PR}/${P}/*" -inherit autotools pkgconfig diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb new file mode 100644 index 000000000..5a21cd3fc --- /dev/null +++ b/import-layers/meta-openembedded/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 diff --git a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb index 462e21c92..088f08b7d 100644 --- a/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.11.0.bb +++ b/import-layers/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.12.0.bb @@ -13,8 +13,8 @@ SRC_URI = "\ file://pidgin-cross-python-265.patch \ " -SRC_URI[md5sum] = "7b167474db669aab2f71fa46835fb83f" -SRC_URI[sha256sum] = "f72613440586da3bdba6d58e718dce1b2c310adf8946de66d8077823e57b3333" +SRC_URI[md5sum] = "8287400c4e5663e0e7844e868d5152af" +SRC_URI[sha256sum] = "8c3d3536d6d3c971bd433ff9946678af70a0f6aa4e6969cc2a83bb357015b7f8" PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ |