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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 54343158094 for ; Thu, 18 Aug 2022 07:06:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D0F8DE088F; Thu, 18 Aug 2022 07:06:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A7D18E088F for ; Thu, 18 Aug 2022 07:06:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE1293416CC for ; Thu, 18 Aug 2022 07:06:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DC8058E for ; Thu, 18 Aug 2022 07:06:27 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1660806378.2f4aeedeec9c18047dbda18f31325ac3aeb6a617.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/files/, net-im/bitlbee/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/bitlbee/bitlbee-9999.ebuild net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch X-VCS-Directories: net-im/bitlbee/ net-im/bitlbee/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 2f4aeedeec9c18047dbda18f31325ac3aeb6a617 X-VCS-Branch: master Date: Thu, 18 Aug 2022 07:06:27 +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: 405e152b-b0b4-4c4c-a69e-2240708afcb9 X-Archives-Hash: 313af0131abe4baeff8a46875d8a5e1d commit: 2f4aeedeec9c18047dbda18f31325ac3aeb6a617 Author: Petr Vaněk atlas cz> AuthorDate: Mon Aug 1 20:35:08 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Aug 18 07:06:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f4aeede net-im/bitlbee: sync live Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/26703 Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-9999.ebuild | 9 ++- .../files/bitlbee-9999-system-json-parser.patch | 83 ++++++++++++++++++++++ 2 files changed, 89 insertions(+), 3 deletions(-) diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild index d811ebc6f0c2..0a8cc973ae18 100644 --- a/net-im/bitlbee/bitlbee-9999.ebuild +++ b/net-im/bitlbee/bitlbee-9999.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then inherit git-r3 else SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="irc to IM gateway that support multiple IM protocols" @@ -36,6 +36,7 @@ COMMON_DEPEND=" acct-group/bitlbee acct-user/bitlbee dev-libs/glib:2 + dev-libs/json-parser:= purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) @@ -61,7 +62,8 @@ BDEPEND="${PYTHON_DEPS} " PATCHES=( - "${FILESDIR}"/${PN}-3.5-systemd-user.patch + "${FILESDIR}/${PN}-3.5-systemd-user.patch" + "${FILESDIR}/${P}-system-json-parser.patch" ) src_configure() { @@ -112,8 +114,9 @@ src_configure() { --datadir=/usr/share/bitlbee \ --etcdir=/etc/bitlbee \ --libdir=/usr/$(get_libdir) \ - --plugindir=/usr/$(get_libdir)/bitlbee \ --pcdir=/usr/$(get_libdir)/pkgconfig \ + --plugindir=/usr/$(get_libdir)/bitlbee \ + --externaljsonparser=1 \ --systemdsystemunitdir=$(systemd_get_systemunitdir) \ --doc=1 \ --strip=0 \ diff --git a/net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch b/net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch new file mode 100644 index 000000000000..07f2878525ec --- /dev/null +++ b/net-im/bitlbee/files/bitlbee-9999-system-json-parser.patch @@ -0,0 +1,83 @@ +This is adapted patch from upstream PR 151. Original PR defines +--external-json-parser which breaks configuration, see [1]. It was changed to +--externaljsonparser and $external_json_parser to $externaljsonparser. + +[1] https://github.com/bitlbee/bitlbee/pull/151#issuecomment-1201181905 + +Upstream-PR: https://github.com/bitlbee/bitlbee/pull/151 + +diff --git a/configure b/configure +index 4640c806..77b1213b 100755 +--- a/configure ++++ b/configure +@@ -47,6 +47,7 @@ plugins=1 + otr=0 + + events=glib ++externaljsonparser=auto + ssl=auto + + pam=0 +@@ -148,6 +149,7 @@ Option Description Default + --events=... Event handler (glib, libevent) $events + --ssl=... SSL library to use (gnutls, nss, openssl, auto) + $ssl ++--externaljsonparser=0/1/auto Use External JSON parser $externaljsonparser + + + --target=... Cross compilation target same as host +@@ -398,6 +400,20 @@ else + fi + echo 'EVENT_HANDLER=events_'$events'.o' >> Makefile.settings + ++if [ "$externaljsonparser" = "auto" ]; then ++ if pkg-config --exists json-parser; then ++ externaljsonparser=1 ++ else ++ externaljsonparser=0 ++ fi ++fi ++echo "EXTERNAL_JSON_PARSER=$externaljsonparser" >> Makefile.settings ++if [ "$externaljsonparser" = "1" ]; then ++ echo "CFLAGS+=$(pkg-config --cflags json-parser)" >> Makefile.settings ++ echo "LDFLAGS_BITLBEE+=$(pkg-config --libs json-parser)" >> Makefile.settings ++fi ++ ++ + detect_gnutls() + { + if $PKG_CONFIG --exists gnutls; then +@@ -979,6 +995,12 @@ else + echo ' systemd disabled.' + fi + ++if [ "$externaljsonparser" = "1" ]; then ++ echo ' Using system JSON parser.' ++else ++ echo ' Using bundled JSON parser.' ++fi ++ + echo ' Using python: '$PYTHON + echo ' Using event handler: '$events + echo ' Using SSL library: '$ssl + #echo ' Building with these storage backends: '$STORAGES +diff --git a/lib/Makefile b/lib/Makefile +index fc46aedc..ad95d9cb 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -12,7 +12,11 @@ _SRCDIR_ := $(_SRCDIR_)lib/ + endif + + # [SH] Program variables +-objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o ++objects = arc.o base64.o canohost.o $(EVENT_HANDLER) ftutil.o http_client.o ini.o json_util.o md5.o misc.o oauth.o oauth2.o proxy.o sha1.o $(SSL_CLIENT) url.o xmltree.o ns_parse.o ++ ++ifneq ($(EXTERNAL_JSON_PARSER),1) ++objects += json.o ++endif + + LFLAGS += -r + +-- +2.35.1 +