Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/lurch/
Date: Thu, 03 Dec 2020 16:02:55
Message-Id: 1607011331.6ba43559b8ffd133fd9ce598e832de9335d1169f.sping@gentoo
1 commit: 6ba43559b8ffd133fd9ce598e832de9335d1169f
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Thu Dec 3 15:22:31 2020 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Thu Dec 3 16:02:11 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba43559
7
8 x11-plugins/lurch: Upgrade bundled libomemo
9
10 This fixes communication with users of iOS Monal
11 Related: https://github.com/gkdr/libomemo/issues/24
12 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
13 Package-Manager: Portage-3.0.0, Repoman-2.3.23
14
15 x11-plugins/lurch/Manifest | 1 +
16 x11-plugins/lurch/lurch-0.6.8-r1.ebuild | 76 +++++++++++++++++++++++++++++++++
17 2 files changed, 77 insertions(+)
18
19 diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest
20 index 124d5219be3..7bfc6cb7dff 100644
21 --- a/x11-plugins/lurch/Manifest
22 +++ b/x11-plugins/lurch/Manifest
23 @@ -1 +1,2 @@
24 +DIST libomemo-0.7.0.tar.gz 23678 BLAKE2B 91b57f6c93d5f777996687ea0648d996950bc893314e4e3ee02973c70165a9e533ab6980a420bd270d7a4acaa45da7cf83b401b69e2b305b017a3fbb42d5b4d2 SHA512 f9843a35958e4a7930ed9e9f4bef1e765bd51721d6e79d2c092bad86d26f092d22d1cdd4df1c4017b9434bb84c33e226985136d35dfcbcf9b915eb3cae862fa5
25 DIST lurch-0.6.8.tar.gz 398267 BLAKE2B 23211e82b80e26105f0d62510dc321abdd818eae21dd9f3e24f6ab01458748df64283acb99371a8ece34248f06e9e04edd35da30c771f45779474b3b43c3a53d SHA512 8b93523049d05a00f1d7286ec9d0d8d03c7ae46793ac72ea08c0d12cb5193324be4805fb6278d6c0f906d9c63db9d7ce6ca2a21442236df51e0ee0b48de6ef1d
26
27 diff --git a/x11-plugins/lurch/lurch-0.6.8-r1.ebuild b/x11-plugins/lurch/lurch-0.6.8-r1.ebuild
28 new file mode 100644
29 index 00000000000..67d6325288c
30 --- /dev/null
31 +++ b/x11-plugins/lurch/lurch-0.6.8-r1.ebuild
32 @@ -0,0 +1,76 @@
33 +# Copyright 1999-2020 Gentoo Authors
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=7
37 +CMAKE_MAKEFILE_GENERATOR=emake # since top-level Makefile expects a child Makefile
38 +
39 +inherit toolchain-funcs cmake-utils
40 +
41 +LIBOMEMO_PV=0.7.0
42 +DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)"
43 +HOMEPAGE="https://github.com/gkdr/lurch"
44 +SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz -> ${P}.tar.gz
45 + https://github.com/gkdr/libomemo/archive/v${LIBOMEMO_PV}.tar.gz -> libomemo-${LIBOMEMO_PV}.tar.gz"
46 +
47 +LICENSE="GPL-3"
48 +SLOT="0"
49 +KEYWORDS="~amd64 ~x86"
50 +IUSE=""
51 +
52 +# NOTE
53 +# - We cannot unbundle net-libs/libsignal-protocol-c
54 +# because upstream uses non-API/internal function
55 +# session_builder_process_pre_key_signal_message
56 +# - The build systems of axc (ex-libaxolotl)
57 +# at https://github.com/gkdr/axc and libomemo
58 +# at https://github.com/gkdr/libomemo build static
59 +# libraries only (*.a) so it is not clear when or
60 +# how to best unbundle them, either
61 +RDEPEND="
62 + dev-db/sqlite
63 + dev-libs/glib
64 + dev-libs/libgcrypt:=
65 + dev-libs/libxml2
66 + dev-libs/mxml
67 + net-im/pidgin:=
68 + "
69 +DEPEND="
70 + ${RDEPEND}
71 + virtual/pkgconfig
72 + "
73 +
74 +CMAKE_USE_DIR="${S}"/lib/axc/lib/libsignal-protocol-c
75 +BUILD_DIR="${CMAKE_USE_DIR}"/build
76 +
77 +src_prepare() {
78 + # Upgrade outdated bundle of libomemo
79 + rm -R lib/libomemo || die
80 + mv "${WORKDIR}"/libomemo-${LIBOMEMO_PV} lib/libomemo || die
81 + cmake-utils_src_prepare
82 +}
83 +
84 +src_configure() {
85 + local mycmakeargs=(
86 + -DBUILD_SHARED_LIBS=OFF # top-level Makefile expects .a file
87 + -DCMAKE_C_FLAGS=-fPIC
88 + )
89 + cmake-utils_src_configure
90 +}
91 +
92 +src_compile() {
93 + cmake-utils_src_compile
94 +
95 + local makeargs=(
96 + CC="$(tc-getCC)"
97 + LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)"
98 + PKG_CONFIG="$(tc-getPKG_CONFIG)"
99 + XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)"
100 +
101 + CMAKE=/bin/true # to stop Makefile from calling CMake, once more
102 + )
103 + emake "${makeargs[@]}"
104 +}
105 +
106 +src_install() {
107 + default # use top-level Makefile, not cmake-utils_src_install
108 +}