diff --git a/net-im/purple-rocketchat/Makefile b/net-im/purple-rocketchat/Makefile index 9ea2471cff0d..29b39c418758 100644 --- a/net-im/purple-rocketchat/Makefile +++ b/net-im/purple-rocketchat/Makefile @@ -1,25 +1,25 @@ PORTNAME= purple-rocketchat -PORTVERSION= 0.20211002 +PORTVERSION= 0.20220915 CATEGORIES= net-im MAINTAINER= mizhka@freebsd.org COMMENT= Rocket.Chat Plugin for libpurple WWW= https://github.com/EionRobb/purple-rocketchat LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/lib/libmarkdown.a:textproc/discount LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libpurple.so:net-im/libpurple USES= dos2unix gmake gnome pkgconfig USE_GITHUB= yes GH_ACCOUNT= EionRobb -GH_TAGNAME= 5c08ad0eacd39914d27b692d7eb42a94a991fb4c +GH_TAGNAME= a8a887c0c34402293bcf782f1cb76a0046f4a0a0 USE_GNOME= glib20 USE_LDCONFIG= yes MAKE_ARGS+= "SOURCE_DATE_EPOCH=1633136402" .include diff --git a/net-im/purple-rocketchat/distinfo b/net-im/purple-rocketchat/distinfo index cbbd18eeba55..2dc731371aa9 100644 --- a/net-im/purple-rocketchat/distinfo +++ b/net-im/purple-rocketchat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639637646 -SHA256 (EionRobb-purple-rocketchat-0.20211002-5c08ad0eacd39914d27b692d7eb42a94a991fb4c_GH0.tar.gz) = 364e61e2bdf5a9900ab17547f0ced9f6112bd83a2c160865fab8a2cc0d73eabd -SIZE (EionRobb-purple-rocketchat-0.20211002-5c08ad0eacd39914d27b692d7eb42a94a991fb4c_GH0.tar.gz) = 53086 +TIMESTAMP = 1670825327 +SHA256 (EionRobb-purple-rocketchat-0.20220915-a8a887c0c34402293bcf782f1cb76a0046f4a0a0_GH0.tar.gz) = 2548c0c6f7a0027844d76158c927e8a929472aa47244365172eb8cac2be716ad +SIZE (EionRobb-purple-rocketchat-0.20220915-a8a887c0c34402293bcf782f1cb76a0046f4a0a0_GH0.tar.gz) = 53936 diff --git a/net-im/purple-rocketchat/files/patch-Makefile b/net-im/purple-rocketchat/files/patch-Makefile index 8beb64d9cf8e..35d8c0cb3f0f 100644 --- a/net-im/purple-rocketchat/files/patch-Makefile +++ b/net-im/purple-rocketchat/files/patch-Makefile @@ -1,13 +1,11 @@ ---- Makefile.orig 2021-12-16 07:18:46 UTC +--- Makefile.orig 2022-12-12 06:19:27 UTC +++ Makefile -@@ -8,8 +8,8 @@ WIN32_CC ?= $(WIN32_DEV_TOP)/mingw-4.7.2/bin/gcc +@@ -8,7 +8,7 @@ PKG_CONFIG ?= pkg-config PKG_CONFIG ?= pkg-config --REVISION_ID = $(shell hg id -i) --REVISION_NUMBER = $(shell hg id -n) +-REVISION_ID = $(shell git rev-parse --short HEAD 2>/dev/null) +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 index 890d84b09a61..844304f95876 100644 --- a/net-im/purple-rocketchat/files/patch-librocketchat.c +++ b/net-im/purple-rocketchat/files/patch-librocketchat.c @@ -1,29 +1,20 @@ ---- librocketchat.c.orig 2021-10-02 03:16:50 UTC +--- librocketchat.c.orig 2022-12-12 06:20:44 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 +@@ -2484,7 +2484,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 +@@ -3518,7 +3518,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); }