From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2EEFA1382C5 for ; Thu, 3 Dec 2020 16:02:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCEE6E083D; Thu, 3 Dec 2020 16:02:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A53E8E083D for ; Thu, 3 Dec 2020 16:02:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6187D34117C for ; Thu, 3 Dec 2020 16:02:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB15D2C5 for ; Thu, 3 Dec 2020 16:02:50 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1607011331.6ba43559b8ffd133fd9ce598e832de9335d1169f.sping@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/lurch/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-plugins/lurch/Manifest x11-plugins/lurch/lurch-0.6.8-r1.ebuild X-VCS-Directories: x11-plugins/lurch/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 6ba43559b8ffd133fd9ce598e832de9335d1169f X-VCS-Branch: master Date: Thu, 3 Dec 2020 16:02:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: eb66c900-61ad-4bbc-8dc7-61080abfa8a1 X-Archives-Hash: b6b4fe32b5e72fa34ce79171debbb8c0 commit: 6ba43559b8ffd133fd9ce598e832de9335d1169f Author: Sebastian Pipping gentoo org> AuthorDate: Thu Dec 3 15:22:31 2020 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Thu Dec 3 16:02:11 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba43559 x11-plugins/lurch: Upgrade bundled libomemo This fixes communication with users of iOS Monal Related: https://github.com/gkdr/libomemo/issues/24 Signed-off-by: Sebastian Pipping gentoo.org> Package-Manager: Portage-3.0.0, Repoman-2.3.23 x11-plugins/lurch/Manifest | 1 + x11-plugins/lurch/lurch-0.6.8-r1.ebuild | 76 +++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/x11-plugins/lurch/Manifest b/x11-plugins/lurch/Manifest index 124d5219be3..7bfc6cb7dff 100644 --- a/x11-plugins/lurch/Manifest +++ b/x11-plugins/lurch/Manifest @@ -1 +1,2 @@ +DIST libomemo-0.7.0.tar.gz 23678 BLAKE2B 91b57f6c93d5f777996687ea0648d996950bc893314e4e3ee02973c70165a9e533ab6980a420bd270d7a4acaa45da7cf83b401b69e2b305b017a3fbb42d5b4d2 SHA512 f9843a35958e4a7930ed9e9f4bef1e765bd51721d6e79d2c092bad86d26f092d22d1cdd4df1c4017b9434bb84c33e226985136d35dfcbcf9b915eb3cae862fa5 DIST lurch-0.6.8.tar.gz 398267 BLAKE2B 23211e82b80e26105f0d62510dc321abdd818eae21dd9f3e24f6ab01458748df64283acb99371a8ece34248f06e9e04edd35da30c771f45779474b3b43c3a53d SHA512 8b93523049d05a00f1d7286ec9d0d8d03c7ae46793ac72ea08c0d12cb5193324be4805fb6278d6c0f906d9c63db9d7ce6ca2a21442236df51e0ee0b48de6ef1d diff --git a/x11-plugins/lurch/lurch-0.6.8-r1.ebuild b/x11-plugins/lurch/lurch-0.6.8-r1.ebuild new file mode 100644 index 00000000000..67d6325288c --- /dev/null +++ b/x11-plugins/lurch/lurch-0.6.8-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +CMAKE_MAKEFILE_GENERATOR=emake # since top-level Makefile expects a child Makefile + +inherit toolchain-funcs cmake-utils + +LIBOMEMO_PV=0.7.0 +DESCRIPTION="OMEMO encryption for libpurple (XEP-0384)" +HOMEPAGE="https://github.com/gkdr/lurch" +SRC_URI="https://github.com/gkdr/lurch/releases/download/v${PV}/lurch-${PV}-src.tar.gz -> ${P}.tar.gz + https://github.com/gkdr/libomemo/archive/v${LIBOMEMO_PV}.tar.gz -> libomemo-${LIBOMEMO_PV}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +# NOTE +# - We cannot unbundle net-libs/libsignal-protocol-c +# because upstream uses non-API/internal function +# session_builder_process_pre_key_signal_message +# - The build systems of axc (ex-libaxolotl) +# at https://github.com/gkdr/axc and libomemo +# at https://github.com/gkdr/libomemo build static +# libraries only (*.a) so it is not clear when or +# how to best unbundle them, either +RDEPEND=" + dev-db/sqlite + dev-libs/glib + dev-libs/libgcrypt:= + dev-libs/libxml2 + dev-libs/mxml + net-im/pidgin:= + " +DEPEND=" + ${RDEPEND} + virtual/pkgconfig + " + +CMAKE_USE_DIR="${S}"/lib/axc/lib/libsignal-protocol-c +BUILD_DIR="${CMAKE_USE_DIR}"/build + +src_prepare() { + # Upgrade outdated bundle of libomemo + rm -R lib/libomemo || die + mv "${WORKDIR}"/libomemo-${LIBOMEMO_PV} lib/libomemo || die + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_SHARED_LIBS=OFF # top-level Makefile expects .a file + -DCMAKE_C_FLAGS=-fPIC + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + local makeargs=( + CC="$(tc-getCC)" + LIBGCRYPT_CONFIG="$(tc-getPROG LIBGCRYPT_CONFIG libgcrypt-config)" + PKG_CONFIG="$(tc-getPKG_CONFIG)" + XML2_CONFIG="$(tc-getPROG XML2_CONFIG xml2-config)" + + CMAKE=/bin/true # to stop Makefile from calling CMake, once more + ) + emake "${makeargs[@]}" +} + +src_install() { + default # use top-level Makefile, not cmake-utils_src_install +}