From nobody Tue Nov 2 15:59:32 2021 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 21BA1183649A; Tue, 2 Nov 2021 15:59:33 +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 4HkF2r416vz4R7B; Tue, 2 Nov 2021 15:59:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2AA0827A21; Tue, 2 Nov 2021 15:59:32 +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 1A2FxWsp051448; Tue, 2 Nov 2021 15:59:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A2FxWQq051447; Tue, 2 Nov 2021 15:59:32 GMT (envelope-from git) Date: Tue, 2 Nov 2021 15:59:32 GMT Message-Id: <202111021559.1A2FxWQq051447@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 50b9218ce7d5 - main - x11-wm/i3: update to 4.20 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50b9218ce7d5e0d9ac78bb364fde5e3412feb049 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=50b9218ce7d5e0d9ac78bb364fde5e3412feb049 commit 50b9218ce7d5e0d9ac78bb364fde5e3412feb049 Author: Baptiste Daroussin AuthorDate: 2021-11-02 09:55:47 +0000 Commit: Baptiste Daroussin CommitDate: 2021-11-02 15:56:51 +0000 x11-wm/i3: update to 4.20 --- x11-wm/i3/Makefile | 9 ++++----- x11-wm/i3/distinfo | 8 +++----- x11-wm/i3/files/patch-include_libi3.h | 10 ++++++++++ x11-wm/i3/files/patch-src_config__parser.c | 11 +++++++++++ 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile index 6b93d4fc8a6f..3cb8bba2b4fe 100644 --- a/x11-wm/i3/Makefile +++ b/x11-wm/i3/Makefile @@ -1,14 +1,11 @@ # Created by: Dennis Herrmann PORTNAME= i3 -DISTVERSION= 4.19.2 +DISTVERSION= 4.20 CATEGORIES= x11-wm MASTER_SITES= https://i3wm.org/downloads/ \ http://i3wm.org/downloads/ -PATCH_SITES= https://github.com/${PORTNAME}/${PORTNAME}/commit/ -PATCHFILES+= d0067077ed9f.patch:-p1 # https://github.com/i3/i3/pull/4264 - MAINTAINER= bapt@FreeBSD.org COMMENT= Improved dynamic tiling window manager @@ -32,7 +29,9 @@ RUN_DEPENDS= p5-AnyEvent-I3>=0:devel/p5-AnyEvent-I3 \ p5-IPC-Run>=0:devel/p5-IPC-Run \ p5-Try-Tiny>=0:lang/p5-Try-Tiny -USES= compiler:c11 iconv localbase:ldflags meson perl5 pkgconfig tar:xz xorg +USES= compiler:c11 gnome iconv localbase:ldflags meson perl5 \ + pkgconfig tar:xz xorg +USE_GNOME= glib20 USE_XORG= xcb MESON_ARGS= -Ddocs=false \ -Dmans=false diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo index 3a33737becc0..de3d4440c6bc 100644 --- a/x11-wm/i3/distinfo +++ b/x11-wm/i3/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1614605399 -SHA256 (i3-4.19.2.tar.xz) = 8a6ee177689dcf22964d20b6093014ee4fa0419345d3fd515d5512d9980bb279 -SIZE (i3-4.19.2.tar.xz) = 1277396 -SHA256 (d0067077ed9f.patch) = 2131a32d9b96c359ce169b243c8a87e826d508a0842a373009255e2f424a7fe2 -SIZE (d0067077ed9f.patch) = 1174 +TIMESTAMP = 1635845011 +SHA256 (i3-4.20.tar.xz) = 8cf4f174f6cf554f38563380681abe25868e9955883791e0986ecd89c53ac322 +SIZE (i3-4.20.tar.xz) = 1286300 diff --git a/x11-wm/i3/files/patch-include_libi3.h b/x11-wm/i3/files/patch-include_libi3.h new file mode 100644 index 000000000000..660691cc77ab --- /dev/null +++ b/x11-wm/i3/files/patch-include_libi3.h @@ -0,0 +1,10 @@ +--- include/libi3.h.orig 2021-10-19 06:37:59 UTC ++++ include/libi3.h +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/x11-wm/i3/files/patch-src_config__parser.c b/x11-wm/i3/files/patch-src_config__parser.c new file mode 100644 index 000000000000..599675c1b0ed --- /dev/null +++ b/x11-wm/i3/files/patch-src_config__parser.c @@ -0,0 +1,11 @@ +--- src/config_parser.c.orig 2021-10-19 06:37:59 UTC ++++ src/config_parser.c +@@ -864,7 +864,7 @@ parse_file_result_t parse_file(struct parser_ctx *ctx, + FILE *fstr; + char buffer[4096], key[512], value[4096], *continuation = NULL; + +- char *old_dir = get_current_dir_name(); ++ char *old_dir = getwd(NULL); + char *dir = NULL; + /* dirname(3) might modify the buffer, so make a copy: */ + char *dirbuf = sstrdup(f);