From nobody Mon Dec 12 06:42:37 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 4NVsWL06X4z4k3dY; Mon, 12 Dec 2022 06:42:38 +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 4NVsWK6gjrz3LgH; Mon, 12 Dec 2022 06:42:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670827357; 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=dHDIWvpkPox/7YXP/eEdKd/le7+IitZJZjOMGlYD82E=; b=SebUwDkAZpr2ff8bME6qolB1CJ0kjL9+OpeKVrwwUtipWWOQQN/xwrmz3UPr+Uy6bI20D2 OHGH9wnnXcEKwFaKIXoQT5Rwtq4GG2DFmqQZpIhrB68oolvj4foiBWTr38XJVOpMpWLDp6 eabOZDtM0cjjvpI2mMzjxzxtpeotQiuHa34wx7qse+lEMDyMS/5Mjads7DjDqYQWtWxWmd Z1taxBPbEqqJyJKiZyb8iCEaLXXxaUAbwIgrZF4YjNbDoeJYnBOKc2GQP0NYMle5i0C93g TCQBXnLLW7q/MatGYs2i4WZrrxaEkHqzL310QPChrDPM3T+tOWOL0SRdLUQQhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670827357; 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=dHDIWvpkPox/7YXP/eEdKd/le7+IitZJZjOMGlYD82E=; b=eNLngm0H0sLuSSR4ZgD2a/1GGHVdQEWwzj9ijGslviEfObg2hnoENIm6/W2ID77o4lfu8u vC814Z/lIRfuawwoQHrnMyKgB1p16ea4QWee1IS/4psUTqZa5GMJrxP5VzY0z61kdAh4jd L2Cbry1Uc2D0CjhQzSI1EHZ5zhbfPvP7posvcIg5NaMgLL+TMmybmTUPYOTr05ZiVZyWcf eqDFKX4V9QTPbBtsaWDO+UbQcTU6MiP9GNxzG5pOhXXEIlKH8KUtEAfe0l8z1hcgNnk6lv FCLTSHylV0FemmuOMrJvSGo+JTlkOnoVbxxHjLo279X0RYkoMN0SLS8VYW4XyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670827357; a=rsa-sha256; cv=none; b=DniXRrBePI2bj8OwcVXyxtgq51My+AcYlcUF4M9xR7EmYExi8sHEbjo3ZdY15V3il1tFtI W1eVUQHR/es33NKlA+T1G8b608exUdp/K51DNebukKZJk9EM115CHCpns9TUy4YO4zkTgd 36jde3VfRFw2J81yPfIetciUcwOvzh7yIja0TVS1M7rJD0a/mgiOMXNiHf7jNrU65xXirL Rm2zZe5plPSzbL9W67RMsiKGiWNKJxbLzWPfSnpp5sK6IeaPucEABznoO7S6OD0+cG4C5G k8hJx2MlUypHPtbBlh20Cl/bLBbxJYuvcdYyBA+faehfzpPqnFGBh8/GkRLD3g== 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 4NVsWK5l0vzQ41; Mon, 12 Dec 2022 06:42:37 +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 2BC6gbGR097610; Mon, 12 Dec 2022 06:42:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BC6gbUl097609; Mon, 12 Dec 2022 06:42:37 GMT (envelope-from git) Date: Mon, 12 Dec 2022 06:42:37 GMT Message-Id: <202212120642.2BC6gbUl097609@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Michael Zhilin Subject: git: db9d568c842d - main - net-im/purple-rocketchat: bump to 0.20220915 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: mizhka X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: db9d568c842d3f00842206ef4974b0e31825524f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mizhka (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=db9d568c842d3f00842206ef4974b0e31825524f commit db9d568c842d3f00842206ef4974b0e31825524f Author: Michael Zhilin AuthorDate: 2022-12-12 06:27:18 +0000 Commit: Michael Zhilin CommitDate: 2022-12-12 06:42:05 +0000 net-im/purple-rocketchat: bump to 0.20220915 --- net-im/purple-rocketchat/Makefile | 4 ++-- net-im/purple-rocketchat/distinfo | 6 +++--- net-im/purple-rocketchat/files/patch-Makefile | 8 +++----- net-im/purple-rocketchat/files/patch-librocketchat.c | 15 +++------------ 4 files changed, 11 insertions(+), 22 deletions(-) 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,5 +1,5 @@ PORTNAME= purple-rocketchat -PORTVERSION= 0.20211002 +PORTVERSION= 0.20220915 CATEGORIES= net-im MAINTAINER= mizhka@freebsd.org @@ -16,7 +16,7 @@ LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ USES= dos2unix gmake gnome pkgconfig USE_GITHUB= yes GH_ACCOUNT= EionRobb -GH_TAGNAME= 5c08ad0eacd39914d27b692d7eb42a94a991fb4c +GH_TAGNAME= a8a887c0c34402293bcf782f1cb76a0046f4a0a0 USE_GNOME= glib20 USE_LDCONFIG= yes 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,15 +1,6 @@ ---- 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 @@ -18,7 +9,7 @@ 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");