public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-plugins/lurch/
Date: Thu,  3 Dec 2020 16:02:50 +0000 (UTC)	[thread overview]
Message-ID: <1607011331.6ba43559b8ffd133fd9ce598e832de9335d1169f.sping@gentoo> (raw)

commit:     6ba43559b8ffd133fd9ce598e832de9335d1169f
Author:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 15:22:31 2020 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> 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 <sping <AT> 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
+}


             reply	other threads:[~2020-12-03 16:02 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-03 16:02 Sebastian Pipping [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-18 19:48 [gentoo-commits] repo/gentoo:master commit in: x11-plugins/lurch/ Conrad Kostecki
2022-11-29  1:44 Sebastian Pipping
2021-04-03 22:15 Sam James
2021-04-03 22:15 Sam James
2021-02-22 21:09 Sebastian Pipping
2021-02-21 20:54 Sebastian Pipping
2021-02-21 20:54 Sebastian Pipping
2020-12-06  8:14 Joonas Niilola
2020-03-27 23:23 Sebastian Pipping

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1607011331.6ba43559b8ffd133fd9ce598e832de9335d1169f.sping@gentoo \
    --to=sping@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox