diff options
| author | Herrie <github.com@herrie.org> | 2017-07-24 21:55:17 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:21:00 +0200 |
| commit | 3d8be8039659b7d4b2bb6f91b0efa0d599fd0f30 (patch) | |
| tree | 8275cec7ab0d03c9efa474ab5b9b7d933c3e8d1d | |
| parent | 007498ac72e26e9f7064de74f7fe96e91ae6c969 (diff) | |
| download | meta-openembedded-3d8be8039659b7d4b2bb6f91b0efa0d599fd0f30.tar.gz | |
libotr: Upgrade from 4.0.0 to 4.1.1 and update patches
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
| -rw-r--r-- | meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-support/pidgin/libotr/sepbuild.patch | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-support/pidgin/libotr_4.1.1.bb (renamed from meta-oe/recipes-support/pidgin/libotr_4.0.0.bb) | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch b/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch index b78663310..ecdbffb51 100644 --- a/meta-oe/recipes-support/pidgin/libotr/fix_qa-issue_include.patch +++ b/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> | |||
| 11 | --- a/toolkit/Makefile.am 2012-05-03 15:52:22.000000000 +0200 | 11 | --- a/toolkit/Makefile.am 2012-05-03 15:52:22.000000000 +0200 |
| 12 | +++ b/toolkit/Makefile.am 2014-01-13 12:12:26.030369357 +0100 | 12 | +++ b/toolkit/Makefile.am 2014-01-13 12:12:26.030369357 +0100 |
| 13 | @@ -1,4 +1,4 @@ | 13 | @@ -1,4 +1,4 @@ |
| 14 | -INCLUDES = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ | 14 | -AM_CPPFLAGS = -I$(includedir) -I../src @LIBGCRYPT_CFLAGS@ |
| 15 | +INCLUDES = -I../src @LIBGCRYPT_CFLAGS@ | 15 | +AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ |
| 16 | 16 | ||
| 17 | noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h | 17 | noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h |
| 18 | 18 | ||
diff --git a/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch b/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch index f66e52881..dda17a957 100644 --- a/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch +++ b/meta-oe/recipes-support/pidgin/libotr/sepbuild.patch | |||
| @@ -9,8 +9,8 @@ Index: libotr-4.0.0/toolkit/Makefile.am | |||
| 9 | --- libotr-4.0.0.orig/toolkit/Makefile.am 2014-07-16 18:09:59.777858022 +0000 | 9 | --- libotr-4.0.0.orig/toolkit/Makefile.am 2014-07-16 18:09:59.777858022 +0000 |
| 10 | +++ libotr-4.0.0/toolkit/Makefile.am 2014-07-17 06:28:51.359066155 +0000 | 10 | +++ libotr-4.0.0/toolkit/Makefile.am 2014-07-17 06:28:51.359066155 +0000 |
| 11 | @@ -1,4 +1,4 @@ | 11 | @@ -1,4 +1,4 @@ |
| 12 | -INCLUDES = -I../src @LIBGCRYPT_CFLAGS@ | 12 | -AM_CPPFLAGS = -I../src @LIBGCRYPT_CFLAGS@ |
| 13 | +INCLUDES = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@ | 13 | +AM_CPPFLAGS = -I$(top_srcdir)/src @LIBGCRYPT_CFLAGS@ |
| 14 | 14 | ||
| 15 | noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h | 15 | noinst_HEADERS = aes.h ctrmode.h parse.h sesskeys.h readotr.h sha1hmac.h |
| 16 | 16 | ||
diff --git a/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb index dd9eeab7a..c70124421 100644 --- a/meta-oe/recipes-support/pidgin/libotr_4.0.0.bb +++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb | |||
| @@ -9,7 +9,7 @@ SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \ | |||
| 9 | file://sepbuild.patch \ | 9 | file://sepbuild.patch \ |
| 10 | " | 10 | " |
| 11 | 11 | ||
| 12 | SRC_URI[md5sum] = "00979dca82d70383fcd1b01f3974363c" | 12 | SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81" |
| 13 | SRC_URI[sha256sum] = "3f911994409898e74527730745ef35ed75c352c695a1822a677a34b2cf0293b4" | 13 | SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5" |
| 14 | 14 | ||
| 15 | inherit autotools pkgconfig | 15 | inherit autotools pkgconfig |