Date: Thu, 16 Dec 2021 07:42:13 GMT From: Michael Zhilin <mizhka@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: c8d941409ab3 - main - net-im/purple-rocketchat: update to 0.20211002 Message-ID: <202112160742.1BG7gDLG028108@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mizhka (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=c8d941409ab365da2b603939f40957bba6299b21 commit c8d941409ab365da2b603939f40957bba6299b21 Author: Michael Zhilin <mizhka@FreeBSD.org> AuthorDate: 2021-12-16 07:29:14 +0000 Commit: Michael Zhilin <mizhka@FreeBSD.org> CommitDate: 2021-12-16 07:41:29 +0000 net-im/purple-rocketchat: update to 0.20211002 --- net-im/purple-rocketchat/Makefile | 18 ++++++-------- net-im/purple-rocketchat/distinfo | 6 ++--- net-im/purple-rocketchat/files/patch-Makefile | 13 ++++++++++ .../purple-rocketchat/files/patch-librocketchat.c | 29 ++++++++++++++++++++++ net-im/purple-rocketchat/pkg-descr | 2 +- net-im/purple-rocketchat/pkg-plist | 4 +++ 6 files changed, 57 insertions(+), 15 deletions(-) diff --git a/net-im/purple-rocketchat/Makefile b/net-im/purple-rocketchat/Makefile index 7137b9448981..e8b3f1f27194 100644 --- a/net-im/purple-rocketchat/Makefile +++ b/net-im/purple-rocketchat/Makefile @@ -1,10 +1,8 @@ PORTNAME= purple-rocketchat -PORTVERSION= 0.0.20190416 +PORTVERSION= 0.20211002 CATEGORIES= net-im -MASTER_SITES= https://bitbucket.org/EionRobb/purple-rocketchat/get/ -DISTNAME= 826990b48f41 -MAINTAINER= mizhka@gmail.com +MAINTAINER= mizhka@freebsd.org COMMENT= Rocket.Chat Plugin for libpurple LICENSE= GPLv3 @@ -14,15 +12,13 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libmarkdown.a:textproc/discount LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libpurple.so:net-im/libpurple -USES= gmake gnome pkgconfig zip +USES= dos2unix gmake gnome pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= EionRobb +GH_TAGNAME= 5c08ad0eacd39914d27b692d7eb42a94a991fb4c USE_GNOME= glib20 USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/EionRobb-purple-rocketchat-${DISTNAME} -PLIST_FILES= lib/purple-2/librocketchat.so - -do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/lib/purple-2 - ${INSTALL_LIB} ${WRKSRC}/librocketchat.so ${STAGEDIR}${PREFIX}/lib/purple-2 +MAKE_ARGS+= "SOURCE_DATE_EPOCH=1633136402" .include <bsd.port.mk> diff --git a/net-im/purple-rocketchat/distinfo b/net-im/purple-rocketchat/distinfo index f77449e2e87e..cbbd18eeba55 100644 --- a/net-im/purple-rocketchat/distinfo +++ b/net-im/purple-rocketchat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1584639201 -SHA256 (826990b48f41.zip) = 0732819202166e4c9ded127d0dde52c3622ab2bc8f714b0248373ee7914fb179 -SIZE (826990b48f41.zip) = 53090 +TIMESTAMP = 1639637646 +SHA256 (EionRobb-purple-rocketchat-0.20211002-5c08ad0eacd39914d27b692d7eb42a94a991fb4c_GH0.tar.gz) = 364e61e2bdf5a9900ab17547f0ced9f6112bd83a2c160865fab8a2cc0d73eabd +SIZE (EionRobb-purple-rocketchat-0.20211002-5c08ad0eacd39914d27b692d7eb42a94a991fb4c_GH0.tar.gz) = 53086 diff --git a/net-im/purple-rocketchat/files/patch-Makefile b/net-im/purple-rocketchat/files/patch-Makefile new file mode 100644 index 000000000000..8beb64d9cf8e --- /dev/null +++ b/net-im/purple-rocketchat/files/patch-Makefile @@ -0,0 +1,13 @@ +--- Makefile.orig 2021-12-16 07:18:46 UTC ++++ Makefile +@@ -8,8 +8,8 @@ WIN32_CC ?= $(WIN32_DEV_TOP)/mingw-4.7.2/bin/gcc + + PKG_CONFIG ?= pkg-config + +-REVISION_ID = $(shell hg id -i) +-REVISION_NUMBER = $(shell hg id -n) ++REVISION_ID = ++REVISION_NUMBER = + DATE_FMT = %Y.%m.%d + ifdef SOURCE_DATE_EPOCH + BUILD_DATE ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u -r "$(SOURCE_DATE_EPOCH)" "+$(DATE_FMT)" 2>/dev/null || date -u "+$(DATE_FMT)") diff --git a/net-im/purple-rocketchat/files/patch-librocketchat.c b/net-im/purple-rocketchat/files/patch-librocketchat.c new file mode 100644 index 000000000000..890d84b09a61 --- /dev/null +++ b/net-im/purple-rocketchat/files/patch-librocketchat.c @@ -0,0 +1,29 @@ +--- librocketchat.c.orig 2021-10-02 03:16:50 UTC ++++ librocketchat.c +@@ -108,7 +108,7 @@ g_str_insensitive_hash(gconstpointer v) + #ifndef ROCKETCHAT_PLUGIN_VERSION + #define ROCKETCHAT_PLUGIN_VERSION "0.1" + #endif +-#define ROCKETCHAT_PLUGIN_WEBSITE "https://bitbucket.org/EionRobb/purple-rocketchat" ++#define ROCKETCHAT_PLUGIN_WEBSITE "https://github.com/EionRobb/purple-rocketchat" + + #define ROCKETCHAT_USERAGENT "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.103 Safari/537.36" + +@@ -2406,7 +2406,7 @@ rc_socket_got_data(gpointer userdata, PurpleSslConnect + return; + } else if (ya->packet_code == 137) { + // Ping +- gint ping_frame_len; ++ gint ping_frame_len = 0; + length_code = 0; + purple_ssl_read(conn, &length_code, 1); + if (length_code <= 125) { +@@ -3444,7 +3444,7 @@ rc_got_avatar(RocketChatAccount *ya, JsonNode *node, g + + response_str = g_dataset_get_data(node, "raw_body"); + response_len = json_object_get_int_member(response, "len"); +- response_dup = g_memdup(response_str, response_len); ++ response_dup = g_memdup2(response_str, response_len); + + purple_buddy_icons_set_for_user(ya->account, purple_buddy_get_name(buddy), response_dup, response_len, NULL); + } diff --git a/net-im/purple-rocketchat/pkg-descr b/net-im/purple-rocketchat/pkg-descr index ebe1f8ccc64b..252b7bec928b 100644 --- a/net-im/purple-rocketchat/pkg-descr +++ b/net-im/purple-rocketchat/pkg-descr @@ -1,4 +1,4 @@ purple-rocketchat adds support for Rocket.Chat to libpurple clients, such as Pidgin. -WWW: https://bitbucket.org/EionRobb/purple-rocketchat +WWW: https://github.com/EionRobb/purple-rocketchat diff --git a/net-im/purple-rocketchat/pkg-plist b/net-im/purple-rocketchat/pkg-plist new file mode 100644 index 000000000000..4c0ef7a113c7 --- /dev/null +++ b/net-im/purple-rocketchat/pkg-plist @@ -0,0 +1,4 @@ +lib/purple-2/librocketchat.so +share/pixmaps/pidgin/protocols/16/rocketchat.png +share/pixmaps/pidgin/protocols/22/rocketchat.png +share/pixmaps/pidgin/protocols/48/rocketchat.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202112160742.1BG7gDLG028108>