diff options
Diffstat (limited to 'meta-networking/recipes-irc')
-rw-r--r-- | meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch | 37 | ||||
-rw-r--r-- | meta-networking/recipes-irc/weechat/weechat_4.6.0.bb (renamed from meta-networking/recipes-irc/weechat/weechat_4.0.4.bb) | 8 | ||||
-rw-r--r-- | meta-networking/recipes-irc/znc/znc_1.8.2.bb | 14 |
3 files changed, 7 insertions, 52 deletions
diff --git a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch b/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch deleted file mode 100644 index 4a33dd7204..0000000000 --- a/meta-networking/recipes-irc/weechat/weechat/0001-use-pkg-config-for-gcrypt-instead.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From dc6b11f4cc6035b4701e1d7f7c91b2f45757e7a2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alejandro Enedino Hernandez Samaniego | ||
3 | <alejandro@enedino.org> | ||
4 | Date: Wed, 26 Feb 2020 13:55:16 -0800 | ||
5 | Subject: [PATCH] use pkg-config for gcrypt instead | ||
6 | |||
7 | Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> | ||
8 | |||
9 | Upstream-Status: Inappropriate [oe-specific] | ||
10 | |||
11 | --- | ||
12 | cmake/FindGCRYPT.cmake | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | Index: weechat-2.7.1/cmake/FindGCRYPT.cmake | ||
16 | =================================================================== | ||
17 | --- weechat-2.7.1.orig/cmake/FindGCRYPT.cmake | ||
18 | +++ weechat-2.7.1/cmake/FindGCRYPT.cmake | ||
19 | @@ -27,15 +27,15 @@ | ||
20 | # GCRYPT_LDFLAGS = ldflags to use to compile | ||
21 | # | ||
22 | |||
23 | -find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES libgcrypt-config) | ||
24 | +find_program(LIBGCRYPT_CONFIG_EXECUTABLE NAMES pkg-config) | ||
25 | |||
26 | set(GCRYPT_LDFLAGS) | ||
27 | set(GCRYPT_CFLAGS) | ||
28 | |||
29 | if(LIBGCRYPT_CONFIG_EXECUTABLE) | ||
30 | |||
31 | - execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) | ||
32 | - execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) | ||
33 | + execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --libs RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) | ||
34 | + execute_process(COMMAND ${LIBGCRYPT_CONFIG_EXECUTABLE} libgcrypt --cflags RESULT_VARIABLE _return_VALUE OUTPUT_VARIABLE GCRYPT_CFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET) | ||
35 | |||
36 | if(NOT DEFINED ${GCRYPT_CFLAGS}) | ||
37 | set(GCRYPT_CFLAGS " ") | ||
diff --git a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb b/meta-networking/recipes-irc/weechat/weechat_4.6.0.bb index d13764e4c7..da79c59ba5 100644 --- a/meta-networking/recipes-irc/weechat/weechat_4.0.4.bb +++ b/meta-networking/recipes-irc/weechat/weechat_4.6.0.bb | |||
@@ -4,13 +4,11 @@ SECTION = "net" | |||
4 | LICENSE = "GPL-3.0-only" | 4 | LICENSE = "GPL-3.0-only" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" |
6 | 6 | ||
7 | DEPENDS = "openssl zlib icu libgcrypt gnutls curl aspell zstd" | 7 | DEPENDS = "zlib libgcrypt gnutls curl aspell zstd cjson gettext-native" |
8 | 8 | ||
9 | SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz \ | 9 | SRC_URI = "https://weechat.org/files/src/weechat-${PV}.tar.xz" |
10 | file://0001-use-pkg-config-for-gcrypt-instead.patch \ | ||
11 | " | ||
12 | 10 | ||
13 | SRC_URI[sha256sum] = "ae5f4979b5ada0339b84e741d5f7e481ee91e3fecd40a09907b64751829eb6f6" | 11 | SRC_URI[sha256sum] = "2681fc662996fead9d66a26d81740088e4284cf4e6dfe6b834f3b98fc703597f" |
14 | 12 | ||
15 | inherit cmake pkgconfig | 13 | inherit cmake pkgconfig |
16 | 14 | ||
diff --git a/meta-networking/recipes-irc/znc/znc_1.8.2.bb b/meta-networking/recipes-irc/znc/znc_1.8.2.bb index 1517384eca..7356115d53 100644 --- a/meta-networking/recipes-irc/znc/znc_1.8.2.bb +++ b/meta-networking/recipes-irc/znc/znc_1.8.2.bb | |||
@@ -1,21 +1,14 @@ | |||
1 | SUMMARY = "ZNC, an advanced IRC bouncer" | 1 | SUMMARY = "ZNC, an advanced IRC bouncer" |
2 | SECTION = "net" | 2 | SECTION = "net" |
3 | LICENSE = "GPL-2.0-only" | 3 | LICENSE = "Apache-2.0" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
5 | 5 | ||
6 | DEPENDS = "openssl zlib icu" | 6 | DEPENDS = "openssl zlib icu" |
7 | 7 | ||
8 | SRC_URI = "git://github.com/znc/znc.git;name=znc;branch=master;protocol=https \ | 8 | SRC_URI = "gitsm://github.com/znc/znc.git;branch=master;protocol=https" |
9 | git://github.com/jimloco/Csocket.git;destsuffix=git/third_party/Csocket;name=Csocket;branch=master;protocol=https \ | ||
10 | " | ||
11 | SRCREV_znc = "bf253640d33d03331310778e001fb6f5aba2989e" | ||
12 | SRCREV_Csocket = "e8d9e0bb248c521c2c7fa01e1c6a116d929c41b4" | ||
13 | 9 | ||
14 | # This constructs a composite revision based on multiple SRCREV's. | 10 | SRCREV = "bf253640d33d03331310778e001fb6f5aba2989e" |
15 | # | ||
16 | SRCREV_FORMAT = "znc_Csocket" | ||
17 | 11 | ||
18 | S = "${WORKDIR}/git" | ||
19 | 12 | ||
20 | inherit autotools-brokensep pkgconfig | 13 | inherit autotools-brokensep pkgconfig |
21 | 14 | ||
@@ -29,4 +22,5 @@ do_configure:prepend() { | |||
29 | 22 | ||
30 | do_install:append() { | 23 | do_install:append() { |
31 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc | 24 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc |
25 | sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/znc-buildmod | ||
32 | } | 26 | } |