From nobody Fri Aug 05 05:34:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LzZ6G6d4xz4XscL; Fri, 5 Aug 2022 05:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LzZ6G5kLDz3Wj6; Fri, 5 Aug 2022 05:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659677670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxd/Hi4/Z8pw8yzdLsGZHAkcU+dG82wPnlK15N18D20=; b=Wjr3WqqYBPOy0jCY+DbizvXDWC11G1r6wk7+eBR0+Z99WDekp98Q53QFT17JSYIEOIsJEg PVHAwT6+/+neNzv3eBPBgQ9iLIlMKr6WI75x7OTnqKabmGBKgZWYxV71T7fwgMkIjKgfm2 5XlXtWQBO9CACfGW/WxoBLWYQ+EeFioaWQ/GhjhIcCenjt3FfaRn8V7KAyRbo3E0w8R0D8 WPPsuddDKwP2FOqgcpWV7bSnzf4Yk4EJBH8AcSESWq0VOzMMD9fFR0TLQkiwRTBv138J3V 5xyRaw/fkxMPMNyN/9xO6lnyPW+6BfpSCRg9aydQ+ITR5WZv+h5if14cdoF6oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LzZ6G4mj2zjN8; Fri, 5 Aug 2022 05:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2755YUZ3032963; Fri, 5 Aug 2022 05:34:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2755YUeM032962; Fri, 5 Aug 2022 05:34:30 GMT (envelope-from git) Date: Fri, 5 Aug 2022 05:34:30 GMT Message-Id: <202208050534.2755YUeM032962@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 079567cc4887 - main - irc/irssi-xmpp: Fix build with irssi 1.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 079567cc48874444ea2cad0b91b00040e7a1ddc9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659677670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zxd/Hi4/Z8pw8yzdLsGZHAkcU+dG82wPnlK15N18D20=; b=sPZkRSrTPnExh+TUW2ebb0rzMacWcsMNHCTvL/KC9YE98+jNErOo86WUldk4OitNkyd8nC 1fX+ZNXRCrRGlA1sfGqUK7BNgVnXbdDJlME9X0flaxVrBC4s+KUsSkb3CoNmWEtYOSJCTZ 1jDQhDgCsCAl7KaXDbj48p2bIGvsUtLSFU4eERy/Ktd+XFTmWSzw9hvUafyf3JRy728gZr eeg1gUkC+u3+1UZSAveNAwKDA3bWVgwpvjI6SqWZ86rFHZzRmm0FFwVdT+InKe93QlmuVs TgCrsWV5bnC/bLQ0fZQAlLsdSgdgM+p0Y/XkjFPaZ7IVjtD6jTZ+e8g9wOOF4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659677670; a=rsa-sha256; cv=none; b=QEO6P3FqYl6jyTYVgDPljV+fpJK80tVEZcooZxcwJ6EIYSEvmi/af9zTIW0qq8yseEJBk+ KyOiTQmdlhDcjU60A2Pyw1qYdeeYt8b2S6mKSIan5QHAPn60TUwsFDphMUM3RLF8Pkrz5D /18/Qb87y4qhPhE6XxRsjFZiwbi4N52gDHstCqlAXIYZjjotTqDnsud1bcM84+vsoANf6p iEEITsBQj0pU7HHPjf4fP67vypsT3uYlTvE2EvWqyNJ9T1BQisFfKLmIODzt2NJ7afPH2f ljyhAPew2bzWBQD3EF0mgeTvt4M39E7RH0jBV9C15E9Dbv6ti3oLNya0k1RV+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=079567cc48874444ea2cad0b91b00040e7a1ddc9 commit 079567cc48874444ea2cad0b91b00040e7a1ddc9 Author: Thibault Jouan AuthorDate: 2022-08-04 06:08:46 +0000 Commit: Fernando Apesteguía CommitDate: 2022-08-05 05:31:25 +0000 irc/irssi-xmpp: Fix build with irssi 1.4 PR: 265571 Reported by: tj+freebsd_ports@a13.fr --- irc/irssi-xmpp/Makefile | 21 +++++++++++++++------ irc/irssi-xmpp/distinfo | 10 +++++++--- .../files/patch-src_fe-common_xmpp-completion.c | 17 +++++++++++++++++ 3 files changed, 39 insertions(+), 9 deletions(-) diff --git a/irc/irssi-xmpp/Makefile b/irc/irssi-xmpp/Makefile index 105f760df11e..807e988bf34a 100644 --- a/irc/irssi-xmpp/Makefile +++ b/irc/irssi-xmpp/Makefile @@ -1,30 +1,39 @@ PORTNAME= irssi-xmpp -PORTVERSION= 0.54 +DISTVERSIONPREFIX= v +DISTVERSION= 0.54 +PORTREVISION= 1 CATEGORIES= irc -MASTER_SITES= http://cybione.org/~irssi-xmpp/files/ + +PATCH_SITES= https://github.com/ailin-nemui/${PORTNAME}/commit/ +PATCHFILES+= f84cca86f6cbfa34.patch:-p1 # Use full paths to irssi includes +PATCHFILES+= c7728ea5aa2f4e58.patch:-p1 # GTimeVal -> gint64 transition MAINTAINER= ports@FreeBSD.org COMMENT= Irssi plugin to connect to Jabber network LICENSE= GPLv2 -BROKEN= Doesn't build with Irssi 1.4.1 - BUILD_DEPENDS= irssi:irc/irssi LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth RUN_DEPENDS:= ${BUILD_DEPENDS} USES= gettext-runtime gnome pkgconfig + +USE_GITHUB= yes +GH_ACCOUNT= cdidier + USE_GNOME= glib20 USE_LDCONFIG= yes + MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" -DATADIR= ${PREFIX}/share/irssi -DOCSDIR= ${PREFIX}/share/doc/irssi CFLAGS_aarch64= -fPIC CFLAGS_amd64= -fPIC CFLAGS_i386= -fPIC CFLAGS_powerpc64= -fPIC +DATADIR= ${PREFIX}/share/irssi +DOCSDIR= ${PREFIX}/share/doc/irssi + OPTIONS_DEFINE= DOCS post-patch: diff --git a/irc/irssi-xmpp/distinfo b/irc/irssi-xmpp/distinfo index 7dead12f2d6b..db7fa1412fc6 100644 --- a/irc/irssi-xmpp/distinfo +++ b/irc/irssi-xmpp/distinfo @@ -1,3 +1,7 @@ -TIMESTAMP = 1515367493 -SHA256 (irssi-xmpp-0.54.tar.gz) = 1033cc6bf03abaacdb083e1fbe7d75d8a62622339e06d889422d8f0705fa7776 -SIZE (irssi-xmpp-0.54.tar.gz) = 65618 +TIMESTAMP = 1659436456 +SHA256 (cdidier-irssi-xmpp-v0.54_GH0.tar.gz) = 1033cc6bf03abaacdb083e1fbe7d75d8a62622339e06d889422d8f0705fa7776 +SIZE (cdidier-irssi-xmpp-v0.54_GH0.tar.gz) = 65618 +SHA256 (f84cca86f6cbfa34.patch) = 127828da74eb80f003e920e484f4f6fa834b081e8cc6e8a1153d2e0515d2c0ca +SIZE (f84cca86f6cbfa34.patch) = 29431 +SHA256 (c7728ea5aa2f4e58.patch) = 0c6b906ff1047eda1aa55f0d9952bf74e33a49f8a0c528807f0835de0a61700d +SIZE (c7728ea5aa2f4e58.patch) = 3930 diff --git a/irc/irssi-xmpp/files/patch-src_fe-common_xmpp-completion.c b/irc/irssi-xmpp/files/patch-src_fe-common_xmpp-completion.c new file mode 100644 index 000000000000..5bbc55c55cff --- /dev/null +++ b/irc/irssi-xmpp/files/patch-src_fe-common_xmpp-completion.c @@ -0,0 +1,17 @@ +Fix module loading: + + Irssi: Error loading module xmpp/fe: + /usr/local/lib/irssi/modules/libfe_xmpp.so: Undefined symbol + "glist_find_string" + +--- src/fe-common/xmpp-completion.c.orig 2022-08-02 10:48:55 UTC ++++ src/fe-common/xmpp-completion.c +@@ -287,7 +287,7 @@ get_channels(XMPP_SERVER_REC *server, const char *word + chat_type, XMPP_PROTOCOL_NAME) + || *channel_setup->name != '#') + && g_ascii_strncasecmp(channel_setup->name, word, len) == 0 +- && glist_find_string(list, channel_setup->name) == NULL) ++ && i_list_find_string(list, channel_setup->name) == NULL) + list = g_list_append(list, + g_strdup(channel_setup->name)); + }