From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 04:18:47 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AB9A2663285; Mon, 23 Aug 2021 04:18:47 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GtJs300s7z3MrQ; Mon, 23 Aug 2021 04:18:47 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pf1-x435.google.com with SMTP id 2so161369pfo.8; Sun, 22 Aug 2021 21:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:message-id:date:mime-version:user-agent:reply-to:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=IM2xBclm9hcCIHa3Z2rXzRGQgNr2Yo1B6w80h9Q9+S4=; b=epvWac4yBtm0w60tqFRzBOzGGCdBpcTQYBB5NozNl9tBkplRwrjyuP4yM1VYYC6E/s a/TTXsdkgFP95iG+OG2So+FodJOtprgKiiDgzszwXUHVrN/7cGMoWWJA8vgnhBq3UN94 Od1hrUqj5guRhqmCA/MsnhROU1fSIq2Z4PLkLxSPBT2CSbJKB/uVWtVc45A4eE4VwuqT 5DKsw1a7M/rfClYUttcd08UQZKkQxSXvcKfBDrU+z70096s/43jUtI1KILFE1+flv0F+ kD+1pvJMTTnZVxzu+6+tFhOOg/X3eRFlLgDSKIIavVpBND0L/4Aed1stwOs21AdKemBF ETTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:message-id:date:mime-version:user-agent :reply-to:subject:content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=IM2xBclm9hcCIHa3Z2rXzRGQgNr2Yo1B6w80h9Q9+S4=; b=qWOZGzLg8V8b5e4PH1NliRSympQ3j1Uzp+YlHowyozofBgH8qGSZA9wwoa/1JPmEkn WD5sqjJb14I1ba3UHwHjoFbVVWvYRAHLfQbwAUTZFkTJqYqHDlhHiQpl5XPNw8Rwzyj4 c3jnHSPUqvkADVaOd/SRiOAjZkiczO0umRD10m8FPlmXgXagEHv3aQ2fetqvIOWbkOYN M/ky3J72ISYIKVAPkD5okmjePoiUvz6rtvF/9L+Q7J8pzxMBApB/LMMvzv7unl/O1pcz p/fSocdjB0Vcq3VzHDMWCa57zMiEX42VcxKDxMBCuR5LVro9MMeXHmWtWPIS4nBSMSI+ vaaA== X-Gm-Message-State: AOAM530Dw6eG1U0V1I3Pe2VdBZdadTbeh7nnuW0xrhcqRdM0EnyaCoM7 N5ZU0rn3AsMZmCwX45Rrp2nslD0NiIg= X-Google-Smtp-Source: ABdhPJyNyuCwb4HxugMuYP4Ef8soQd7UGWA7gReQpqOThWCJKa41pl3mSn8t0b3TA9OIsgI7yH2T9Q== X-Received: by 2002:a63:20f:: with SMTP id 15mr29576271pgc.319.1629692325907; Sun, 22 Aug 2021 21:18:45 -0700 (PDT) Received: from ?IPV6:2403:5800:7500:3601:2510:32c7:10a2:1812? (2403-5800-7500-3601-2510-32c7-10a2-1812.ip6.aussiebb.net. [2403:5800:7500:3601:2510:32c7:10a2:1812]) by smtp.gmail.com with UTF8SMTPSA id t14sm16757210pga.62.2021.08.22.21.18.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 22 Aug 2021 21:18:45 -0700 (PDT) Sender: Kubilay Kocak Message-ID: Date: Mon, 23 Aug 2021 14:18:41 +1000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:93.0) Gecko/20100101 Thunderbird/93.0a1 Reply-To: koobs@FreeBSD.org Subject: Re: git: 8c08a2edf09b - main - devel/py-zipp: Add missing toml build dependency Content-Language: en-US To: "Danilo G. Baio" , ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org References: <202108201149.17KBnx0S083632@gitrepo.freebsd.org> From: Kubilay Kocak In-Reply-To: <202108201149.17KBnx0S083632@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4GtJs300s7z3MrQ X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=epvWac4y; dmarc=none; spf=pass (mx1.freebsd.org: domain of koobsfreebsd@gmail.com designates 2607:f8b0:4864:20::435 as permitted sender) smtp.mailfrom=koobsfreebsd@gmail.com X-Spamd-Result: default: False [0.64 / 15.00]; HAS_REPLYTO(0.00)[koobs@FreeBSD.org]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; REPLYTO_ADDR_EQ_FROM(0.00)[]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; NEURAL_HAM_SHORT(-0.96)[-0.963]; FORGED_SENDER(0.30)[koobs@FreeBSD.org,koobsfreebsd@gmail.com]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_NEQ_ENVFROM(0.00)[koobs@FreeBSD.org,koobsfreebsd@gmail.com]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[FreeBSD.org]; NEURAL_SPAM_MEDIUM(0.87)[0.869]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; NEURAL_SPAM_LONG(0.94)[0.939]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::435:from]; MAILMAN_DEST(0.00)[dev-commits-ports-all,dev-commits-ports-main] X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 04:18:47 -0000 On 20/08/2021 9:49 pm, Danilo G. Baio wrote: > The branch main has been updated by dbaio: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=8c08a2edf09b17f5fd1da63dc4c25f7eec8620b7 > > commit 8c08a2edf09b17f5fd1da63dc4c25f7eec8620b7 > Author: Danilo G. Baio > AuthorDate: 2021-08-20 11:45:04 +0000 > Commit: Danilo G. Baio > CommitDate: 2021-08-20 11:45:04 +0000 > > devel/py-zipp: Add missing toml build dependency > > A build issue occurs when devel/py-setuptools_scm has its TOML option > disabled. > > PR: 256872 > Reported by: Philipp Engel > Approved by: portmgr (blanket) > MFH: 2021Q3 > --- > devel/py-zipp/Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/devel/py-zipp/Makefile b/devel/py-zipp/Makefile > index 273b1e3d1e40..187070c79074 100644 > --- a/devel/py-zipp/Makefile > +++ b/devel/py-zipp/Makefile > @@ -10,7 +10,8 @@ COMMENT= Backport of pathlib-compatible object wrapper for zip files > LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE > > -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} > +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \ > + ${PYTHON_PKGNAMEPREFIX}toml>=0:textproc/py-toml@${PY_FLAVOR} > > USES= python:3.6+ > USE_PYTHON= autoplist distutils > Thanks Danilo! From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 06:20:07 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1B573664754; Mon, 23 Aug 2021 06:20:07 +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 4GtMY26zgcz4dXb; Mon, 23 Aug 2021 06:20:06 +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 D7A9E7424; Mon, 23 Aug 2021 06:20:06 +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 17N6K6e2019499; Mon, 23 Aug 2021 06:20:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17N6K6XU019496; Mon, 23 Aug 2021 06:20:06 GMT (envelope-from git) Date: Mon, 23 Aug 2021 06:20:06 GMT Message-Id: <202108230620.17N6K6XU019496@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: a15225b4441f - main - x11/wezterm: enable toast notifications MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a15225b4441fd381a6216151a8e05707c22eb8a4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 06:20:07 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a15225b4441fd381a6216151a8e05707c22eb8a4 commit a15225b4441fd381a6216151a8e05707c22eb8a4 Author: Jan Beich AuthorDate: 2021-08-23 05:59:33 +0000 Commit: Jan Beich CommitDate: 2021-08-23 06:18:23 +0000 x11/wezterm: enable toast notifications --- x11/wezterm/Makefile | 3 +- x11/wezterm/distinfo | 4 - x11/wezterm/files/patch-zbus | 267 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+), 6 deletions(-) diff --git a/x11/wezterm/Makefile b/x11/wezterm/Makefile index ee75a2759aee..90ce9672f4ad 100644 --- a/x11/wezterm/Makefile +++ b/x11/wezterm/Makefile @@ -1,5 +1,6 @@ PORTNAME= wezterm DISTVERSION= 20210814-124438-54e29167 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -278,7 +279,6 @@ CARGO_CRATES= addr2line-0.16.0 \ native-tls-0.2.7 \ nb-connect-1.2.0 \ net2-0.2.37 \ - nix-0.17.0 \ nix-0.19.1 \ nix-0.20.0 \ nom-5.1.2 \ @@ -482,7 +482,6 @@ CARGO_CRATES= addr2line-0.16.0 \ vcpkg-0.2.15 \ vec_map-0.8.2 \ version_check-0.9.3 \ - void-1.0.2 \ vswhom-0.1.0 \ vswhom-sys-0.1.0 \ waker-fn-1.1.0 \ diff --git a/x11/wezterm/distinfo b/x11/wezterm/distinfo index e998d2a6d9ae..5fa04adda6c7 100644 --- a/x11/wezterm/distinfo +++ b/x11/wezterm/distinfo @@ -477,8 +477,6 @@ SHA256 (rust/crates/nb-connect-1.2.0.crate) = b1bb540dc6ef51cfe1916ec038ce7a620d SIZE (rust/crates/nb-connect-1.2.0.crate) = 8126 SHA256 (rust/crates/net2-0.2.37.crate) = 391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae SIZE (rust/crates/net2-0.2.37.crate) = 21311 -SHA256 (rust/crates/nix-0.17.0.crate) = 50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363 -SIZE (rust/crates/nix-0.17.0.crate) = 195654 SHA256 (rust/crates/nix-0.19.1.crate) = b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2 SIZE (rust/crates/nix-0.19.1.crate) = 213462 SHA256 (rust/crates/nix-0.20.0.crate) = fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a @@ -885,8 +883,6 @@ SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f2 SIZE (rust/crates/vec_map-0.8.2.crate) = 14466 SHA256 (rust/crates/version_check-0.9.3.crate) = 5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe SIZE (rust/crates/version_check-0.9.3.crate) = 12547 -SHA256 (rust/crates/void-1.0.2.crate) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d -SIZE (rust/crates/void-1.0.2.crate) = 2356 SHA256 (rust/crates/vswhom-0.1.0.crate) = be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b SIZE (rust/crates/vswhom-0.1.0.crate) = 9420 SHA256 (rust/crates/vswhom-sys-0.1.0.crate) = fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532 diff --git a/x11/wezterm/files/patch-zbus b/x11/wezterm/files/patch-zbus new file mode 100644 index 000000000000..614cf51d53f0 --- /dev/null +++ b/x11/wezterm/files/patch-zbus @@ -0,0 +1,267 @@ +https://gitlab.freedesktop.org/dbus/zbus/-/commit/01d8f0ec41d3 +https://gitlab.freedesktop.org/dbus/zbus/-/commit/807909a6c7bf +https://gitlab.freedesktop.org/dbus/zbus/-/commit/e3e2f7ddfd6e +https://gitlab.freedesktop.org/dbus/zbus/-/commit/35d1b8778754 +https://github.com/wez/wezterm/pull/829 + +--- cargo-crates/zbus-1.9.1/Cargo.toml.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/Cargo.toml +@@ -48,7 +48,7 @@ version = "0.3.8" + version = "1.0.2" + + [dependencies.nix] +-version = "^0.17" ++version = "0.20.0" + + [dependencies.once_cell] + version = "1.4.0" +--- cargo-crates/zbus-1.9.1/src/address.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/address.rs +@@ -55,8 +55,9 @@ impl Address { + match env::var("DBUS_SESSION_BUS_ADDRESS") { + Ok(val) => Self::from_str(&val), + _ => { +- let uid = Uid::current(); +- let path = format!("unix:path=/run/user/{}/bus", uid); ++ let runtime_dir = env::var("XDG_RUNTIME_DIR") ++ .unwrap_or_else(|_| format!("/run/user/{}", Uid::current())); ++ let path = format!("unix:path={}/bus", runtime_dir); + + Self::from_str(&path) + } +--- cargo-crates/zbus-1.9.1/src/azync/connection.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/azync/connection.rs +@@ -177,13 +177,29 @@ where + /// Upon successful return, the connection is fully established and negotiated: D-Bus messages + /// can be sent and received. + pub async fn new_server(stream: S, guid: &Guid) -> Result { +- use nix::sys::socket::{getsockopt, sockopt::PeerCredentials}; ++ #[cfg(any(target_os = "android", target_os = "linux"))] ++ let client_uid = { ++ use nix::sys::socket::{getsockopt, sockopt::PeerCredentials}; + +- // FIXME: Could and should this be async? +- let creds = getsockopt(stream.as_raw_fd(), PeerCredentials) +- .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?; ++ let creds = getsockopt(stream.as_raw_fd(), PeerCredentials) ++ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?; + +- let auth = Authenticated::server(Async::new(stream)?, guid.clone(), creds.uid()).await?; ++ creds.uid() ++ }; ++ #[cfg(any( ++ target_os = "macos", ++ target_os = "ios", ++ target_os = "freebsd", ++ target_os = "dragonfly", ++ target_os = "openbsd", ++ target_os = "netbsd" ++ ))] ++ let client_uid = nix::unistd::getpeereid(stream.as_raw_fd()) ++ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))? ++ .0 ++ .into(); ++ ++ let auth = Authenticated::server(Async::new(stream)?, guid.clone(), client_uid).await?; + + Ok(Self::new_authenticated(auth)) + } +--- cargo-crates/zbus-1.9.1/src/connection.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/connection.rs +@@ -160,12 +160,29 @@ impl Connection { + /// Upon successful return, the connection is fully established and negotiated: D-Bus messages + /// can be sent and received. + pub fn new_unix_server(stream: UnixStream, guid: &Guid) -> Result { +- use nix::sys::socket::{getsockopt, sockopt::PeerCredentials}; ++ #[cfg(any(target_os = "android", target_os = "linux"))] ++ let client_uid = { ++ use nix::sys::socket::{getsockopt, sockopt::PeerCredentials}; + +- let creds = getsockopt(stream.as_raw_fd(), PeerCredentials) +- .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?; ++ let creds = getsockopt(stream.as_raw_fd(), PeerCredentials) ++ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?; + +- let handshake = ServerHandshake::new(stream, guid.clone(), creds.uid()); ++ creds.uid() ++ }; ++ #[cfg(any( ++ target_os = "macos", ++ target_os = "ios", ++ target_os = "freebsd", ++ target_os = "dragonfly", ++ target_os = "openbsd", ++ target_os = "netbsd" ++ ))] ++ let client_uid = nix::unistd::getpeereid(stream.as_raw_fd()) ++ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))? ++ .0 ++ .into(); ++ ++ let handshake = ServerHandshake::new(stream, guid.clone(), client_uid); + handshake + .blocking_finish() + .map(Connection::new_authenticated_unix) +--- cargo-crates/zbus-1.9.1/src/handshake.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/handshake.rs +@@ -124,7 +124,7 @@ impl ClientHandshake { + + fn flush_buffer(&mut self) -> Result<()> { + while !self.buffer.is_empty() { +- let written = self.socket.sendmsg(&self.buffer, &[])?; ++ let written = self.socket.sendmsg(&self.buffer, &[], false)?; + self.buffer.drain(..written); + } + Ok(()) +@@ -182,6 +182,15 @@ impl Handshake for ClientHandshake { + self.step = ClientHandshakeStep::SendingOauth; + } + ClientHandshakeStep::SendingOauth => { ++ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] ++ { ++ let zero = self.buffer.drain(..1).next().unwrap(); ++ if self.socket.sendmsg(&[zero], &[], true)? != 1 { ++ return Err(Error::Handshake( ++ "Could not send zero byte with credentials".to_string(), ++ )); ++ } ++ } + self.flush_buffer()?; + self.step = ClientHandshakeStep::WaitOauth; + } +@@ -385,7 +394,7 @@ impl ServerHandshake { + + fn flush_buffer(&mut self) -> Result<()> { + while !self.buffer.is_empty() { +- let written = self.socket.sendmsg(&self.buffer, &[])?; ++ let written = self.socket.sendmsg(&self.buffer, &[], false)?; + self.buffer.drain(..written); + } + Ok(()) +--- cargo-crates/zbus-1.9.1/src/raw/connection.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/raw/connection.rs +@@ -47,7 +47,7 @@ impl Connection { + // VecDeque should never return an empty front buffer if the VecDeque + // itself is not empty + debug_assert!(!front.is_empty()); +- let written = self.socket.sendmsg(front, &[])?; ++ let written = self.socket.sendmsg(front, &[], false)?; + self.raw_out_buffer.drain(..written); + } + +@@ -55,14 +55,14 @@ impl Connection { + while let Some(msg) = self.msg_out_buffer.front() { + let mut data = msg.as_bytes(); + let fds = msg.fds(); +- let written = self.socket.sendmsg(data, &fds)?; ++ let written = self.socket.sendmsg(data, &fds, false)?; + // at least some part of the message has been sent, see if we can/need to send more + // now the message must be removed from msg_out_buffer and any leftover bytes + // must be stored into raw_out_buffer + let msg = self.msg_out_buffer.pop_front().unwrap(); + data = &msg.as_bytes()[written..]; + while !data.is_empty() { +- match self.socket.sendmsg(data, &[]) { ++ match self.socket.sendmsg(data, &[], false) { + Ok(n) => data = &data[n..], + Err(e) => { + // an error occured, we cannot send more, store the remaining into +--- cargo-crates/zbus-1.9.1/src/raw/socket.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/raw/socket.rs +@@ -47,7 +47,7 @@ pub trait Socket { + /// + /// If the underlying transport does not support transmitting file descriptors, this + /// will return `Err(ErrorKind::InvalidInput)`. +- fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd]) -> io::Result; ++ fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd], creds: bool) -> io::Result; + + /// Close the socket. + /// +@@ -74,6 +74,10 @@ impl Socket for UnixStream { + Ok(msg) => { + let mut fds = vec![]; + for cmsg in msg.cmsgs() { ++ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] ++ if let ControlMessageOwned::ScmCreds(_) = cmsg { ++ continue; ++ } + if let ControlMessageOwned::ScmRights(fd) = cmsg { + fds.extend(fd.iter().map(|&f| unsafe { OwnedFd::from_raw_fd(f) })); + } else { +@@ -90,12 +94,23 @@ impl Socket for UnixStream { + } + } + +- fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd]) -> io::Result { +- let cmsg = if !fds.is_empty() { ++ fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd], creds: bool) -> io::Result { ++ let mut cmsg = if !fds.is_empty() { + vec![ControlMessage::ScmRights(fds)] + } else { + vec![] + }; ++ #[cfg(any(target_os = "android", target_os = "linux"))] ++ let unix_creds; ++ if creds { ++ #[cfg(any(target_os = "android", target_os = "linux"))] ++ { ++ unix_creds = Some(nix::sys::socket::UnixCredentials::new()); ++ cmsg.push(ControlMessage::ScmCredentials(unix_creds.as_ref().unwrap())); ++ } ++ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] ++ cmsg.push(ControlMessage::ScmCreds); ++ } + let iov = [IoVec::from_slice(buffer)]; + match sendmsg(self.as_raw_fd(), &iov, &cmsg, MsgFlags::empty(), None) { + // can it really happen? +@@ -124,8 +139,8 @@ where + self.get_mut().recvmsg(buffer) + } + +- fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd]) -> io::Result { +- self.get_mut().sendmsg(buffer, fds) ++ fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd], creds: bool) -> io::Result { ++ self.get_mut().sendmsg(buffer, fds, creds) + } + + fn close(&self) -> io::Result<()> { +--- wezterm-toast-notification/Cargo.toml.orig 2021-08-14 19:44:38 UTC ++++ wezterm-toast-notification/Cargo.toml +@@ -11,7 +11,7 @@ build = "build.rs" + open = "2.0" + log = "0.4" + +-[target.'cfg(all(not(windows), not(target_os="macos"), not(target_os="freebsd")))'.dependencies] ++[target.'cfg(all(not(windows), not(target_os="macos")))'.dependencies] + serde = {version="1.0", features = ["derive"]} + zbus = "1.8" + zvariant = "2.0" +--- wezterm-toast-notification/src/dbus.rs.orig 2021-08-14 19:44:38 UTC ++++ wezterm-toast-notification/src/dbus.rs +@@ -1,4 +1,4 @@ +-#![cfg(all(not(target_os = "macos"), not(windows), not(target_os = "freebsd")))] ++#![cfg(all(not(target_os = "macos"), not(windows)))] + //! See + + use crate::ToastNotification; +--- wezterm-toast-notification/src/lib.rs.orig 2021-08-14 19:44:38 UTC ++++ wezterm-toast-notification/src/lib.rs +@@ -18,7 +18,7 @@ impl ToastNotification { + + #[cfg(windows)] + use crate::windows as backend; +-#[cfg(all(not(target_os = "macos"), not(windows), not(target_os = "freebsd")))] ++#[cfg(all(not(target_os = "macos"), not(windows)))] + use dbus as backend; + #[cfg(target_os = "macos")] + use macos as backend; +@@ -31,9 +31,6 @@ mod nop { + Ok(()) + } + } +- +-#[cfg(target_os = "freebsd")] +-use nop as backend; + + pub fn show(notif: ToastNotification) { + if let Err(err) = backend::show_notif(notif) { From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 06:22:36 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 01B1A664E5D; Mon, 23 Aug 2021 06:22:36 +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 4GtMbv6KJvz4fgK; Mon, 23 Aug 2021 06:22:35 +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 C11F57614; Mon, 23 Aug 2021 06:22:35 +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 17N6MZCH029375; Mon, 23 Aug 2021 06:22:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17N6MZM8029374; Mon, 23 Aug 2021 06:22:35 GMT (envelope-from git) Date: Mon, 23 Aug 2021 06:22:35 GMT Message-Id: <202108230622.17N6MZM8029374@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 262d20cfc2b5 - 2021Q3 - x11/wezterm: enable toast notifications MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: 262d20cfc2b50beeda7f9caa458e8cb4176dbaed Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 06:22:36 -0000 The branch 2021Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=262d20cfc2b50beeda7f9caa458e8cb4176dbaed commit 262d20cfc2b50beeda7f9caa458e8cb4176dbaed Author: Jan Beich AuthorDate: 2021-08-23 05:59:33 +0000 Commit: Jan Beich CommitDate: 2021-08-23 06:22:28 +0000 x11/wezterm: enable toast notifications (cherry picked from commit a15225b4441fd381a6216151a8e05707c22eb8a4) --- x11/wezterm/Makefile | 4 +- x11/wezterm/distinfo | 4 - x11/wezterm/files/patch-zbus | 267 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 268 insertions(+), 7 deletions(-) diff --git a/x11/wezterm/Makefile b/x11/wezterm/Makefile index 203c4dad76de..55214e6c05af 100644 --- a/x11/wezterm/Makefile +++ b/x11/wezterm/Makefile @@ -1,6 +1,6 @@ PORTNAME= wezterm DISTVERSION= 20210502-154244-3f7122cb -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -246,7 +246,6 @@ CARGO_CRATES= ab_glyph_rasterizer-0.1.4 \ nanorand-0.5.2 \ nb-connect-1.2.0 \ net2-0.2.37 \ - nix-0.17.0 \ nix-0.18.0 \ nix-0.19.1 \ nix-0.20.0 \ @@ -431,7 +430,6 @@ CARGO_CRATES= ab_glyph_rasterizer-0.1.4 \ vcpkg-0.2.12 \ vec_map-0.8.2 \ version_check-0.9.3 \ - void-1.0.2 \ vswhom-0.1.0 \ vswhom-sys-0.1.0 \ waker-fn-1.1.0 \ diff --git a/x11/wezterm/distinfo b/x11/wezterm/distinfo index e7ec3baea7c0..bf4420546d7b 100644 --- a/x11/wezterm/distinfo +++ b/x11/wezterm/distinfo @@ -413,8 +413,6 @@ SHA256 (rust/crates/nb-connect-1.2.0.crate) = b1bb540dc6ef51cfe1916ec038ce7a620d SIZE (rust/crates/nb-connect-1.2.0.crate) = 8126 SHA256 (rust/crates/net2-0.2.37.crate) = 391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae SIZE (rust/crates/net2-0.2.37.crate) = 21311 -SHA256 (rust/crates/nix-0.17.0.crate) = 50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363 -SIZE (rust/crates/nix-0.17.0.crate) = 195654 SHA256 (rust/crates/nix-0.18.0.crate) = 83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055 SIZE (rust/crates/nix-0.18.0.crate) = 209962 SHA256 (rust/crates/nix-0.19.1.crate) = b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2 @@ -783,8 +781,6 @@ SHA256 (rust/crates/vec_map-0.8.2.crate) = f1bddf1187be692e79c5ffeab891132dfb0f2 SIZE (rust/crates/vec_map-0.8.2.crate) = 14466 SHA256 (rust/crates/version_check-0.9.3.crate) = 5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe SIZE (rust/crates/version_check-0.9.3.crate) = 12547 -SHA256 (rust/crates/void-1.0.2.crate) = 6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d -SIZE (rust/crates/void-1.0.2.crate) = 2356 SHA256 (rust/crates/vswhom-0.1.0.crate) = be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b SIZE (rust/crates/vswhom-0.1.0.crate) = 9420 SHA256 (rust/crates/vswhom-sys-0.1.0.crate) = fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532 diff --git a/x11/wezterm/files/patch-zbus b/x11/wezterm/files/patch-zbus new file mode 100644 index 000000000000..229122850542 --- /dev/null +++ b/x11/wezterm/files/patch-zbus @@ -0,0 +1,267 @@ +https://gitlab.freedesktop.org/dbus/zbus/-/commit/01d8f0ec41d3 +https://gitlab.freedesktop.org/dbus/zbus/-/commit/807909a6c7bf +https://gitlab.freedesktop.org/dbus/zbus/-/commit/e3e2f7ddfd6e +https://gitlab.freedesktop.org/dbus/zbus/-/commit/35d1b8778754 +https://github.com/wez/wezterm/pull/829 + +--- cargo-crates/zbus-1.9.1/Cargo.toml.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/Cargo.toml +@@ -48,7 +48,7 @@ version = "0.3.8" + version = "1.0.2" + + [dependencies.nix] +-version = "^0.17" ++version = "0.20.0" + + [dependencies.once_cell] + version = "1.4.0" +--- cargo-crates/zbus-1.9.1/src/address.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/address.rs +@@ -55,8 +55,9 @@ impl Address { + match env::var("DBUS_SESSION_BUS_ADDRESS") { + Ok(val) => Self::from_str(&val), + _ => { +- let uid = Uid::current(); +- let path = format!("unix:path=/run/user/{}/bus", uid); ++ let runtime_dir = env::var("XDG_RUNTIME_DIR") ++ .unwrap_or_else(|_| format!("/run/user/{}", Uid::current())); ++ let path = format!("unix:path={}/bus", runtime_dir); + + Self::from_str(&path) + } +--- cargo-crates/zbus-1.9.1/src/azync/connection.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/azync/connection.rs +@@ -177,13 +177,29 @@ where + /// Upon successful return, the connection is fully established and negotiated: D-Bus messages + /// can be sent and received. + pub async fn new_server(stream: S, guid: &Guid) -> Result { +- use nix::sys::socket::{getsockopt, sockopt::PeerCredentials}; ++ #[cfg(any(target_os = "android", target_os = "linux"))] ++ let client_uid = { ++ use nix::sys::socket::{getsockopt, sockopt::PeerCredentials}; + +- // FIXME: Could and should this be async? +- let creds = getsockopt(stream.as_raw_fd(), PeerCredentials) +- .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?; ++ let creds = getsockopt(stream.as_raw_fd(), PeerCredentials) ++ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?; + +- let auth = Authenticated::server(Async::new(stream)?, guid.clone(), creds.uid()).await?; ++ creds.uid() ++ }; ++ #[cfg(any( ++ target_os = "macos", ++ target_os = "ios", ++ target_os = "freebsd", ++ target_os = "dragonfly", ++ target_os = "openbsd", ++ target_os = "netbsd" ++ ))] ++ let client_uid = nix::unistd::getpeereid(stream.as_raw_fd()) ++ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))? ++ .0 ++ .into(); ++ ++ let auth = Authenticated::server(Async::new(stream)?, guid.clone(), client_uid).await?; + + Ok(Self::new_authenticated(auth)) + } +--- cargo-crates/zbus-1.9.1/src/connection.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/connection.rs +@@ -160,12 +160,29 @@ impl Connection { + /// Upon successful return, the connection is fully established and negotiated: D-Bus messages + /// can be sent and received. + pub fn new_unix_server(stream: UnixStream, guid: &Guid) -> Result { +- use nix::sys::socket::{getsockopt, sockopt::PeerCredentials}; ++ #[cfg(any(target_os = "android", target_os = "linux"))] ++ let client_uid = { ++ use nix::sys::socket::{getsockopt, sockopt::PeerCredentials}; + +- let creds = getsockopt(stream.as_raw_fd(), PeerCredentials) +- .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?; ++ let creds = getsockopt(stream.as_raw_fd(), PeerCredentials) ++ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))?; + +- let handshake = ServerHandshake::new(stream, guid.clone(), creds.uid()); ++ creds.uid() ++ }; ++ #[cfg(any( ++ target_os = "macos", ++ target_os = "ios", ++ target_os = "freebsd", ++ target_os = "dragonfly", ++ target_os = "openbsd", ++ target_os = "netbsd" ++ ))] ++ let client_uid = nix::unistd::getpeereid(stream.as_raw_fd()) ++ .map_err(|e| Error::Handshake(format!("Failed to get peer credentials: {}", e)))? ++ .0 ++ .into(); ++ ++ let handshake = ServerHandshake::new(stream, guid.clone(), client_uid); + handshake + .blocking_finish() + .map(Connection::new_authenticated_unix) +--- cargo-crates/zbus-1.9.1/src/handshake.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/handshake.rs +@@ -124,7 +124,7 @@ impl ClientHandshake { + + fn flush_buffer(&mut self) -> Result<()> { + while !self.buffer.is_empty() { +- let written = self.socket.sendmsg(&self.buffer, &[])?; ++ let written = self.socket.sendmsg(&self.buffer, &[], false)?; + self.buffer.drain(..written); + } + Ok(()) +@@ -182,6 +182,15 @@ impl Handshake for ClientHandshake { + self.step = ClientHandshakeStep::SendingOauth; + } + ClientHandshakeStep::SendingOauth => { ++ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] ++ { ++ let zero = self.buffer.drain(..1).next().unwrap(); ++ if self.socket.sendmsg(&[zero], &[], true)? != 1 { ++ return Err(Error::Handshake( ++ "Could not send zero byte with credentials".to_string(), ++ )); ++ } ++ } + self.flush_buffer()?; + self.step = ClientHandshakeStep::WaitOauth; + } +@@ -385,7 +394,7 @@ impl ServerHandshake { + + fn flush_buffer(&mut self) -> Result<()> { + while !self.buffer.is_empty() { +- let written = self.socket.sendmsg(&self.buffer, &[])?; ++ let written = self.socket.sendmsg(&self.buffer, &[], false)?; + self.buffer.drain(..written); + } + Ok(()) +--- cargo-crates/zbus-1.9.1/src/raw/connection.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/raw/connection.rs +@@ -47,7 +47,7 @@ impl Connection { + // VecDeque should never return an empty front buffer if the VecDeque + // itself is not empty + debug_assert!(!front.is_empty()); +- let written = self.socket.sendmsg(front, &[])?; ++ let written = self.socket.sendmsg(front, &[], false)?; + self.raw_out_buffer.drain(..written); + } + +@@ -55,14 +55,14 @@ impl Connection { + while let Some(msg) = self.msg_out_buffer.front() { + let mut data = msg.as_bytes(); + let fds = msg.fds(); +- let written = self.socket.sendmsg(data, &fds)?; ++ let written = self.socket.sendmsg(data, &fds, false)?; + // at least some part of the message has been sent, see if we can/need to send more + // now the message must be removed from msg_out_buffer and any leftover bytes + // must be stored into raw_out_buffer + let msg = self.msg_out_buffer.pop_front().unwrap(); + data = &msg.as_bytes()[written..]; + while !data.is_empty() { +- match self.socket.sendmsg(data, &[]) { ++ match self.socket.sendmsg(data, &[], false) { + Ok(n) => data = &data[n..], + Err(e) => { + // an error occured, we cannot send more, store the remaining into +--- cargo-crates/zbus-1.9.1/src/raw/socket.rs.orig 1970-01-01 00:00:00 UTC ++++ cargo-crates/zbus-1.9.1/src/raw/socket.rs +@@ -47,7 +47,7 @@ pub trait Socket { + /// + /// If the underlying transport does not support transmitting file descriptors, this + /// will return `Err(ErrorKind::InvalidInput)`. +- fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd]) -> io::Result; ++ fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd], creds: bool) -> io::Result; + + /// Close the socket. + /// +@@ -74,6 +74,10 @@ impl Socket for UnixStream { + Ok(msg) => { + let mut fds = vec![]; + for cmsg in msg.cmsgs() { ++ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] ++ if let ControlMessageOwned::ScmCreds(_) = cmsg { ++ continue; ++ } + if let ControlMessageOwned::ScmRights(fd) = cmsg { + fds.extend(fd.iter().map(|&f| unsafe { OwnedFd::from_raw_fd(f) })); + } else { +@@ -90,12 +94,23 @@ impl Socket for UnixStream { + } + } + +- fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd]) -> io::Result { +- let cmsg = if !fds.is_empty() { ++ fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd], creds: bool) -> io::Result { ++ let mut cmsg = if !fds.is_empty() { + vec![ControlMessage::ScmRights(fds)] + } else { + vec![] + }; ++ #[cfg(any(target_os = "android", target_os = "linux"))] ++ let unix_creds; ++ if creds { ++ #[cfg(any(target_os = "android", target_os = "linux"))] ++ { ++ unix_creds = Some(nix::sys::socket::UnixCredentials::new()); ++ cmsg.push(ControlMessage::ScmCredentials(unix_creds.as_ref().unwrap())); ++ } ++ #[cfg(any(target_os = "freebsd", target_os = "dragonfly"))] ++ cmsg.push(ControlMessage::ScmCreds); ++ } + let iov = [IoVec::from_slice(buffer)]; + match sendmsg(self.as_raw_fd(), &iov, &cmsg, MsgFlags::empty(), None) { + // can it really happen? +@@ -124,8 +139,8 @@ where + self.get_mut().recvmsg(buffer) + } + +- fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd]) -> io::Result { +- self.get_mut().sendmsg(buffer, fds) ++ fn sendmsg(&mut self, buffer: &[u8], fds: &[RawFd], creds: bool) -> io::Result { ++ self.get_mut().sendmsg(buffer, fds, creds) + } + + fn close(&self) -> io::Result<()> { +--- wezterm-toast-notification/Cargo.toml.orig 2021-05-02 22:42:44 UTC ++++ wezterm-toast-notification/Cargo.toml +@@ -11,7 +11,7 @@ build = "build.rs" + open = "1.4" + log = "0.4" + +-[target.'cfg(all(not(windows), not(target_os="macos"), not(target_os="freebsd")))'.dependencies] ++[target.'cfg(all(not(windows), not(target_os="macos")))'.dependencies] + serde = {version="1.0", features = ["derive"]} + zbus = "1.8" + zvariant = "2.0" +--- wezterm-toast-notification/src/dbus.rs.orig 2021-05-02 22:42:44 UTC ++++ wezterm-toast-notification/src/dbus.rs +@@ -1,4 +1,4 @@ +-#![cfg(all(not(target_os = "macos"), not(windows), not(target_os = "freebsd")))] ++#![cfg(all(not(target_os = "macos"), not(windows)))] + //! See + + use crate::ToastNotification; +--- wezterm-toast-notification/src/lib.rs.orig 2021-05-02 22:42:44 UTC ++++ wezterm-toast-notification/src/lib.rs +@@ -18,7 +18,7 @@ impl ToastNotification { + + #[cfg(windows)] + use crate::windows as backend; +-#[cfg(all(not(target_os = "macos"), not(windows), not(target_os = "freebsd")))] ++#[cfg(all(not(target_os = "macos"), not(windows)))] + use dbus as backend; + #[cfg(target_os = "macos")] + use macos as backend; +@@ -31,9 +31,6 @@ mod nop { + Ok(()) + } + } +- +-#[cfg(target_os = "freebsd")] +-use nop as backend; + + pub fn show(notif: ToastNotification) { + if let Err(err) = backend::show_notif(notif) { From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 08:12:00 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A5AF8666935; Mon, 23 Aug 2021 08:12:00 +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 4GtQ284BT9z3P0C; Mon, 23 Aug 2021 08:12:00 +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 7805510F5D; Mon, 23 Aug 2021 08:12:00 +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 17N8C0fM075380; Mon, 23 Aug 2021 08:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17N8C0C0075379; Mon, 23 Aug 2021 08:12:00 GMT (envelope-from git) Date: Mon, 23 Aug 2021 08:12:00 GMT Message-Id: <202108230812.17N8C0C0075379@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 2ddff4b91cdd - main - databases/adodb5: update to 5.21.2 hotfix release MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ddff4b91cddcd2bd61288b48e149a0594ddfa71 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 08:12:00 -0000 The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ddff4b91cddcd2bd61288b48e149a0594ddfa71 commit 2ddff4b91cddcd2bd61288b48e149a0594ddfa71 Author: Dima Panov AuthorDate: 2021-08-23 08:10:31 +0000 Commit: Dima Panov CommitDate: 2021-08-23 08:10:31 +0000 databases/adodb5: update to 5.21.2 hotfix release Changelog: * Fix syntax error in toexport.inc.php #749 * pgsql: fix fetchField() parameter naming #752 --- databases/adodb5/Makefile | 2 +- databases/adodb5/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/databases/adodb5/Makefile b/databases/adodb5/Makefile index 5ff70dd4de63..a06d175ca4dd 100644 --- a/databases/adodb5/Makefile +++ b/databases/adodb5/Makefile @@ -1,7 +1,7 @@ # Created by: mm@FreeBSD.org PORTNAME= adodb -PORTVERSION= 5.21.1 +PORTVERSION= 5.21.2 DISTVERSIONPREFIX= v CATEGORIES= databases www PKGNAMESUFFIX= 5${PHP_PKGNAMESUFFIX} diff --git a/databases/adodb5/distinfo b/databases/adodb5/distinfo index 9f0012e6f310..4a04d180d4a8 100644 --- a/databases/adodb5/distinfo +++ b/databases/adodb5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629107005 -SHA256 (adodb-ADOdb-v5.21.1_GH0.tar.gz) = 9a7e9c0a4e7f091cd51d21418c14944e2d3b5fb3e1c1fff5aa2b28789c69e111 -SIZE (adodb-ADOdb-v5.21.1_GH0.tar.gz) = 434535 +TIMESTAMP = 1629705756 +SHA256 (adodb-ADOdb-v5.21.2_GH0.tar.gz) = 9262fe53fb2e25aee53a4490133c55a8837e7197baa1c8c77237a4754ed3bb20 +SIZE (adodb-ADOdb-v5.21.2_GH0.tar.gz) = 434575 From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 08:13:07 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E99E066681A; Mon, 23 Aug 2021 08:13:07 +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 4GtQ3R69LPz3PZm; Mon, 23 Aug 2021 08:13:07 +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 BBF1A11093; Mon, 23 Aug 2021 08:13:07 +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 17N8D7H3075641; Mon, 23 Aug 2021 08:13:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17N8D7Ur075640; Mon, 23 Aug 2021 08:13:07 GMT (envelope-from git) Date: Mon, 23 Aug 2021 08:13:07 GMT Message-Id: <202108230813.17N8D7Ur075640@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 4c31ba907d01 - main - www/h2c: Add a new port MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c31ba907d019165606b96b0f636bbf68e1e0c5a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 08:13:08 -0000 The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c31ba907d019165606b96b0f636bbf68e1e0c5a commit 4c31ba907d019165606b96b0f636bbf68e1e0c5a Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-08-23 06:05:05 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-08-23 08:13:07 +0000 www/h2c: Add a new port h2c stands for headers 2 curl. Provided a set of HTTP request headers, it outputs the curl command line for generating the desired request. WWW: https://curl.se/h2c/ --- www/Makefile | 1 + www/h2c/Makefile | 25 +++++++++++++++++++++++++ www/h2c/distinfo | 3 +++ www/h2c/pkg-descr | 4 ++++ 4 files changed, 33 insertions(+) diff --git a/www/Makefile b/www/Makefile index fe5854b5cbb9..c7ca045a6dc5 100644 --- a/www/Makefile +++ b/www/Makefile @@ -221,6 +221,7 @@ SUBDIR += guile-www SUBDIR += gurl SUBDIR += gwsocket + SUBDIR += h2c SUBDIR += h2o SUBDIR += h2o-devel SUBDIR += habari diff --git a/www/h2c/Makefile b/www/h2c/Makefile new file mode 100644 index 000000000000..c3489031f0b0 --- /dev/null +++ b/www/h2c/Makefile @@ -0,0 +1,25 @@ +PORTNAME= h2c +DISTVERSION= 1.0 +CATEGORIES= www + +MAINTAINER= 0mp@FreeBSD.org +COMMENT= Provided a set of HTTP request headers, output a curl command line + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= perl5 shebangfix +USE_GITHUB= yes +GH_ACCOUNT= curl +USE_PERL5= run +SHEBANG_FILES= ${PORTNAME} + +NO_ARCH= yes +NO_BUILD= yes + +PLIST_FILES= bin/${PORTNAME} + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}/${PREFIX}/bin + +.include diff --git a/www/h2c/distinfo b/www/h2c/distinfo new file mode 100644 index 000000000000..4f9f71410539 --- /dev/null +++ b/www/h2c/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1629697915 +SHA256 (curl-h2c-1.0_GH0.tar.gz) = 1c5e4d76131abb5151c89cc54945256509dad9d12cab36205aa5bcd7f8a311af +SIZE (curl-h2c-1.0_GH0.tar.gz) = 6418 diff --git a/www/h2c/pkg-descr b/www/h2c/pkg-descr new file mode 100644 index 000000000000..fbd8e6a5eaad --- /dev/null +++ b/www/h2c/pkg-descr @@ -0,0 +1,4 @@ +h2c stands for headers 2 curl. Provided a set of HTTP request headers, +it outputs the curl command line for generating the desired request. + +WWW: https://curl.se/h2c/ From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 08:17:15 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD81D6664D4; Mon, 23 Aug 2021 08:17:15 +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 4GtQ8C4xJpz3QXs; Mon, 23 Aug 2021 08:17:15 +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 8D5AD10F97; Mon, 23 Aug 2021 08:17:15 +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 17N8HF4e076275; Mon, 23 Aug 2021 08:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17N8HFK4076274; Mon, 23 Aug 2021 08:17:15 GMT (envelope-from git) Date: Mon, 23 Aug 2021 08:17:15 GMT Message-Id: <202108230817.17N8HFK4076274@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: 80236c9d744b - main - lang/chicken5: take maintainership MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80236c9d744badff69982f2b049765e49be3e7ca Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 08:17:15 -0000 The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=80236c9d744badff69982f2b049765e49be3e7ca commit 80236c9d744badff69982f2b049765e49be3e7ca Author: Pietro Cerutti AuthorDate: 2021-08-23 08:16:38 +0000 Commit: Pietro Cerutti CommitDate: 2021-08-23 08:17:12 +0000 lang/chicken5: take maintainership --- lang/chicken5/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/chicken5/Makefile b/lang/chicken5/Makefile index 30acc450c438..c0c1d9b01a0c 100644 --- a/lang/chicken5/Makefile +++ b/lang/chicken5/Makefile @@ -6,7 +6,7 @@ CATEGORIES= lang scheme MASTER_SITES= https://code.call-cc.org/releases/${DISTVERSION}/ PKGNAMESUFFIX= 5 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= gahr@FreeBSD.org COMMENT= Scheme-to-C compiler LICENSE= BSD3CLAUSE PD From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 10:41:59 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3254B6689FD; Mon, 23 Aug 2021 10:41:59 +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 4GtTMC0XWTz4p9q; Mon, 23 Aug 2021 10:41:59 +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 EE55B12C27; Mon, 23 Aug 2021 10:41:58 +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 17NAfwbg074628; Mon, 23 Aug 2021 10:41:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NAfw9p074627; Mon, 23 Aug 2021 10:41:58 GMT (envelope-from git) Date: Mon, 23 Aug 2021 10:41:58 GMT Message-Id: <202108231041.17NAfw9p074627@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: b26b441a3e7e - main - java/intellij-ultimate: update to 2021.2 release. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b26b441a3e7e0fca13108735bec166e214609fee Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 10:41:59 -0000 The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=b26b441a3e7e0fca13108735bec166e214609fee commit b26b441a3e7e0fca13108735bec166e214609fee Author: Alex Dupre AuthorDate: 2021-08-23 10:41:35 +0000 Commit: Alex Dupre CommitDate: 2021-08-23 10:41:52 +0000 java/intellij-ultimate: update to 2021.2 release. --- java/intellij-ultimate/Makefile | 4 +- java/intellij-ultimate/distinfo | 6 +- java/intellij-ultimate/pkg-plist | 672 ++++++++++++--------------------------- 3 files changed, 202 insertions(+), 480 deletions(-) diff --git a/java/intellij-ultimate/Makefile b/java/intellij-ultimate/Makefile index 8fd448f46973..82e5c3d6f24a 100644 --- a/java/intellij-ultimate/Makefile +++ b/java/intellij-ultimate/Makefile @@ -3,7 +3,7 @@ # Based on the java/intellij port PORTNAME= intellij-ultimate -PORTVERSION= 2021.1.2 +PORTVERSION= 2021.2 CATEGORIES= java devel MASTER_SITES= https://download-cf.jetbrains.com/idea/ DISTNAME= ideaIU-${PORTVERSION}-no-jbr @@ -39,7 +39,7 @@ NO_BUILD= yes SUB_FILES= idea idea.desktop pkg-message BUILD_TYPE= IU -BUILD_VERSION= 211.7442.40 +BUILD_VERSION= 212.4746.92 BUILD_MARKER= ${BUILD_TYPE}-${BUILD_VERSION} PLIST_SUB= BUILD_MARKER=${BUILD_MARKER} WRKSRC= ${WRKDIR}/idea-${BUILD_MARKER} diff --git a/java/intellij-ultimate/distinfo b/java/intellij-ultimate/distinfo index 506c45880c7c..73b6cf6331bc 100644 --- a/java/intellij-ultimate/distinfo +++ b/java/intellij-ultimate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622704109 -SHA256 (jetbrains/ideaIU-2021.1.2-no-jbr.tar.gz) = a59f601182b3b457daeb3f545812ffa85fe4501cfaf185dfc973851915538457 -SIZE (jetbrains/ideaIU-2021.1.2-no-jbr.tar.gz) = 775158741 +TIMESTAMP = 1629704853 +SHA256 (jetbrains/ideaIU-2021.2-no-jbr.tar.gz) = 554e0613e69fcb94d899329305df3b8ae0a96604af70ed77034a44e49e0d7d3d +SIZE (jetbrains/ideaIU-2021.2-no-jbr.tar.gz) = 796513623 diff --git a/java/intellij-ultimate/pkg-plist b/java/intellij-ultimate/pkg-plist index aad3cc103222..505e98529e83 100644 --- a/java/intellij-ultimate/pkg-plist +++ b/java/intellij-ultimate/pkg-plist @@ -2,27 +2,25 @@ bin/idea man/man1/idea.1.gz share/applications/idea.desktop %%DATADIR%%/Install-Linux-tar.txt +%%DATADIR%%/bin/appInfo.xml %%DATADIR%%/bin/appletviewer.policy +%%DATADIR%%/bin/brokenPlugins.db %%DATADIR%%/bin/format.sh +%%DATADIR%%/bin/icons.db %%DATADIR%%/bin/idea.png %%DATADIR%%/bin/idea.properties %%DATADIR%%/bin/idea.sh %%DATADIR%%/bin/idea.svg -%%DATADIR%%/bin/idea.vmoptions %%DATADIR%%/bin/idea64.vmoptions %%DATADIR%%/bin/inspect.sh %%DATADIR%%/bin/log.xml %%DATADIR%%/bin/ltedit.sh %%DATADIR%%/bin/printenv.py %%DATADIR%%/bin/restart.py -%%DATADIR%%/brokenPlugins.db %%DATADIR%%/build.txt -%%DATADIR%%/classpath.txt %%DATADIR%%/help/ReferenceCard.pdf %%DATADIR%%/help/ReferenceCardForMac.pdf -%%DATADIR%%/icons.db -%%DATADIR%%/lib/HdrHistogram-2.1.4.jar -%%DATADIR%%/lib/aapt2-proto-0.3.1.jar +%%DATADIR%%/lib/3rd-party.jar %%DATADIR%%/lib/annotations.jar %%DATADIR%%/lib/ant/CONTRIBUTORS %%DATADIR%%/lib/ant/INSTALL @@ -84,40 +82,18 @@ share/applications/idea.desktop %%DATADIR%%/lib/ant/lib/ant.pom %%DATADIR%%/lib/ant/lib/libraries.properties %%DATADIR%%/lib/ant/src.zip -%%DATADIR%%/lib/ap-validation-0.0.5.jar %%DATADIR%%/lib/asm-7.1.jar -%%DATADIR%%/lib/asm-all-9.1.jar %%DATADIR%%/lib/asm-analysis-7.1.jar %%DATADIR%%/lib/asm-commons-7.1.jar %%DATADIR%%/lib/asm-tree-7.1.jar %%DATADIR%%/lib/asm-util-7.1.jar -%%DATADIR%%/lib/async-profiler-1.8.3.jar -%%DATADIR%%/lib/automaton-1.12-1.jar -%%DATADIR%%/lib/baksmali-2.2.4.jar -%%DATADIR%%/lib/batik-codec-1.14.0-24.jar -%%DATADIR%%/lib/batik-transcoder.jar -%%DATADIR%%/lib/blockmap-1.0.2.jar +%%DATADIR%%/lib/async-profiler-2.1-ea-2.jar +%%DATADIR%%/lib/async-profiler-windows-1.8.3-5.jar %%DATADIR%%/lib/bootstrap.jar -%%DATADIR%%/lib/bouncy-castle-provider.jar %%DATADIR%%/lib/build-marker-%%BUILD_MARKER%% %%DATADIR%%/lib/byte-buddy-agent-1.10.1.jar -%%DATADIR%%/lib/caffeine-2.8.8.jar %%DATADIR%%/lib/cds/classesLogAgent.jar -%%DATADIR%%/lib/cglib-nodep-3.2.4.jar -%%DATADIR%%/lib/classgraph-4.8.102.jar -%%DATADIR%%/lib/cli-parser-1.1.5.jar -%%DATADIR%%/lib/cloud-config-client.jar -%%DATADIR%%/lib/commons-cli-1.4.jar -%%DATADIR%%/lib/commons-codec-1.15.jar -%%DATADIR%%/lib/commons-collections-3.2.2.jar -%%DATADIR%%/lib/commons-compress-1.20.jar -%%DATADIR%%/lib/commons-httpclient-3.1-patched.jar -%%DATADIR%%/lib/commons-imaging-1.0-RC-1.jar -%%DATADIR%%/lib/commons-io-2.8.0.jar -%%DATADIR%%/lib/commons-lang3-3.10.jar -%%DATADIR%%/lib/commons-logging-1.2.jar -%%DATADIR%%/lib/commons-net-3.6.jar -%%DATADIR%%/lib/core-3.4.0.jar +%%DATADIR%%/lib/classpath.txt %%DATADIR%%/lib/coverage-common.jar %%DATADIR%%/lib/dbus-java-3.2.1.jar %%DATADIR%%/lib/dexlib2.jar @@ -125,65 +101,28 @@ share/applications/idea.desktop %%DATADIR%%/lib/dom-openapi.jar %%DATADIR%%/lib/error_prone_annotations-2.3.1.jar %%DATADIR%%/lib/external-system-rt.jar -%%DATADIR%%/lib/fluent-hc-4.5.13.jar -%%DATADIR%%/lib/forms-1.1-preview.jar +%%DATADIR%%/lib/find-action-model-0.0.3.jar %%DATADIR%%/lib/forms_rt.jar %%DATADIR%%/lib/grazie-spellchecker-0.1.9.jar -%%DATADIR%%/lib/groovy-2.5.11.jar -%%DATADIR%%/lib/groovy-json-2.5.11.jar -%%DATADIR%%/lib/groovy-jsr223-2.5.11.jar -%%DATADIR%%/lib/groovy-templates-2.5.11.jar -%%DATADIR%%/lib/groovy-xml-2.5.11.jar -%%DATADIR%%/lib/grpc-core.jar -%%DATADIR%%/lib/grpc-kotlin-stub-1.0.0.jar +%%DATADIR%%/lib/groovy-2.5.14.jar +%%DATADIR%%/lib/groovy-json-2.5.14.jar +%%DATADIR%%/lib/groovy-jsr223-2.5.14.jar +%%DATADIR%%/lib/groovy-templates-2.5.14.jar +%%DATADIR%%/lib/groovy-xml-2.5.14.jar %%DATADIR%%/lib/grpc-netty-shaded-1.34.1.jar -%%DATADIR%%/lib/grpc-protobuf.jar -%%DATADIR%%/lib/grpc-stub-1.34.1.jar -%%DATADIR%%/lib/gson-2.8.6.jar -%%DATADIR%%/lib/guava.jar -%%DATADIR%%/lib/h2-mvstore-1.4.200.jar -%%DATADIR%%/lib/http-client.jar -%%DATADIR%%/lib/icons.jar -%%DATADIR%%/lib/icu4j-67.1.jar %%DATADIR%%/lib/idea.jar %%DATADIR%%/lib/idea_rt.jar -%%DATADIR%%/lib/imageio-tiff.jar -%%DATADIR%%/lib/imgscalr-lib-4.2.jar -%%DATADIR%%/lib/ini4j-0.5.5-2.jar -%%DATADIR%%/lib/intellij-coverage-agent-1.0.579.jar -%%DATADIR%%/lib/intellij-deps-fastutil-8.5.2-6.jar -%%DATADIR%%/lib/intellij-dvcs.jar -%%DATADIR%%/lib/intellij-test-discovery-agent-1.0.579.jar -%%DATADIR%%/lib/intellij-xml.jar -%%DATADIR%%/lib/ion-java-1.6.2-3.jar +%%DATADIR%%/lib/intellij-coverage-agent-1.0.589.jar +%%DATADIR%%/lib/intellij-test-discovery-agent-1.0.589.jar %%DATADIR%%/lib/isorelax-20030108.jar -%%DATADIR%%/lib/jackson-core-2.12.0.jar -%%DATADIR%%/lib/jackson-databind.jar -%%DATADIR%%/lib/jackson-dataformat-yaml-2.12.1.jar -%%DATADIR%%/lib/jackson-module-kotlin-2.12.0.jar -%%DATADIR%%/lib/java-compatibility-1.0.1.jar -%%DATADIR%%/lib/java-string-similarity-1.2.1.jar -%%DATADIR%%/lib/java-ultimate-icons.jar +%%DATADIR%%/lib/java-string-similarity-2.0.0.jar %%DATADIR%%/lib/java-utils-1.0.6.jar -%%DATADIR%%/lib/javax.activation-1.2.0.jar -%%DATADIR%%/lib/javax.annotation-api-1.3.2.jar -%%DATADIR%%/lib/javax.inject-1.jar -%%DATADIR%%/lib/javax.servlet-api-3.0.1.jar -%%DATADIR%%/lib/javax.servlet.jsp-api-2.2.1.jar -%%DATADIR%%/lib/jaxb-api-2.3.1.jar -%%DATADIR%%/lib/jaxb-runtime.jar -%%DATADIR%%/lib/jaxen-1.2.0.jar -%%DATADIR%%/lib/jb-jdi-2.4.jar -%%DATADIR%%/lib/jcef-87.1.13-g481a82a-chromium-87.0.4280.141-api-1.2.jar -%%DATADIR%%/lib/jcip-annotations-1.0.jar %%DATADIR%%/lib/jdkAnnotations.jar -%%DATADIR%%/lib/jdom.jar -%%DATADIR%%/lib/jediterm-pty-2.42.jar -%%DATADIR%%/lib/jetCheck-0.2.2.jar -%%DATADIR%%/lib/jettison-1.4.0.jar %%DATADIR%%/lib/jffi-1.2.19-native.jar %%DATADIR%%/lib/jffi-1.2.19.jar %%DATADIR%%/lib/jing-20030619.jar +%%DATADIR%%/lib/jmc-common-8.0.0-7.jar +%%DATADIR%%/lib/jmc-flightrecorder-8.0.0-7.jar %%DATADIR%%/lib/jna-platform.jar %%DATADIR%%/lib/jna.jar %%DATADIR%%/lib/jnr-a64asm-1.0.0.jar @@ -193,83 +132,36 @@ share/applications/idea.desktop %%DATADIR%%/lib/jnr-posix-3.0.50.jar %%DATADIR%%/lib/jnr-unixsocket-0.23.jar %%DATADIR%%/lib/jnr-x86asm-1.0.2.jar -%%DATADIR%%/lib/joni.jar %%DATADIR%%/lib/jps-model.jar -%%DATADIR%%/lib/jsch-0.1.55.jar -%%DATADIR%%/lib/jsch-agent-proxy.jar -%%DATADIR%%/lib/jsch.agentproxy.jsch-0.0.9.jar -%%DATADIR%%/lib/jsch.agentproxy.sshj-0.0.9.jar %%DATADIR%%/lib/jshell-frontend.jar -%%DATADIR%%/lib/json.jar -%%DATADIR%%/lib/jsonpath.jar -%%DATADIR%%/lib/jsoup-1.12.1.jar %%DATADIR%%/lib/jsp-base-openapi.jar -%%DATADIR%%/lib/jts-io-common.jar %%DATADIR%%/lib/junit.jar %%DATADIR%%/lib/junit4.jar %%DATADIR%%/lib/junixsocket-core.jar -%%DATADIR%%/lib/jzlib-1.1.3.jar %%DATADIR%%/lib/kotlin-gradle-plugin-model-1.4.32.jar -%%DATADIR%%/lib/kotlin-reflect-1.4.32.jar +%%DATADIR%%/lib/kotlin-reflect-1.5.10-release-896.jar %%DATADIR%%/lib/kotlin-stdlib-jdk8.jar %%DATADIR%%/lib/kotlin-test.jar +%%DATADIR%%/lib/kotlinx-coroutines-debug-1.5.0.jar %%DATADIR%%/lib/kotlinx-coroutines-jdk8.jar -%%DATADIR%%/lib/kotlinx-serialization-core-jvm-1.0.1.jar -%%DATADIR%%/lib/kotlinx-serialization-json-jvm-1.0.1.jar -%%DATADIR%%/lib/kryo.jar -%%DATADIR%%/lib/ktor-websockets-1.5.0.jar -%%DATADIR%%/lib/kxml2-2.3.0.jar -%%DATADIR%%/lib/libam-instrumentation-data-proto-27.1.1.0.jar -%%DATADIR%%/lib/libstudio.proto-27.1.1.0.jar -%%DATADIR%%/lib/log4j.jar -%%DATADIR%%/lib/lz4-java-1.7.1.jar -%%DATADIR%%/lib/markdown-0.1.41.jar -%%DATADIR%%/lib/markdown4j-2.2-cj-1.1.jar -%%DATADIR%%/lib/markdownj-core-0.4.2-SNAPSHOT.jar -%%DATADIR%%/lib/marketplace-zip-signer-0.1.3.jar -%%DATADIR%%/lib/maven-resolver-provider.jar -%%DATADIR%%/lib/microba.jar -%%DATADIR%%/lib/miglayout-swing.jar -%%DATADIR%%/lib/nanoxml-2.2.3.jar -%%DATADIR%%/lib/netty-buffer.jar -%%DATADIR%%/lib/netty-codec-http.jar -%%DATADIR%%/lib/netty-handler-proxy.jar -%%DATADIR%%/lib/ngram-slp-0.0.3.jar -%%DATADIR%%/lib/objenesis-3.1.jar -%%DATADIR%%/lib/okhttp.jar +%%DATADIR%%/lib/kotlinx-serialization-core-jvm-1.1.0.jar +%%DATADIR%%/lib/kotlinx-serialization-json-jvm-1.1.0.jar %%DATADIR%%/lib/openapi.jar -%%DATADIR%%/lib/org.eclipse.lsp4j-0.10.0.jar -%%DATADIR%%/lib/org.eclipse.lsp4j.jsonrpc-0.10.0.jar -%%DATADIR%%/lib/oro-2.0.8.jar -%%DATADIR%%/lib/owasp-java-html-sanitizer-20191001.1.jar %%DATADIR%%/lib/platform-api.jar %%DATADIR%%/lib/platform-impl.jar %%DATADIR%%/lib/platform-objectSerializer-annotations.jar %%DATADIR%%/lib/platform-statistics-devkit.jar -%%DATADIR%%/lib/plexus-utils-3.3.0.jar -%%DATADIR%%/lib/proto-27.1.1.0.jar -%%DATADIR%%/lib/protobuf-java-3.13.0.jar -%%DATADIR%%/lib/proxy-vole.jar +%%DATADIR%%/lib/protobuf-java-3.15.8.jar %%DATADIR%%/lib/pty4j-native %%DATADIR%%/lib/pty4j.jar -%%DATADIR%%/lib/qdox-2.0.0.jar -%%DATADIR%%/lib/rd-core-0.211.234.jar -%%DATADIR%%/lib/rd-framework-0.211.234.jar -%%DATADIR%%/lib/rd-swing-0.211.234.jar -%%DATADIR%%/lib/resources.jar -%%DATADIR%%/lib/resources_en.jar -%%DATADIR%%/lib/rhino-runtime-1.7.13.jar +%%DATADIR%%/lib/rd-core-0.212.307.jar +%%DATADIR%%/lib/rd-framework-0.212.307.jar +%%DATADIR%%/lib/rd-swing-0.212.307.jar %%DATADIR%%/lib/rngom-20051226-patched.jar -%%DATADIR%%/lib/roaringbitmap.jar -%%DATADIR%%/lib/rocksdbjni-6.15.2.jar %%DATADIR%%/lib/rt/servlet.jar %%DATADIR%%/lib/rt/xerces1.jar %%DATADIR%%/lib/rt/xml-apis.jar -%%DATADIR%%/lib/serviceMessages-2019.1.4.jar %%DATADIR%%/lib/slf4j.jar -%%DATADIR%%/lib/snakeyaml-1.27.jar -%%DATADIR%%/lib/snakeyaml-engine-2.2.1.jar -%%DATADIR%%/lib/spellchecker.jar %%DATADIR%%/lib/sqlite-jdbc-3.34.0.jar %%DATADIR%%/lib/src/src_css-api.zip %%DATADIR%%/lib/src/src_database-openapi.zip @@ -279,35 +171,22 @@ share/applications/idea.desktop %%DATADIR%%/lib/src/src_spring-boot-openapi.zip %%DATADIR%%/lib/src/src_spring-openapi.zip %%DATADIR%%/lib/src/src_tomcat.zip -%%DATADIR%%/lib/sshj.jar %%DATADIR%%/lib/stats.jar -%%DATADIR%%/lib/stax-api-1.0.1.jar -%%DATADIR%%/lib/streamex-0.7.3.jar -%%DATADIR%%/lib/swingx-core-1.6.2-2.jar %%DATADIR%%/lib/testFramework-java.jar %%DATADIR%%/lib/testFramework.core.jar %%DATADIR%%/lib/testFramework.jar %%DATADIR%%/lib/tests_bootstrap.jar -%%DATADIR%%/lib/tips-intellij-idea-211.34.jar +%%DATADIR%%/lib/tips-intellij-idea-212.40.jar %%DATADIR%%/lib/trang-core.jar -%%DATADIR%%/lib/trove4j.jar %%DATADIR%%/lib/uast-tests.jar %%DATADIR%%/lib/util.jar -%%DATADIR%%/lib/velocity.jar %%DATADIR%%/lib/winp-1.28.jar -%%DATADIR%%/lib/xercesImpl-2.12.0.jar -%%DATADIR%%/lib/xml-apis-ext-1.3.04.jar -%%DATADIR%%/lib/xml-resolver-1.2.jar -%%DATADIR%%/lib/xmlbeans-2.6.0.jar -%%DATADIR%%/lib/xmlrpc-2.0.1.jar -%%DATADIR%%/lib/xstream.jar -%%DATADIR%%/lib/xz-1.8.jar +%%DATADIR%%/lib/xmlbeans-4.0.0.jar %%DATADIR%%/license/XStream_license.txt %%DATADIR%%/license/ant_license.txt %%DATADIR%%/license/asm_license.txt %%DATADIR%%/license/eclipse_license.txt %%DATADIR%%/license/eclipse_license2.txt -%%DATADIR%%/license/growl.license %%DATADIR%%/license/gson_license.txt %%DATADIR%%/license/imgscalr_license.txt %%DATADIR%%/license/j2ee_license.txt @@ -339,7 +218,6 @@ share/applications/idea.desktop %%DATADIR%%/license/xmlrpc_license.txt %%DATADIR%%/license/yourkit-license-redist.txt %%DATADIR%%/plugins/AngularJS/lib/AngularJS.jar -%%DATADIR%%/plugins/AngularJS/lib/resources_en.jar %%DATADIR%%/plugins/AngularJS/ngCli/commands/generate-impl.js %%DATADIR%%/plugins/AngularJS/ngCli/commands/generate.json %%DATADIR%%/plugins/AngularJS/ngCli/generate.js @@ -355,19 +233,14 @@ share/applications/idea.desktop %%DATADIR%%/plugins/AngularJS/ngCli/schematicsProvider90.js %%DATADIR%%/plugins/AppServersIntegration/lib/AppServersView.jar %%DATADIR%%/plugins/AppServersIntegration/lib/app-servers-integration.jar -%%DATADIR%%/plugins/AppServersIntegration/lib/resources_en.jar %%DATADIR%%/plugins/BatchApplications/lib/batch-applications-support.jar -%%DATADIR%%/plugins/BatchApplications/lib/resources_en.jar %%DATADIR%%/plugins/BeanValidation/lib/bean_validation.jar -%%DATADIR%%/plugins/BeanValidation/lib/resources_en.jar %%DATADIR%%/plugins/ByteCodeViewer/lib/byteCodeViewer.jar -%%DATADIR%%/plugins/ByteCodeViewer/lib/resources_en.jar %%DATADIR%%/plugins/CDI/lib/cdi-support.jar -%%DATADIR%%/plugins/CDI/lib/resources_en.jar %%DATADIR%%/plugins/CSS/lib/css-openapi.jar %%DATADIR%%/plugins/CSS/lib/css.jar -%%DATADIR%%/plugins/CSS/lib/resources_en.jar %%DATADIR%%/plugins/DatabaseTools/lib/aether-dependency-resolver.jar +%%DATADIR%%/plugins/DatabaseTools/lib/completion-ranking-sql-0.1.1.jar %%DATADIR%%/plugins/DatabaseTools/lib/database-dialects.jar %%DATADIR%%/plugins/DatabaseTools/lib/database-impl.jar %%DATADIR%%/plugins/DatabaseTools/lib/database-minicats.jar @@ -376,16 +249,13 @@ share/applications/idea.desktop %%DATADIR%%/plugins/DatabaseTools/lib/maven-resolver-connector-basic-1.3.3.jar %%DATADIR%%/plugins/DatabaseTools/lib/maven-resolver-transport-file-1.3.3.jar %%DATADIR%%/plugins/DatabaseTools/lib/maven-resolver-transport-http-1.3.3.jar -%%DATADIR%%/plugins/DatabaseTools/lib/resources_en.jar -%%DATADIR%%/plugins/DatabaseTools/lib/tips-database-plugin-211.77.jar +%%DATADIR%%/plugins/DatabaseTools/lib/mssql-1.19.jar +%%DATADIR%%/plugins/DatabaseTools/lib/oracle-1.54.jar +%%DATADIR%%/plugins/DatabaseTools/lib/postgres-1.35.jar +%%DATADIR%%/plugins/DatabaseTools/lib/redshift-1.39.jar +%%DATADIR%%/plugins/DatabaseTools/lib/snowflake-1.17.jar +%%DATADIR%%/plugins/DatabaseTools/lib/tips-database-plugin-212.78.jar %%DATADIR%%/plugins/DatabaseTools/lib/unidecode-0.0.7.jar -%%DATADIR%%/plugins/Docker/lib/Docker-agent-api-rt.jar -%%DATADIR%%/plugins/Docker/lib/Docker-agent-impl-rt.jar -%%DATADIR%%/plugins/Docker/lib/Docker-compose.jar -%%DATADIR%%/plugins/Docker/lib/Docker-core.jar -%%DATADIR%%/plugins/Docker/lib/Docker-file.jar -%%DATADIR%%/plugins/Docker/lib/Docker-java-impl.jar -%%DATADIR%%/plugins/Docker/lib/Docker-remote-run.jar %%DATADIR%%/plugins/Docker/lib/Docker.jar %%DATADIR%%/plugins/Docker/lib/commons-lang-2.6.jar %%DATADIR%%/plugins/Docker/lib/docker-java-api-3.2.7.jar @@ -394,10 +264,7 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Docker/lib/docker-java-transport-okhttp-3.2.7.jar %%DATADIR%%/plugins/Docker/lib/okhttp-3.14.4.jar %%DATADIR%%/plugins/Docker/lib/okio-1.17.2.jar -%%DATADIR%%/plugins/EJB/lib/ejb-support.jar -%%DATADIR%%/plugins/EJB/lib/resources_en.jar %%DATADIR%%/plugins/FreeMarker/lib/core.jar -%%DATADIR%%/plugins/FreeMarker/lib/resources_en.jar %%DATADIR%%/plugins/Glassfish/lib/glassfishIntegration.jar %%DATADIR%%/plugins/Glassfish/lib/specifics/glassfish2-specifics.jar %%DATADIR%%/plugins/Glassfish/lib/specifics/glassfish3-specifics.jar @@ -412,9 +279,7 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Groovy/lib/Groovy.jar %%DATADIR%%/plugins/Groovy/lib/agent/gragent.jar %%DATADIR%%/plugins/Groovy/lib/console.groovy -%%DATADIR%%/plugins/Groovy/lib/duplicates-groovy.jar %%DATADIR%%/plugins/Groovy/lib/groovy-constants-rt.jar -%%DATADIR%%/plugins/Groovy/lib/groovy-duplicatesDetection.jar %%DATADIR%%/plugins/Groovy/lib/groovy-jps.jar %%DATADIR%%/plugins/Groovy/lib/groovy-rt.jar %%DATADIR%%/plugins/Groovy/lib/standardDsls/categoryTransform.gdsl @@ -422,8 +287,6 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Groovy/lib/standardDsls/defaultMethods.gdsl %%DATADIR%%/plugins/Groovy/lib/standardDsls/gantScript.gdsl %%DATADIR%%/plugins/Groovy/lib/standardDsls/metaDsl.gdsl -%%DATADIR%%/plugins/Guice/lib/Guice.jar -%%DATADIR%%/plugins/Guice/lib/resources_en.jar %%DATADIR%%/plugins/Hibernate/lib/hibernate-console.jar %%DATADIR%%/plugins/Hibernate/lib/hibernate.jar %%DATADIR%%/plugins/Hibernate/lib/hibernate3-console.jar @@ -437,36 +300,23 @@ share/applications/idea.desktop %%DATADIR%%/plugins/JBoss/lib/specifics/legacy-specifics.jar %%DATADIR%%/plugins/JBoss/lib/specifics/wildfly11-specifics.jar %%DATADIR%%/plugins/JPA/lib/jakarta.persistence-api-3.0.0.jar -%%DATADIR%%/plugins/JPA/lib/javaee-jpa-console-common.jar -%%DATADIR%%/plugins/JPA/lib/javaee-jpa-jakarta-console.jar -%%DATADIR%%/plugins/JPA/lib/jpa-console.jar %%DATADIR%%/plugins/JPA/lib/jpa-support.jar %%DATADIR%%/plugins/JPA/lib/jps/javaee-jpa-jps.jar -%%DATADIR%%/plugins/JPA/lib/resources_en.jar %%DATADIR%%/plugins/JSF/lib/jsf-support.jar -%%DATADIR%%/plugins/JSF/lib/resources_en.jar %%DATADIR%%/plugins/JSIntentionPowerPack/lib/JSIntentionPowerPack.jar -%%DATADIR%%/plugins/JSIntentionPowerPack/lib/resources_en.jar -%%DATADIR%%/plugins/JavaEE/lib/IntelliLang-javaee.jar %%DATADIR%%/plugins/JavaEE/lib/jasper-v2-rt.jar %%DATADIR%%/plugins/JavaEE/lib/javaee-jps.jar %%DATADIR%%/plugins/JavaEE/lib/javaee-openapi.jar %%DATADIR%%/plugins/JavaEE/lib/javaee-platform.jar -%%DATADIR%%/plugins/JavaEE/lib/resources_en.jar %%DATADIR%%/plugins/JavaEE/lib/rt/jasper-v21-rt.jar %%DATADIR%%/plugins/JavaEE/lib/rt/jasper-v23-java8-rt.jar %%DATADIR%%/plugins/JavaEE/lib/rt/jasper-v23-rt.jar -%%DATADIR%%/plugins/JavaEE/lib/webDeployment-transport.jar %%DATADIR%%/plugins/JavaScriptDebugger/lib/ChromeConnector.jar %%DATADIR%%/plugins/JavaScriptDebugger/lib/FirefoxConnector.jar -%%DATADIR%%/plugins/JavaScriptDebugger/lib/JavaEEJavaScriptDebug.jar %%DATADIR%%/plugins/JavaScriptDebugger/lib/JavaScriptDebugger.jar %%DATADIR%%/plugins/JavaScriptDebugger/lib/debugConnector.js -%%DATADIR%%/plugins/JavaScriptDebugger/lib/javascript-debugger-featuresTrainer.jar %%DATADIR%%/plugins/JavaScriptDebugger/lib/nashorn-debugger-9-rt.jar %%DATADIR%%/plugins/JavaScriptDebugger/lib/nashorn-debugger-rt.jar -%%DATADIR%%/plugins/JavaScriptDebugger/lib/nashorn-debugger.jar -%%DATADIR%%/plugins/JavaScriptDebugger/lib/resources_en.jar %%DATADIR%%/plugins/JavaScriptLanguage/helpers/base-test-reporter/intellij-stringifier.js %%DATADIR%%/plugins/JavaScriptLanguage/helpers/base-test-reporter/intellij-tree.js %%DATADIR%%/plugins/JavaScriptLanguage/helpers/base-test-reporter/intellij-util.js @@ -490,6 +340,8 @@ share/applications/idea.desktop %%DATADIR%%/plugins/JavaScriptLanguage/helpers/package-version-range-matcher/package-lock.json %%DATADIR%%/plugins/JavaScriptLanguage/helpers/package-version-range-matcher/package.json %%DATADIR%%/plugins/JavaScriptLanguage/helpers/package-version-range-matcher/semver-range-matcher.js +%%DATADIR%%/plugins/JavaScriptLanguage/helpers/package-version-range-matcher/test/package.json +%%DATADIR%%/plugins/JavaScriptLanguage/helpers/package-version-range-matcher/test/version-range-test.js %%DATADIR%%/plugins/JavaScriptLanguage/helpers/protractor-intellij/lib/jasmine-reporter.d.ts %%DATADIR%%/plugins/JavaScriptLanguage/helpers/protractor-intellij/lib/protractor-intellij-cli.js %%DATADIR%%/plugins/JavaScriptLanguage/helpers/protractor-intellij/lib/protractor-intellij-config.js @@ -498,8 +350,8 @@ share/applications/idea.desktop %%DATADIR%%/plugins/JavaScriptLanguage/helpers/protractor-intellij/lib/protractor-intellij-stringifier.js %%DATADIR%%/plugins/JavaScriptLanguage/helpers/protractor-intellij/lib/protractor-intellij-tree.js %%DATADIR%%/plugins/JavaScriptLanguage/helpers/protractor-intellij/lib/protractor-intellij-util.js -%%DATADIR%%/plugins/JavaScriptLanguage/js/js-predefined-ffdd448c697d-b21cf67d8133.ijx -%%DATADIR%%/plugins/JavaScriptLanguage/js/js-predefined-ffdd448c697d-b21cf67d8133.txt +%%DATADIR%%/plugins/JavaScriptLanguage/js/js-predefined-ffdd448c697d-d5a2cc0426b1.ijx +%%DATADIR%%/plugins/JavaScriptLanguage/js/js-predefined-ffdd448c697d-d5a2cc0426b1.txt %%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/browser.d.ts %%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/cancellationToken.js %%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/es2019decorators.d.ts @@ -549,6 +401,11 @@ share/applications/idea.desktop %%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es2020.sharedmemory.d.ts %%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es2020.string.d.ts %%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es2020.symbol.wellknown.d.ts +%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es2021.d.ts +%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es2021.full.d.ts +%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es2021.promise.d.ts +%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es2021.string.d.ts +%%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es2021.weakref.d.ts %%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es5.d.ts %%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.es6.d.ts %%DATADIR%%/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/lib.esnext.array.d.ts @@ -609,15 +466,10 @@ share/applications/idea.desktop %%DATADIR%%/plugins/JavaScriptLanguage/languageService/eslint/src/typings/js-lanuage-api.d.ts %%DATADIR%%/plugins/JavaScriptLanguage/languageService/eslint/tsconfig.json %%DATADIR%%/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar -%%DATADIR%%/plugins/JavaScriptLanguage/lib/completion-ranking-js-0.1.2.jar -%%DATADIR%%/plugins/JavaScriptLanguage/lib/completion-ranking-typescript-0.2.2.jar -%%DATADIR%%/plugins/JavaScriptLanguage/lib/javascript-featuresTrainer.jar -%%DATADIR%%/plugins/JavaScriptLanguage/lib/javascript-openapi.jar -%%DATADIR%%/plugins/JavaScriptLanguage/lib/js-test-common.jar -%%DATADIR%%/plugins/JavaScriptLanguage/lib/resources_en.jar +%%DATADIR%%/plugins/JavaScriptLanguage/lib/completion-ranking-js-0.1.3.jar +%%DATADIR%%/plugins/JavaScriptLanguage/lib/completion-ranking-typescript-0.2.3.jar %%DATADIR%%/plugins/JavaScriptLanguage/lib/semver4j-2.2.0.jar %%DATADIR%%/plugins/JavaeeExtensions/lib/javaee-extensions.jar -%%DATADIR%%/plugins/JavaeeExtensions/lib/resources_en.jar %%DATADIR%%/plugins/Jetty/lib/jettyIntegration.jar %%DATADIR%%/plugins/Kotlin/bin/linux/LLDBFrontend %%DATADIR%%/plugins/Kotlin/bin/macos/LLDBFrontend @@ -645,13 +497,10 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing-cli.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing-runtime.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotation-processing.jar -%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotations-android.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotations-jvm-sources.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-annotations-jvm.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-ant.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-compiler.jar -%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-coroutines-experimental-compat-sources.jar -%%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-coroutines-experimental-compat.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-daemon-client.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-daemon.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/kotlin-imports-dumper-compiler-plugin.jar @@ -694,6 +543,7 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Kotlin/kotlinc/lib/sam-with-receiver-compiler-plugin.jar %%DATADIR%%/plugins/Kotlin/kotlinc/lib/trove4j.jar %%DATADIR%%/plugins/Kotlin/kotlinc/license/COPYRIGHT.txt +%%DATADIR%%/plugins/Kotlin/kotlinc/license/COPYRIGHT_HEADER.txt %%DATADIR%%/plugins/Kotlin/kotlinc/license/LICENSE.txt %%DATADIR%%/plugins/Kotlin/kotlinc/license/NOTICE.txt %%DATADIR%%/plugins/Kotlin/kotlinc/license/README.md @@ -732,7 +582,7 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Kotlin/kotlinc/license/third_party/trove_readme_license.txt %%DATADIR%%/plugins/Kotlin/lib/allopen-compiler-plugin-for-ide.jar %%DATADIR%%/plugins/Kotlin/lib/android-extensions-compiler-plugin-for-ide.jar -%%DATADIR%%/plugins/Kotlin/lib/completion-ranking-kotlin-0.2.2.jar +%%DATADIR%%/plugins/Kotlin/lib/completion-ranking-kotlin-0.3.2.jar %%DATADIR%%/plugins/Kotlin/lib/javaslang-2.0.6.jar %%DATADIR%%/plugins/Kotlin/lib/javaslang-match-2.0.6.jar %%DATADIR%%/plugins/Kotlin/lib/javax.inject-1.jar @@ -746,7 +596,6 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Kotlin/lib/kotlin-compiler-plugins-sam-with-receiver.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-compiler-plugins-scripting.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-core.jar -%%DATADIR%%/plugins/Kotlin/lib/kotlin-coroutines-experimental-compat.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-eval4j.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-formatter.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-frontend-independent.jar @@ -755,7 +604,9 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Kotlin/lib/kotlin-gradle-gradle-native.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-gradle-gradle-tooling.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-gradle-statistics-for-ide.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-i18n.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-idea.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlin-injection.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-j2k-idea.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-j2k-new.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-j2k-old.jar @@ -789,18 +640,19 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Kotlin/lib/kotlin-stdlib.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-uast-kotlin-idea.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-uast-kotlin.jar -%%DATADIR%%/plugins/Kotlin/lib/kotlin-ultimate-common-cidr-native.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-ultimate-common-native.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-ultimate-common-noncidr-native.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-ultimate-native.jar %%DATADIR%%/plugins/Kotlin/lib/kotlin-ultimate.jar %%DATADIR%%/plugins/Kotlin/lib/kotlinx-collections-immutable-jvm-0.3.1.jar -%%DATADIR%%/plugins/Kotlin/lib/kotlinx-coroutines-core-1.4.2.jar -%%DATADIR%%/plugins/Kotlin/lib/kotlinx-coroutines-jdk8-1.4.2.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlinx-coroutines-core-jvm-1.5.0.jar +%%DATADIR%%/plugins/Kotlin/lib/kotlinx-coroutines-jdk8-1.5.0.jar %%DATADIR%%/plugins/Kotlin/lib/kotlinx-serialization-compiler-plugin-for-ide.jar %%DATADIR%%/plugins/Kotlin/lib/noarg-compiler-plugin-for-ide.jar %%DATADIR%%/plugins/Kotlin/lib/parcelize-compiler-plugin-for-ide.jar %%DATADIR%%/plugins/Kotlin/lib/sam-with-receiver-compiler-plugin-for-ide.jar +%%DATADIR%%/plugins/Kotlin/scripts/konan_lldb.py +%%DATADIR%%/plugins/Ktor/lib/ktor-plugin.jar %%DATADIR%%/plugins/NodeJS/js/mocha-intellij/LICENSE %%DATADIR%%/plugins/NodeJS/js/mocha-intellij/README.md %%DATADIR%%/plugins/NodeJS/js/mocha-intellij/lib/mocha-intellij-stringifier.js @@ -812,74 +664,35 @@ share/applications/idea.desktop %%DATADIR%%/plugins/NodeJS/js/mocha-intellij/package.json %%DATADIR%%/plugins/NodeJS/js/nodeunit/nodeunit-intellij-starter.js %%DATADIR%%/plugins/NodeJS/lib/NodeJS.jar -%%DATADIR%%/plugins/NodeJS/lib/resources_en.jar %%DATADIR%%/plugins/PerforceIntegration/lib/PerforceIntegration.jar -%%DATADIR%%/plugins/PerforceIntegration/lib/perforce_util.jar -%%DATADIR%%/plugins/PerforceIntegration/lib/resources_en.jar %%DATADIR%%/plugins/PersistenceSupport/lib/persistence-impl.jar -%%DATADIR%%/plugins/PersistenceSupport/lib/persistence-openapi.jar %%DATADIR%%/plugins/RefactorX/lib/RefactorX.jar -%%DATADIR%%/plugins/RefactorX/lib/resources_en.jar %%DATADIR%%/plugins/Spring/lib/customNs/customNs.jar -%%DATADIR%%/plugins/Spring/lib/spring-aop.jar -%%DATADIR%%/plugins/Spring/lib/spring-eclipse.jar -%%DATADIR%%/plugins/Spring/lib/spring-el.jar -%%DATADIR%%/plugins/Spring/lib/spring-graph.jar -%%DATADIR%%/plugins/Spring/lib/spring-jsf.jar -%%DATADIR%%/plugins/Spring/lib/spring-persistence-integration.jar -%%DATADIR%%/plugins/Spring/lib/spring-web.jar %%DATADIR%%/plugins/Spring/lib/spring.jar %%DATADIR%%/plugins/SpringBatch/lib/SpringBatch.jar -%%DATADIR%%/plugins/SpringBatch/lib/resources_en.jar -%%DATADIR%%/plugins/SpringBoot/lib/spring-boot-cloud-stream.jar -%%DATADIR%%/plugins/SpringBoot/lib/spring-boot-cloud.jar -%%DATADIR%%/plugins/SpringBoot/lib/spring-boot-config-yaml.jar -%%DATADIR%%/plugins/SpringBoot/lib/spring-boot-initializr.jar -%%DATADIR%%/plugins/SpringBoot/lib/spring-boot-mvc.jar -%%DATADIR%%/plugins/SpringBoot/lib/spring-boot-run.jar %%DATADIR%%/plugins/SpringBoot/lib/spring-boot.jar %%DATADIR%%/plugins/SpringData/lib/SpringData.jar -%%DATADIR%%/plugins/SpringData/lib/resources_en.jar %%DATADIR%%/plugins/SpringIntegration/lib/SpringIntegration.jar -%%DATADIR%%/plugins/SpringIntegration/lib/resources_en.jar -%%DATADIR%%/plugins/SpringIntegration/lib/spring-integration.jar %%DATADIR%%/plugins/SpringMessaging/lib/SpringMessaging.jar -%%DATADIR%%/plugins/SpringMessaging/lib/resources_en.jar %%DATADIR%%/plugins/SpringMvc/lib/SpringMvc.jar -%%DATADIR%%/plugins/SpringMvc/lib/resources_en.jar -%%DATADIR%%/plugins/SpringMvc/lib/spring-mvc-api.jar -%%DATADIR%%/plugins/SpringOSGi/lib/SpringOSGi.jar -%%DATADIR%%/plugins/SpringOSGi/lib/resources_en.jar %%DATADIR%%/plugins/SpringSecurity/lib/SpringSecurity.jar -%%DATADIR%%/plugins/SpringSecurity/lib/resources_en.jar %%DATADIR%%/plugins/SpringWebServices/lib/SpringWebServices.jar -%%DATADIR%%/plugins/SpringWebServices/lib/resources_en.jar %%DATADIR%%/plugins/SpringWebSocket/lib/SpringWebSocket.jar -%%DATADIR%%/plugins/SpringWebSocket/lib/resources_en.jar -%%DATADIR%%/plugins/SpringWebflow/lib/SpringWebflow.jar -%%DATADIR%%/plugins/SpringWebflow/lib/resources_en.jar %%DATADIR%%/plugins/Tomcat/lib/specifics/tomee-specifics.jar %%DATADIR%%/plugins/Tomcat/lib/tomcatIntegration.jar %%DATADIR%%/plugins/Velocity/lib/core.jar -%%DATADIR%%/plugins/Velocity/lib/resources_en.jar -%%DATADIR%%/plugins/Web/lib/resources_en.jar %%DATADIR%%/plugins/Web/lib/web-support.jar %%DATADIR%%/plugins/WebServices/lib/wadlgen/wadlgen.jar %%DATADIR%%/plugins/WebServices/lib/ws-rt.jar -%%DATADIR%%/plugins/WebServices/lib/ws-utils.jar %%DATADIR%%/plugins/WebServices/lib/ws.jar -%%DATADIR%%/plugins/WebSocket/lib/resources_en.jar %%DATADIR%%/plugins/WebSocket/lib/websocket-support.jar -%%DATADIR%%/plugins/android-gradle-dsl/lib/android-gradle-dsl-impl.jar -%%DATADIR%%/plugins/android-gradle-dsl/lib/android-gradle-dsl-kotlin-impl.jar %%DATADIR%%/plugins/android-gradle-dsl/lib/android-gradle-dsl.jar %%DATADIR%%/plugins/android/lib/adt-ui.jar -%%DATADIR%%/plugins/android/lib/analytics-crash-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/analytics-shared-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/analytics-tracker-27.1.1.0.jar +%%DATADIR%%/plugins/android/lib/analytics-crash-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/analytics-shared-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/analytics-tracker-27.2.0.0.jar %%DATADIR%%/plugins/android/lib/android-common.jar %%DATADIR%%/plugins/android/lib/android-extensions-ide.jar -%%DATADIR%%/plugins/android/lib/android-jps-model.jar %%DATADIR%%/plugins/android/lib/android-kotlin.jar %%DATADIR%%/plugins/android/lib/android-profilers.jar %%DATADIR%%/plugins/android/lib/android-ultimate.jar @@ -888,13 +701,14 @@ share/applications/idea.desktop %%DATADIR%%/plugins/android/lib/antlr4-runtime-4.5.3.jar %%DATADIR%%/plugins/android/lib/apksig-4.0.0.jar %%DATADIR%%/plugins/android/lib/apkzlib-4.0.0.jar -%%DATADIR%%/plugins/android/lib/artwork.jar %%DATADIR%%/plugins/android/lib/asm-tools.jar %%DATADIR%%/plugins/android/lib/auto-common-0.10.jar %%DATADIR%%/plugins/android/lib/build-common.jar +%%DATADIR%%/plugins/android/lib/checker-qual-2.5.8.jar %%DATADIR%%/plugins/android/lib/commons-compress-1.8.1.jar %%DATADIR%%/plugins/android/lib/commons-lang-2.6.jar -%%DATADIR%%/plugins/android/lib/deploy_java_proto-27.1.1.0.jar +%%DATADIR%%/plugins/android/lib/core-proto-0.0.8-alpha01.jar +%%DATADIR%%/plugins/android/lib/deploy_java_proto-27.2.0.0.jar %%DATADIR%%/plugins/android/lib/device-art-resources/automotive_1024/back.png %%DATADIR%%/plugins/android/lib/device-art-resources/automotive_1024/fore.png %%DATADIR%%/plugins/android/lib/device-art-resources/automotive_1024/layout @@ -1052,6 +866,9 @@ share/applications/idea.desktop %%DATADIR%%/plugins/android/lib/device-art-resources/pixel_4_xl/back.webp %%DATADIR%%/plugins/android/lib/device-art-resources/pixel_4_xl/layout %%DATADIR%%/plugins/android/lib/device-art-resources/pixel_4_xl/mask.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_4a/back.webp +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_4a/layout +%%DATADIR%%/plugins/android/lib/device-art-resources/pixel_4a/mask.webp %%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/land_back.webp %%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/land_fore.webp %%DATADIR%%/plugins/android/lib/device-art-resources/pixel_c/land_shadow.webp @@ -1080,10 +897,6 @@ share/applications/idea.desktop %%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/port_back.webp %%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/port_fore.webp %%DATADIR%%/plugins/android/lib/device-art-resources/pixel_xl_silver/port_shadow.webp -%%DATADIR%%/plugins/android/lib/device-art-resources/polestar_2/back.png -%%DATADIR%%/plugins/android/lib/device-art-resources/polestar_2/button.png -%%DATADIR%%/plugins/android/lib/device-art-resources/polestar_2/fore.png -%%DATADIR%%/plugins/android/lib/device-art-resources/polestar_2/layout %%DATADIR%%/plugins/android/lib/device-art-resources/tablet/tablet_back_simple.9.png %%DATADIR%%/plugins/android/lib/device-art-resources/tablet/tablet_shadow_simple_land.9.png %%DATADIR%%/plugins/android/lib/device-art-resources/tablet/tablet_shadow_simple_port.9.png @@ -1112,6 +925,9 @@ share/applications/idea.desktop %%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/mask.png %%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/select.png %%DATADIR%%/plugins/android/lib/device-art-resources/wear_round/shadow.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round_chin_320_290/device_bezel.png +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round_chin_320_290/hardware.ini +%%DATADIR%%/plugins/android/lib/device-art-resources/wear_round_chin_320_290/layout %%DATADIR%%/plugins/android/lib/device-art-resources/wear_square/back.png %%DATADIR%%/plugins/android/lib/device-art-resources/wear_square/fore.png %%DATADIR%%/plugins/android/lib/device-art-resources/wear_square/layout @@ -1124,21 +940,22 @@ share/applications/idea.desktop %%DATADIR%%/plugins/android/lib/device-art-resources/xoom/port_fore.webp %%DATADIR%%/plugins/android/lib/device-art-resources/xoom/port_shadow.webp %%DATADIR%%/plugins/android/lib/device-art-resources/xoom/thumb.png -%%DATADIR%%/plugins/android/lib/emulator_java_proto-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/explainer-27.1.1.0.jar +%%DATADIR%%/plugins/android/lib/emulator_java_proto-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/explainer-27.2.0.0.jar %%DATADIR%%/plugins/android/lib/flatbuffers-java-1.12.0.jar -%%DATADIR%%/plugins/android/lib/generator-27.1.1.0.jar +%%DATADIR%%/plugins/android/lib/generator-27.2.0.0.jar %%DATADIR%%/plugins/android/lib/instantapps-api-1.8.jar %%DATADIR%%/plugins/android/lib/javapoet-1.10.0.jar %%DATADIR%%/plugins/android/lib/javawriter-2.2.1.jar -%%DATADIR%%/plugins/android/lib/jb-layoutlib-jdk11-27.1.1.0.jar %%DATADIR%%/plugins/android/lib/jetifier-core-1.0.0-beta09.jar %%DATADIR%%/plugins/android/lib/juniversalchardet-1.0.3.jar -%%DATADIR%%/plugins/android/lib/kotlinx-coroutines-guava-1.4.2.jar +%%DATADIR%%/plugins/android/lib/kotlinx-coroutines-guava-1.5.0.jar %%DATADIR%%/plugins/android/lib/kxml2-2.3.0.jar -%%DATADIR%%/plugins/android/lib/layout_inspector_java_proto-27.1.1.0.jar +%%DATADIR%%/plugins/android/lib/layout_inspector_java_proto-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/layoutlib-27.2.0.0.jar %%DATADIR%%/plugins/android/lib/layoutlib-loader.jar -%%DATADIR%%/plugins/android/lib/libjava_version-27.1.1.0.jar +%%DATADIR%%/plugins/android/lib/libandroid-core-proto-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/libjava_version-27.2.0.0.jar %%DATADIR%%/plugins/android/lib/lint-ide.jar %%DATADIR%%/plugins/android/lib/moshi-1.6.0.jar %%DATADIR%%/plugins/android/lib/okio-1.14.0.jar @@ -1148,9 +965,8 @@ share/applications/idea.desktop %%DATADIR%%/plugins/android/lib/org.eclipse.emf.common-2.12.0.jar %%DATADIR%%/plugins/android/lib/org.eclipse.emf.ecore-2.12.0.jar %%DATADIR%%/plugins/android/lib/pepk.jar -%%DATADIR%%/plugins/android/lib/perfetto-protos-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/r8-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/resources_en.jar +%%DATADIR%%/plugins/android/lib/perfetto-protos-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/r8-27.2.0.0.jar %%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_1.xml %%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_10.xml %%DATADIR%%/plugins/android/lib/sampleData/avatars/avatar_11.xml @@ -1187,87 +1003,72 @@ share/applications/idea.desktop %%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Orange_Sunset.webp %%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Stream.webp %%DATADIR%%/plugins/android/lib/sampleData/backgrounds/scenic/Yosemite_Tree.webp -%%DATADIR%%/plugins/android/lib/shared-27.1.1.0.jar +%%DATADIR%%/plugins/android/lib/shared-27.2.0.0.jar %%DATADIR%%/plugins/android/lib/spantable.jar -%%DATADIR%%/plugins/android/lib/sqlite_inspector_proto-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio-grpc-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio-proto-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.analyzer-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.android-annotations-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.binary-resources-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.builder-model-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.builder-test-api-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.chunkio-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.common-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.ddmlib-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.deployer-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.draw9patch-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.dvlib-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.flags-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.layoutinspector-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.layoutlib-api-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.lint-api-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.lint-checks-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.lint-model-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.manifest-merger-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.mlkit-common-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.ninepatch-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.perflib-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.pixelprobe-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.repository-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.sdk-common-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.sdklib-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.tracer-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.android.sdktools.zipflinger-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.baseLibrary-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.baseLibrarySupport-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.compiler-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.compilerCommon-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.intellij.android.wizardTemplate.impl-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.intellij.android.wizardTemplate.plugin-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/studio.usb-devices-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/tensorflow-lite-metadata-0.1.0-rc1.jar -%%DATADIR%%/plugins/android/lib/traceprocessor_protos-27.1.1.0.jar -%%DATADIR%%/plugins/android/lib/transport_java_proto-27.1.1.0.jar +%%DATADIR%%/plugins/android/lib/sqlite_inspector_proto-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio-grpc-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio-proto-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.analyzer-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.android-annotations-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.binary-resources-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.builder-model-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.builder-test-api-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.chunkio-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.common-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.ddmlib-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.deployer-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.draw9patch-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.dvlib-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.flags-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.layoutinspector-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.layoutlib-api-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.lint-api-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.lint-checks-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.lint-model-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.manifest-merger-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.mlkit-common-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.ninepatch-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.perflib-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.pixelprobe-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.repository-27.2.0.1.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.sdk-common-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.sdklib-27.2.0.1.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.tracer-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.android.sdktools.zipflinger-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.baseLibrary-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.baseLibrarySupport-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.compiler-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.compilerCommon-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.intellij.android.wizardTemplate.impl-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.intellij.android.wizardTemplate.plugin-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/studio.usb-devices-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/tensorflow-lite-metadata-0.1.0-rc2.jar +%%DATADIR%%/plugins/android/lib/traceprocessor_protos-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/transport_java_proto-27.2.0.0.jar +%%DATADIR%%/plugins/android/lib/ui-animation-tooling-internal.jar +%%DATADIR%%/plugins/android/lib/workmanager_inspector_proto-27.2.0.0.jar %%DATADIR%%/plugins/android/resources/images/asset_studio/ic_banner_image.xml %%DATADIR%%/plugins/android/resources/images/asset_studio/ic_launcher_background.xml %%DATADIR%%/plugins/android/resources/images/asset_studio/ic_launcher_foreground.xml %%DATADIR%%/plugins/ant/lib/ant-jps.jar %%DATADIR%%/plugins/ant/lib/antIntegration.jar -%%DATADIR%%/plugins/ant/lib/resources_en.jar %%DATADIR%%/plugins/aop-common/lib/aop-common.jar -%%DATADIR%%/plugins/aop-common/lib/resources_en.jar -%%DATADIR%%/plugins/arquillian-core/lib/arquillian-core.jar -%%DATADIR%%/plugins/arquillian-core/lib/arquillian-junit.jar -%%DATADIR%%/plugins/arquillian-core/lib/arquillian-testng.jar -%%DATADIR%%/plugins/arquillian-core/lib/mavenDependencies.jar -%%DATADIR%%/plugins/arquillian-core/lib/resources_en.jar -%%DATADIR%%/plugins/aspectj/lib/aspectj-jps.jar -%%DATADIR%%/plugins/aspectj/lib/aspectj.jar -%%DATADIR%%/plugins/aspectj/lib/resources_en.jar %%DATADIR%%/plugins/cloud-config/lib/cloud-config.jar -%%DATADIR%%/plugins/cloud-config/lib/resources_en.jar -%%DATADIR%%/plugins/coffeescript-core/lib/coffeescript-core.jar -%%DATADIR%%/plugins/coffeescript-core/lib/resources_en.jar %%DATADIR%%/plugins/completionMlRanking/lib/completionMlRanking.jar -%%DATADIR%%/plugins/completionMlRanking/lib/resources_en.jar %%DATADIR%%/plugins/configurationScript/lib/configurationScript.jar -%%DATADIR%%/plugins/configurationScript/lib/resources_en.jar %%DATADIR%%/plugins/copyright/lib/copyright.jar -%%DATADIR%%/plugins/copyright/lib/resources_en.jar -%%DATADIR%%/plugins/coverage/lib/asm-8.0.1.jar -%%DATADIR%%/plugins/coverage/lib/asm-analysis-8.0.1.jar -%%DATADIR%%/plugins/coverage/lib/asm-commons-8.0.1.jar -%%DATADIR%%/plugins/coverage/lib/asm-tree-8.0.1.jar -%%DATADIR%%/plugins/coverage/lib/coverage-report-1.0.4.jar +%%DATADIR%%/plugins/coverage/lib/asm-9.1.jar +%%DATADIR%%/plugins/coverage/lib/asm-analysis-9.1.jar +%%DATADIR%%/plugins/coverage/lib/asm-commons-9.1.jar +%%DATADIR%%/plugins/coverage/lib/asm-tree-9.1.jar +%%DATADIR%%/plugins/coverage/lib/coverage-report-1.0.5.jar %%DATADIR%%/plugins/coverage/lib/coverage.jar %%DATADIR%%/plugins/coverage/lib/coverage_rt.jar %%DATADIR%%/plugins/coverage/lib/freemarker-2.3.30.jar -%%DATADIR%%/plugins/coverage/lib/org.jacoco.agent-0.8.6.jar -%%DATADIR%%/plugins/coverage/lib/org.jacoco.ant-0.8.6.jar -%%DATADIR%%/plugins/coverage/lib/org.jacoco.core-0.8.6.jar -%%DATADIR%%/plugins/coverage/lib/org.jacoco.report-0.8.6.jar -%%DATADIR%%/plugins/coverage/lib/resources_en.jar +%%DATADIR%%/plugins/coverage/lib/org.jacoco.agent-0.8.7.jar +%%DATADIR%%/plugins/coverage/lib/org.jacoco.ant-0.8.7.jar +%%DATADIR%%/plugins/coverage/lib/org.jacoco.core-0.8.7.jar +%%DATADIR%%/plugins/coverage/lib/org.jacoco.report-0.8.7.jar %%DATADIR%%/plugins/cucumber-groovy/lib/cucumber-groovy-1.2.4.jar %%DATADIR%%/plugins/cucumber-groovy/lib/cucumber-groovy.jar %%DATADIR%%/plugins/cucumber-java/lib/cucumber-core-1.2.4.jar @@ -1284,74 +1085,49 @@ share/applications/idea.desktop %%DATADIR%%/plugins/cwm-plugin/lib/cwm-host-unattended.jar %%DATADIR%%/plugins/cwm-plugin/lib/cwm-host.jar %%DATADIR%%/plugins/cwm-plugin/lib/cwm-lobby-common.jar -%%DATADIR%%/plugins/cwm-plugin/lib/cwm-model-generated.jar %%DATADIR%%/plugins/cwm-plugin/lib/cwm-plugin-terminal.jar %%DATADIR%%/plugins/cwm-plugin/lib/cwm-plugin.jar %%DATADIR%%/plugins/cwm-plugin/lib/cwm-unattended-common.jar %%DATADIR%%/plugins/cwm-plugin/lib/cwm-unattended-ssh.jar +%%DATADIR%%/plugins/cwm-plugin/lib/cwm-unattended-util.jar %%DATADIR%%/plugins/cwm-plugin/lib/idea-ultimate-build-dependencies.jar %%DATADIR%%/plugins/cwm-plugin/lib/jnaerator-runtime-0.12.jar %%DATADIR%%/plugins/cwm-plugin/lib/jstun-0.7.5.20200723.jar +%%DATADIR%%/plugins/cwm-plugin/lib/projector-client-swing-1.0-202106112000.jar %%DATADIR%%/plugins/cwm-plugin/lib/quiche-jna-stubs-61.jar -%%DATADIR%%/plugins/cwm-plugin/lib/rd-ide-model-generated.jar -%%DATADIR%%/plugins/cwm-plugin/lib/rd-platform.jar -%%DATADIR%%/plugins/cwm-plugin/lib/rd-text-0.211.234.jar -%%DATADIR%%/plugins/cwm-plugin/lib/rd-ui.jar +%%DATADIR%%/plugins/cwm-plugin/lib/rd-text-0.212.307.jar %%DATADIR%%/plugins/cwm-plugin/lib/tls-channel-0.3.2.jar %%DATADIR%%/plugins/devkit/lib/devkit-jps.jar %%DATADIR%%/plugins/devkit/lib/devkit.jar %%DATADIR%%/plugins/devkit/lib/dtdparser113.jar -%%DATADIR%%/plugins/devkit/lib/resources_en.jar -%%DATADIR%%/plugins/drools/lib/drools-support.jar -%%DATADIR%%/plugins/drools/lib/resources_en.jar %%DATADIR%%/plugins/dsm/lib/dsm.jar -%%DATADIR%%/plugins/dsm/lib/resources_en.jar +%%DATADIR%%/plugins/dynamicPluginsTests-performanceTesting/lib/dynamicPluginsTests-performanceTesting.jar %%DATADIR%%/plugins/eclipse/lib/eclipse-common.jar %%DATADIR%%/plugins/eclipse/lib/eclipse-jps.jar %%DATADIR%%/plugins/eclipse/lib/eclipse.jar -%%DATADIR%%/plugins/eclipse/lib/resources_en.jar %%DATADIR%%/plugins/editorconfig/lib/editorconfig-core-java.jar %%DATADIR%%/plugins/editorconfig/lib/editorconfig.jar -%%DATADIR%%/plugins/editorconfig/lib/resources_en.jar -%%DATADIR%%/plugins/emma/lib/emma-agent.jar -%%DATADIR%%/plugins/emma/lib/emma-idea.jar -%%DATADIR%%/plugins/emma/lib/emma.jar %%DATADIR%%/plugins/emojipicker/lib/emojipicker.jar -%%DATADIR%%/plugins/emojipicker/lib/resources_en.jar %%DATADIR%%/plugins/externalSystem-dependencyUpdater/lib/externalSystem-dependencyUpdater.jar -%%DATADIR%%/plugins/externalSystem-dependencyUpdater/lib/resources_en.jar %%DATADIR%%/plugins/featuresTrainer/lib/featuresTrainer.jar %%DATADIR%%/plugins/featuresTrainer/lib/fest-swing-1.4.6.jar %%DATADIR%%/plugins/featuresTrainer/lib/fest.jar -%%DATADIR%%/plugins/featuresTrainer/lib/resources_en.jar -%%DATADIR%%/plugins/filePrediction/lib/file-prediction-model-0.2.2.jar -%%DATADIR%%/plugins/filePrediction/lib/filePrediction.jar -%%DATADIR%%/plugins/filePrediction/lib/resources_en.jar -%%DATADIR%%/plugins/frameworks-starters/lib/frameworks-starters.jar -%%DATADIR%%/plugins/frameworks-starters/lib/resources_en.jar %%DATADIR%%/plugins/gherkin/lib/gherkin.jar -%%DATADIR%%/plugins/gherkin/lib/resources_en.jar %%DATADIR%%/plugins/git4idea/lib/git4idea-rt.jar %%DATADIR%%/plugins/git4idea/lib/git4idea.jar -%%DATADIR%%/plugins/git4idea/lib/resources_en.jar %%DATADIR%%/plugins/github/lib/github.jar -%%DATADIR%%/plugins/github/lib/resources_en.jar %%DATADIR%%/plugins/gradle-dependencyUpdater/lib/gradle-dependencyUpdater.jar -%%DATADIR%%/plugins/gradle-ext/lib/gradle-ext-profiler-tooling.jar %%DATADIR%%/plugins/gradle-ext/lib/gradle-ext.jar -%%DATADIR%%/plugins/gradle-ext/lib/resources_en.jar %%DATADIR%%/plugins/gradle-java-maven/lib/gradle-java-maven.jar -%%DATADIR%%/plugins/gradle-java-maven/lib/resources_en.jar %%DATADIR%%/plugins/gradle-java/lib/gradle-java.jar %%DATADIR%%/plugins/gradle-java/lib/gradle-jps.jar -%%DATADIR%%/plugins/gradle-java/lib/resources_en.jar %%DATADIR%%/plugins/gradle-javaee/lib/javaee-gradle-support.jar -%%DATADIR%%/plugins/gradle-javaee/lib/resources_en.jar -%%DATADIR%%/plugins/gradle/lib/gradle-common.jar -%%DATADIR%%/plugins/gradle/lib/gradle-lib.jar +%%DATADIR%%/plugins/gradle/lib/gradle-api-7.1.jar +%%DATADIR%%/plugins/gradle/lib/gradle-api-impldep-7.1.jar +%%DATADIR%%/plugins/gradle/lib/gradle-launcher-7.1.jar %%DATADIR%%/plugins/gradle/lib/gradle-tooling-extension-api.jar %%DATADIR%%/plugins/gradle/lib/gradle-tooling-extension-impl.jar -%%DATADIR%%/plugins/gradle/lib/gradle-toolingProxy.jar +%%DATADIR%%/plugins/gradle/lib/gradle-wrapper-7.1.jar %%DATADIR%%/plugins/gradle/lib/gradle.jar %%DATADIR%%/plugins/grazie/lib/aho-corasick-double-array-trie-1.2.2.jar %%DATADIR%%/plugins/grazie/lib/bridj-0.7.0.jar @@ -1360,60 +1136,41 @@ share/applications/idea.desktop %%DATADIR%%/plugins/grazie/lib/emoji-java-5.1.1.jar %%DATADIR%%/plugins/grazie/lib/grazi-language-detector-0.1.13.jar %%DATADIR%%/plugins/grazie/lib/grazie.jar -%%DATADIR%%/plugins/grazie/lib/hppc-0.8.1.jar +%%DATADIR%%/plugins/grazie/lib/hppc-0.8.2.jar %%DATADIR%%/plugins/grazie/lib/hunspell-1.1.1.jar %%DATADIR%%/plugins/grazie/lib/indriya-1.3.jar %%DATADIR%%/plugins/grazie/lib/json-20170516.jar %%DATADIR%%/plugins/grazie/lib/kotlinx-html-jvm-0.6.11.jar -%%DATADIR%%/plugins/grazie/lib/language-en-5.2.jar -%%DATADIR%%/plugins/grazie/lib/languagetool-core-5.2.jar +%%DATADIR%%/plugins/grazie/lib/language-en-5.4.jar +%%DATADIR%%/plugins/grazie/lib/languagetool-core-5.4.jar %%DATADIR%%/plugins/grazie/lib/morfologik-fsa-2.1.7.jar %%DATADIR%%/plugins/grazie/lib/morfologik-fsa-builders-2.1.7.jar %%DATADIR%%/plugins/grazie/lib/morfologik-speller-2.1.7.jar %%DATADIR%%/plugins/grazie/lib/morfologik-stemming-2.1.7.jar *** 363 LINES SKIPPED *** From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 11:13:44 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9CC1966982B; Mon, 23 Aug 2021 11:13:44 +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 4GtV3r2WdNz4xMT; Mon, 23 Aug 2021 11:13:44 +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 397B313612; Mon, 23 Aug 2021 11:13:44 +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 17NBDi75016483; Mon, 23 Aug 2021 11:13:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NBDiKI016482; Mon, 23 Aug 2021 11:13:44 GMT (envelope-from git) Date: Mon, 23 Aug 2021 11:13:44 GMT Message-Id: <202108231113.17NBDiKI016482@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: 941e58ec8f3c - main - devel/py-yamllint: update to 1.26.3 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 941e58ec8f3c6d56d037cd1bf1b52bbe2565dc62 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 11:13:44 -0000 The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=941e58ec8f3c6d56d037cd1bf1b52bbe2565dc62 commit 941e58ec8f3c6d56d037cd1bf1b52bbe2565dc62 Author: Matthew Seaman AuthorDate: 2021-08-23 11:12:53 +0000 Commit: Matthew Seaman CommitDate: 2021-08-23 11:12:53 +0000 devel/py-yamllint: update to 1.26.3 ChangeLog: https://github.com/adrienverge/yamllint/blob/v1.26.3/CHANGELOG.rst --- devel/py-yamllint/Makefile | 2 +- devel/py-yamllint/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devel/py-yamllint/Makefile b/devel/py-yamllint/Makefile index 03ed3ff2c938..c75aafa73a0d 100644 --- a/devel/py-yamllint/Makefile +++ b/devel/py-yamllint/Makefile @@ -1,5 +1,5 @@ PORTNAME= yamllint -PORTVERSION= 1.26.2 +PORTVERSION= 1.26.3 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-yamllint/distinfo b/devel/py-yamllint/distinfo index 9d2a39c187e7..30fd75a0723a 100644 --- a/devel/py-yamllint/distinfo +++ b/devel/py-yamllint/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1628422502 -SHA256 (yamllint-1.26.2.tar.gz) = 0b08a96750248fdf21f1e8193cb7787554ef75ed57b27f621cd6b3bf09af11a1 -SIZE (yamllint-1.26.2.tar.gz) = 126786 +TIMESTAMP = 1629716654 +SHA256 (yamllint-1.26.3.tar.gz) = 3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e +SIZE (yamllint-1.26.3.tar.gz) = 126746 From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 11:29:46 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 390E5669849; Mon, 23 Aug 2021 11:29:46 +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 4GtVQL0j1wz51By; Mon, 23 Aug 2021 11:29:46 +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 01272134C3; Mon, 23 Aug 2021 11:29:46 +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 17NBTjeN030413; Mon, 23 Aug 2021 11:29:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NBTjLw030412; Mon, 23 Aug 2021 11:29:45 GMT (envelope-from git) Date: Mon, 23 Aug 2021 11:29:45 GMT Message-Id: <202108231129.17NBTjLw030412@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthew Seaman Subject: git: f199abc9fe1e - main - sysutils/rsyslog8: update to 8.2108.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: matthew X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f199abc9fe1e344d70fa17eca03653a67304a64a Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 11:29:46 -0000 The branch main has been updated by matthew: URL: https://cgit.FreeBSD.org/ports/commit/?id=f199abc9fe1e344d70fa17eca03653a67304a64a commit f199abc9fe1e344d70fa17eca03653a67304a64a Author: Matthew Seaman AuthorDate: 2021-08-23 11:29:05 +0000 Commit: Matthew Seaman CommitDate: 2021-08-23 11:29:05 +0000 sysutils/rsyslog8: update to 8.2108.0 ChangeLog: https://github.com/rsyslog/rsyslog/blob/v8.2108.0/ChangeLog --- sysutils/rsyslog8/Makefile | 2 +- sysutils/rsyslog8/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 554215a2ab68..d79362fe36a2 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -1,5 +1,5 @@ PORTNAME= rsyslog -PORTVERSION= 8.2106.0 +PORTVERSION= 8.2108.0 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo index df95e19a7ae0..acdfa6d05026 100644 --- a/sysutils/rsyslog8/distinfo +++ b/sysutils/rsyslog8/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1627203147 -SHA256 (rsyslog-8.2106.0.tar.gz) = faf45c25a2265c001739e8888b3652cf685eb3f35cd65d17d5c38fd44b9ddd81 -SIZE (rsyslog-8.2106.0.tar.gz) = 3180745 +TIMESTAMP = 1629717279 +SHA256 (rsyslog-8.2108.0.tar.gz) = 4826c2b6d081a9c95f469fb0115be3f9512065297d3de00ec513758cdb30b1d9 +SIZE (rsyslog-8.2108.0.tar.gz) = 3204178 From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 11:42:39 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B8AD2669B1B; Mon, 23 Aug 2021 11:42:39 +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 4GtVjC4Qy0z53mB; Mon, 23 Aug 2021 11:42:39 +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 7E9F313670; Mon, 23 Aug 2021 11:42:39 +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 17NBgdoM056475; Mon, 23 Aug 2021 11:42:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NBgdCW056474; Mon, 23 Aug 2021 11:42:39 GMT (envelope-from git) Date: Mon, 23 Aug 2021 11:42:39 GMT Message-Id: <202108231142.17NBgdCW056474@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Danilo G. Baio" Subject: git: c244f52f6f58 - main - sysutils/duplicity: Update to 0.8.20 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c244f52f6f587e698360f36a2758dc5984f8d9a5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 11:42:39 -0000 The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/ports/commit/?id=c244f52f6f587e698360f36a2758dc5984f8d9a5 commit c244f52f6f587e698360f36a2758dc5984f8d9a5 Author: Danilo G. Baio AuthorDate: 2021-08-23 11:38:03 +0000 Commit: Danilo G. Baio CommitDate: 2021-08-23 11:41:02 +0000 sysutils/duplicity: Update to 0.8.20 Changelog: https://launchpad.net/duplicity/+milestone/0.8.20 PR: 257996 Submitted by: PopularMoment@protonmail.com (Based on) --- sysutils/duplicity/Makefile | 5 +++-- sysutils/duplicity/distinfo | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sysutils/duplicity/Makefile b/sysutils/duplicity/Makefile index 8e58d774c0b9..380e2c7aed91 100644 --- a/sysutils/duplicity/Makefile +++ b/sysutils/duplicity/Makefile @@ -1,9 +1,9 @@ # Created by: Gerhard Häring PORTNAME= duplicity -PORTVERSION= 0.8.19 +PORTVERSION= 0.8.20 CATEGORIES= sysutils -MASTER_SITES= https://code.launchpad.net/duplicity/0.8-series/${PORTVERSION}/+download/ +MASTER_SITES= CHEESESHOP MAINTAINER= dbaio@FreeBSD.org COMMENT= Backup tool that uses librsync and GnuPG @@ -59,6 +59,7 @@ post-patch: .for f in cfbackend _cf_cloudfiles _cf_pyrax giobackend @${RM} ${WRKSRC}/${PORTNAME}/backends/${f}.py .endfor + @${REINPLACE_CMD} '/self.inplace = True/d' ${WRKSRC}/setup.py post-patch-NLS-off: @${REINPLACE_CMD} -e '109,133d' \ diff --git a/sysutils/duplicity/distinfo b/sysutils/duplicity/distinfo index e8ca2f6e7b67..b0afbef7741a 100644 --- a/sysutils/duplicity/distinfo +++ b/sysutils/duplicity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619889624 -SHA256 (duplicity-0.8.19.tar.gz) = 8c448bb80d0a0f0e57af0ce0f686550513d8865739affcdbf8ef24fec8cd03b0 -SIZE (duplicity-0.8.19.tar.gz) = 1372739 +TIMESTAMP = 1629651130 +SHA256 (duplicity-0.8.20.tar.gz) = 488af2ecadb059214074f2b3ac51bf9d7de55a800e37ccc2f1075cd0a74940e3 +SIZE (duplicity-0.8.20.tar.gz) = 1364900 From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 12:43:16 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1012D66AD24; Mon, 23 Aug 2021 12:43:16 +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 4GtX376yGVz3Mmd; Mon, 23 Aug 2021 12:43:15 +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 D7D9414544; Mon, 23 Aug 2021 12:43:15 +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 17NChFx9037397; Mon, 23 Aug 2021 12:43:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NChFgk037396; Mon, 23 Aug 2021 12:43:15 GMT (envelope-from git) Date: Mon, 23 Aug 2021 12:43:15 GMT Message-Id: <202108231243.17NChFgk037396@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: bce881ec1ae3 - main - security/opensc: update to 0.22.0 release. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bce881ec1ae39539cb9273547d9e6c7d00511174 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 12:43:16 -0000 The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=bce881ec1ae39539cb9273547d9e6c7d00511174 commit bce881ec1ae39539cb9273547d9e6c7d00511174 Author: Alex Dupre AuthorDate: 2021-08-23 12:42:02 +0000 Commit: Alex Dupre CommitDate: 2021-08-23 12:43:10 +0000 security/opensc: update to 0.22.0 release. --- security/opensc/Makefile | 2 +- security/opensc/distinfo | 6 +++--- security/opensc/pkg-plist | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/security/opensc/Makefile b/security/opensc/Makefile index 44046423cad3..cd7337e5b74c 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,7 +1,7 @@ # Created by: Bruce M Simpson PORTNAME= opensc -DISTVERSION= 0.21.0 +DISTVERSION= 0.22.0 CATEGORIES= security devel MAINTAINER= ale@FreeBSD.org diff --git a/security/opensc/distinfo b/security/opensc/distinfo index 1c1608c1eff4..81d038cfa617 100644 --- a/security/opensc/distinfo +++ b/security/opensc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1606234934 -SHA256 (OpenSC-OpenSC-0.21.0_GH0.tar.gz) = d4ee136d1b3a764868433da01857da7347de240e0c82545faa8659c2384ee43d -SIZE (OpenSC-OpenSC-0.21.0_GH0.tar.gz) = 1751439 +TIMESTAMP = 1629715841 +SHA256 (OpenSC-OpenSC-0.22.0_GH0.tar.gz) = 138acf5724573d68bdfaf988bb05c00391edbfe262e69835813ed6bd00748c7a +SIZE (OpenSC-OpenSC-0.22.0_GH0.tar.gz) = 1789287 diff --git a/security/opensc/pkg-plist b/security/opensc/pkg-plist index 70ad81ca48a3..8504c778ac46 100644 --- a/security/opensc/pkg-plist +++ b/security/opensc/pkg-plist @@ -48,11 +48,11 @@ etc/bash_completion.d/westcos-tool etc/xdg/autostart/pkcs11-register.desktop lib/libopensc.a lib/libopensc.so -lib/libopensc.so.7 -lib/libopensc.so.7.0.0 +lib/libopensc.so.8 +lib/libopensc.so.8.0.0 %%SM%%lib/libsmm-local.so -%%SM%%lib/libsmm-local.so.7 -%%SM%%lib/libsmm-local.so.7.0.0 +%%SM%%lib/libsmm-local.so.8 +%%SM%%lib/libsmm-local.so.8.0.0 lib/onepin-opensc-pkcs11.so lib/opensc-pkcs11.so lib/pkcs11-spy.so From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 12:43:18 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 91A0566AA50; Mon, 23 Aug 2021 12:43:18 +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 4GtX3B2Rv2z3Mmp; Mon, 23 Aug 2021 12:43:18 +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 2B02814A02; Mon, 23 Aug 2021 12:43:18 +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 17NChIL4037448; Mon, 23 Aug 2021 12:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NChI4a037447; Mon, 23 Aug 2021 12:43:18 GMT (envelope-from git) Date: Mon, 23 Aug 2021 12:43:18 GMT Message-Id: <202108231243.17NChI4a037447@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: a539fccd4ebf - main - lang/solidity: update to 0.8.7 release. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a539fccd4ebf0549602eb6834ae005265b14ecf4 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 12:43:18 -0000 The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=a539fccd4ebf0549602eb6834ae005265b14ecf4 commit a539fccd4ebf0549602eb6834ae005265b14ecf4 Author: Alex Dupre AuthorDate: 2021-08-23 12:42:56 +0000 Commit: Alex Dupre CommitDate: 2021-08-23 12:43:11 +0000 lang/solidity: update to 0.8.7 release. --- lang/solidity/Makefile | 2 +- lang/solidity/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile index ea9f37bd623a..070e10b95002 100644 --- a/lang/solidity/Makefile +++ b/lang/solidity/Makefile @@ -1,7 +1,7 @@ # Created by: Alex Dupre PORTNAME= solidity -PORTVERSION= 0.8.6 +PORTVERSION= 0.8.7 CATEGORIES= lang MASTER_SITES= https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/lang/solidity/distinfo b/lang/solidity/distinfo index a419dd8ee15b..7cfe0e56e6fa 100644 --- a/lang/solidity/distinfo +++ b/lang/solidity/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1624394993 -SHA256 (solidity_0.8.6.tar.gz) = 523c83417feb5b6c4b5531ce903ed60251ec9893ed665522a20ba027906038f5 -SIZE (solidity_0.8.6.tar.gz) = 2830671 +TIMESTAMP = 1629715711 +SHA256 (solidity_0.8.7.tar.gz) = cc5be5d507604fb5c8a403f22122eabc00f8b58ecaedb18c6f4c6f28300a615b +SIZE (solidity_0.8.7.tar.gz) = 2771717 From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 12:43:17 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 672B966AD25; Mon, 23 Aug 2021 12:43:17 +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 4GtX39167Pz3Mkk; Mon, 23 Aug 2021 12:43:17 +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 05CB2149AD; Mon, 23 Aug 2021 12:43:17 +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 17NChGnZ037421; Mon, 23 Aug 2021 12:43:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NChG9o037420; Mon, 23 Aug 2021 12:43:16 GMT (envelope-from git) Date: Mon, 23 Aug 2021 12:43:16 GMT Message-Id: <202108231243.17NChG9o037420@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alex Dupre Subject: git: b90eb93d2118 - main - java/apache-commons-pool: update to 2.11.1 release. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b90eb93d21185c7ff3ef664e8a75419f86a66caa Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 12:43:17 -0000 The branch main has been updated by ale: URL: https://cgit.FreeBSD.org/ports/commit/?id=b90eb93d21185c7ff3ef664e8a75419f86a66caa commit b90eb93d21185c7ff3ef664e8a75419f86a66caa Author: Alex Dupre AuthorDate: 2021-08-23 12:42:32 +0000 Commit: Alex Dupre CommitDate: 2021-08-23 12:43:10 +0000 java/apache-commons-pool: update to 2.11.1 release. --- java/apache-commons-pool/Makefile | 2 +- java/apache-commons-pool/distinfo | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/apache-commons-pool/Makefile b/java/apache-commons-pool/Makefile index a05a56aa75f6..247da3a499b2 100644 --- a/java/apache-commons-pool/Makefile +++ b/java/apache-commons-pool/Makefile @@ -1,7 +1,7 @@ # Created by: Anton Yudin PORTNAME= commons-pool -PORTVERSION= 2.9.0 +PORTVERSION= 2.11.1 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-pool/distinfo b/java/apache-commons-pool/distinfo index 8789d03a5877..1e30b0b30968 100644 --- a/java/apache-commons-pool/distinfo +++ b/java/apache-commons-pool/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1604497599 -SHA256 (commons-pool2-2.9.0-bin.tar.gz) = 3e84d5bb006834c9087e18d8d2333f047469aa54da8cb0aac3474dfb74efafcd -SIZE (commons-pool2-2.9.0-bin.tar.gz) = 1241455 +TIMESTAMP = 1629716039 +SHA256 (commons-pool2-2.11.1-bin.tar.gz) = ddc271e81a9fd4d76355991f4715db8c2085b737c67ad6aba098c3a5d7cdc9b3 +SIZE (commons-pool2-2.11.1-bin.tar.gz) = 1337084 From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 12:48:28 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0599566AA63; Mon, 23 Aug 2021 12:48:28 +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 4GtX976mWtz3NXB; Mon, 23 Aug 2021 12:48:27 +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 D09B514547; Mon, 23 Aug 2021 12:48:27 +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 17NCmRLv038042; Mon, 23 Aug 2021 12:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NCmR6Q038041; Mon, 23 Aug 2021 12:48:27 GMT (envelope-from git) Date: Mon, 23 Aug 2021 12:48:27 GMT Message-Id: <202108231248.17NCmR6Q038041@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Vanilla I. Shu" Subject: git: de8eff3e42b9 - main - net/keycloak: update to 15.0.2. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vanilla X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de8eff3e42b928661bfb2395d1aaaef0bfdfe211 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 12:48:28 -0000 The branch main has been updated by vanilla: URL: https://cgit.FreeBSD.org/ports/commit/?id=de8eff3e42b928661bfb2395d1aaaef0bfdfe211 commit de8eff3e42b928661bfb2395d1aaaef0bfdfe211 Author: Vanilla I. Shu AuthorDate: 2021-08-23 12:44:07 +0000 Commit: Vanilla I. Shu CommitDate: 2021-08-23 12:48:21 +0000 net/keycloak: update to 15.0.2. PR: 257974 Reported by: maintainer --- net/keycloak/Makefile | 2 +- net/keycloak/distinfo | 6 +++--- net/keycloak/pkg-plist | 54 +++++++++++++++++++++++++------------------------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/net/keycloak/Makefile b/net/keycloak/Makefile index 02e23962d14d..54423891e72b 100644 --- a/net/keycloak/Makefile +++ b/net/keycloak/Makefile @@ -1,5 +1,5 @@ PORTNAME= keycloak -PORTVERSION= 15.0.1 +PORTVERSION= 15.0.2 CATEGORIES= net java MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/ diff --git a/net/keycloak/distinfo b/net/keycloak/distinfo index cbaea24d0c7f..e065d8b0f587 100644 --- a/net/keycloak/distinfo +++ b/net/keycloak/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1629115603 -SHA256 (keycloak-15.0.1.tar.gz) = b6c7cc6cacb29ac0263af2a7bae8b864e918eb59733ae4747588594586c06d3c -SIZE (keycloak-15.0.1.tar.gz) = 254257742 +TIMESTAMP = 1629456746 +SHA256 (keycloak-15.0.2.tar.gz) = 1915e33b3789eb426fda06676e39b9ddf3a7b563e1e2381a92a02da814dad047 +SIZE (keycloak-15.0.2.tar.gz) = 253994058 diff --git a/net/keycloak/pkg-plist b/net/keycloak/pkg-plist index 1fe72f3d67ec..3a45c9f4fb42 100644 --- a/net/keycloak/pkg-plist +++ b/net/keycloak/pkg-plist @@ -51,7 +51,7 @@ bin/kcreg %%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.infinispan,infinispan-jboss-marshalling,11.0.9.Final,Apache Software License 2.0.txt %%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.jboss.marshalling,jboss-marshalling-river,2.0.11.Final,Apache Software License 2.0.txt %%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.jboss.marshalling,jboss-marshalling,2.0.11.Final,Apache Software License 2.0.txt -%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.keycloak,keycloak-server-feature-pack-dependencies,15.0.1,Apache Software License 2.0.txt +%%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.keycloak,keycloak-server-feature-pack-dependencies,15.0.2,Apache Software License 2.0.txt %%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.liquibase,liquibase-core,3.5.5,Apache Software License 2.0.txt %%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/org.twitter4j,twitter4j-core,4.0.7,Apache Software License 2.0.txt %%PORTDOCS%%%%DOCSDIR%%/licenses-keycloak/path-to-regexp,MIT.txt @@ -587,8 +587,8 @@ bin/kcreg %%JAVASHAREDIR%%/keycloak/bin/client/README-EJB-JMS.txt %%JAVASHAREDIR%%/keycloak/bin/client/jboss-cli-client.jar %%JAVASHAREDIR%%/keycloak/bin/client/jboss-client.jar -%%JAVASHAREDIR%%/keycloak/bin/client/keycloak-admin-cli-15.0.1.jar -%%JAVASHAREDIR%%/keycloak/bin/client/keycloak-client-registration-cli-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/bin/client/keycloak-admin-cli-15.0.2.jar +%%JAVASHAREDIR%%/keycloak/bin/client/keycloak-client-registration-cli-15.0.2.jar %%JAVASHAREDIR%%/keycloak/bin/common.sh %%JAVASHAREDIR%%/keycloak/bin/domain.sh %%JAVASHAREDIR%%/keycloak/bin/elytron-tool.sh @@ -1803,45 +1803,45 @@ bin/kcreg %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/jboss/marshalling/main/module.xml %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/jboss/marshalling/river/main/jboss-marshalling-river-2.0.11.Final.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/jboss/marshalling/river/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-authz-policy-common/main/keycloak-authz-policy-common-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-authz-policy-common/main/keycloak-authz-policy-common-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-authz-policy-common/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-common/main/keycloak-common-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-common/main/keycloak-common-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-common/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-core/main/keycloak-core-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-core/main/keycloak-core-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-core/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-js-adapter/main/keycloak-js-adapter-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-js-adapter/main/keycloak-js-adapter-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-js-adapter/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-kerberos-federation/main/keycloak-kerberos-federation-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-kerberos-federation/main/keycloak-kerberos-federation-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-kerberos-federation/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-ldap-federation/main/keycloak-ldap-federation-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-ldap-federation/main/keycloak-ldap-federation-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-ldap-federation/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-model-infinispan/main/keycloak-model-infinispan-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-model-infinispan/main/keycloak-model-infinispan-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-model-infinispan/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-model-jpa/main/keycloak-model-jpa-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-model-jpa/main/keycloak-model-jpa-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-model-jpa/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-model-map/main/keycloak-model-map-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-model-map/main/keycloak-model-map-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-model-map/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-saml-core-public/main/keycloak-saml-core-public-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-saml-core-public/main/keycloak-saml-core-public-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-saml-core-public/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-saml-core/main/keycloak-saml-core-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-saml-core/main/keycloak-saml-core-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-saml-core/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi-private/main/keycloak-server-spi-private-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi-private/main/keycloak-server-spi-private-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi-private/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi/main/keycloak-server-spi-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi/main/keycloak-server-spi-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-spi/main/module.xml %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/dependencies/main/module.xml %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/main/module.xml %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/jboss-deployment-structure.xml %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-server-subsystem/main/server-war/WEB-INF/web.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/keycloak-services-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/keycloak-services-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-services/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-sssd-federation/main/keycloak-sssd-federation-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-sssd-federation/main/keycloak-sssd-federation-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-sssd-federation/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-adduser/main/keycloak-wildfly-adduser-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-adduser/main/keycloak-wildfly-adduser-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-adduser/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-extensions/main/keycloak-wildfly-extensions-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-extensions/main/keycloak-wildfly-extensions-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-extensions/main/module.xml -%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/keycloak-wildfly-server-subsystem-15.0.1.jar +%%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/keycloak-wildfly-server-subsystem-15.0.2.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/keycloak/keycloak-wildfly-server-subsystem/main/module.xml %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/liquibase/main/liquibase-core-3.5.5.jar %%JAVASHAREDIR%%/keycloak/modules/system/layers/keycloak/org/liquibase/main/module.xml @@ -2793,12 +2793,12 @@ bin/kcreg %%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/@patternfly/react-icons.js.map %%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/@patternfly/react-styles.js %%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/@patternfly/react-styles.js.map -%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/_commonjsHelpers-27999cb0.js -%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/_commonjsHelpers-27999cb0.js.map -%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/index-bcf5d3d3.js -%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/index-bcf5d3d3.js.map -%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/StyleSheet-e7d53fc1.js -%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/StyleSheet-e7d53fc1.js.map +%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/_commonjsHelpers-b1deedd1.js +%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/_commonjsHelpers-b1deedd1.js.map +%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/index-1c71a884.js +%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/index-1c71a884.js.map +%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/StyleSheet-b0b30799.js +%%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/common/StyleSheet-b0b30799.js.map %%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/import-map.json %%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/react-dom.js %%JAVASHAREDIR%%/keycloak/themes/keycloak/common/resources/web_modules/react-dom.js.map From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 12:52:42 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D90A766AE06; Mon, 23 Aug 2021 12:52:42 +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 4GtXG25LCSz3PfM; Mon, 23 Aug 2021 12:52:42 +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 A00B6149E7; Mon, 23 Aug 2021 12:52:42 +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 17NCqgQk050864; Mon, 23 Aug 2021 12:52:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NCqgMR050863; Mon, 23 Aug 2021 12:52:42 GMT (envelope-from git) Date: Mon, 23 Aug 2021 12:52:42 GMT Message-Id: <202108231252.17NCqgMR050863@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 07523098e63b - main - audio/shortwave: sort USE_* MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07523098e63b9e1ec8ac27b8a84009af0f803b58 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 12:52:42 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=07523098e63b9e1ec8ac27b8a84009af0f803b58 commit 07523098e63b9e1ec8ac27b8a84009af0f803b58 Author: Jan Beich AuthorDate: 2021-08-23 11:59:35 +0000 Commit: Jan Beich CommitDate: 2021-08-23 12:52:23 +0000 audio/shortwave: sort USE_* --- audio/shortwave/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/shortwave/Makefile b/audio/shortwave/Makefile index bdab5a8a8b94..d368957dbb5b 100644 --- a/audio/shortwave/Makefile +++ b/audio/shortwave/Makefile @@ -13,8 +13,8 @@ LIB_DEPENDS= libdbus-1.so:devel/dbus USES= cargo gettext gnome meson pkgconfig python:build shebangfix sqlite ssl USE_GITHUB= nodefault USE_GITLAB= yes -USE_GSTREAMER1= good libav soup vorbis USE_GNOME= gdkpixbuf2 gtk40 libadwaita +USE_GSTREAMER1= good libav soup vorbis GH_TUPLE= gtk-rs:gtk3-rs:1ca4fbcc30ec882f6079f26018c30ef1ceb8a2e2:gtk3 \ gtk-rs:gtk4-rs:534f63e66a2a3883770fe110a8a556a4b40f84b3:gtk4 GL_SITE= https://gitlab.gnome.org From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 12:52:44 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 15C7B66AD51; Mon, 23 Aug 2021 12:52:44 +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 4GtXG36TZNz3PtW; Mon, 23 Aug 2021 12:52:43 +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 C359E14C0C; Mon, 23 Aug 2021 12:52:43 +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 17NCqh36050893; Mon, 23 Aug 2021 12:52:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NCqhQm050892; Mon, 23 Aug 2021 12:52:43 GMT (envelope-from git) Date: Mon, 23 Aug 2021 12:52:43 GMT Message-Id: <202108231252.17NCqhQm050892@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: ee68b684176b - main - deskutils/solanum: drop unused substitution MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ee68b684176b7b19cb107ab10e68f32230c0d6eb Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 12:52:44 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee68b684176b7b19cb107ab10e68f32230c0d6eb commit ee68b684176b7b19cb107ab10e68f32230c0d6eb Author: Jan Beich AuthorDate: 2021-08-23 11:58:00 +0000 Commit: Jan Beich CommitDate: 2021-08-23 12:52:23 +0000 deskutils/solanum: drop unused substitution --- deskutils/solanum/Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/deskutils/solanum/Makefile b/deskutils/solanum/Makefile index f8698e0af391..dd9bb1591c7c 100644 --- a/deskutils/solanum/Makefile +++ b/deskutils/solanum/Makefile @@ -126,8 +126,6 @@ pre-patch: 's,\(gtk-rs\)/gtk-rs,\1/gtk3-rs,' post-patch: - @${REINPLACE_CMD} -e "/vcs_tag/s/=.*/= '${DISTVERSIONFULL}'/" \ - ${WRKSRC}/meson.build # Make each cargo subcommand very verbose @${REINPLACE_CMD} -e '/cargo/s/ --/&verbose&verbose&/' \ ${WRKSRC}/build-aux/cargo.sh From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 12:52:45 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69CDC66B005; Mon, 23 Aug 2021 12:52:45 +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 4GtXG51Rfwz3PtZ; Mon, 23 Aug 2021 12:52:45 +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 E046E149E8; Mon, 23 Aug 2021 12:52:44 +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 17NCqiMK050919; Mon, 23 Aug 2021 12:52:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NCqi0S050918; Mon, 23 Aug 2021 12:52:44 GMT (envelope-from git) Date: Mon, 23 Aug 2021 12:52:44 GMT Message-Id: <202108231252.17NCqi0S050918@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: d88adb1c0af3 - main - x11-toolkits/gstreamer1-plugins-gtk4: add new port MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d88adb1c0af3a6b9160a0ecdcc242ad91973d6dd Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 12:52:45 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d88adb1c0af3a6b9160a0ecdcc242ad91973d6dd commit d88adb1c0af3a6b9160a0ecdcc242ad91973d6dd Author: Jan Beich AuthorDate: 2021-08-23 10:30:02 +0000 Commit: Jan Beich CommitDate: 2021-08-23 12:52:23 +0000 x11-toolkits/gstreamer1-plugins-gtk4: add new port GTK4 plugin contains: - gtk4glsink: A video sink that renders to a GtkWidget using OpenGL - gtk4sink: A video sink that renders to a GtkWidget https://gstreamer.freedesktop.org/documentation/gtk/gtksink.html --- Mk/bsd.gstreamer.mk | 4 + x11-toolkits/Makefile | 1 + x11-toolkits/gstreamer1-plugins-gtk4/Makefile | 20 + x11-toolkits/gstreamer1-plugins-gtk4/distinfo | 3 + .../gstreamer1-plugins-gtk4/files/patch-gtk4 | 1145 ++++++++++++++++++++ x11-toolkits/gstreamer1-plugins-gtk4/pkg-descr | 6 + 6 files changed, 1179 insertions(+) diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk index 8e77a7d4c771..c6009f416a50 100644 --- a/Mk/bsd.gstreamer.mk +++ b/Mk/bsd.gstreamer.mk @@ -111,6 +111,7 @@ _GSTREAMER_PLUGINS+= \ dvdread \ editing-services \ gtk \ + gtk4 \ hls \ kate \ kms \ @@ -476,6 +477,9 @@ ximagesrc_IMPL= good gtk_DEPENDS= x11-toolkits/gstreamer-plugins-gtk gtk_IMPL= bad +gtk4_DEPENDS= x11-toolkits/gstreamer-plugins-gtk4 +gtk4_IMPL= good + pango_DEPENDS= x11-toolkits/gstreamer-plugins-pango pango_IMPL= # diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile index 4c1274243d7b..a0a801bfc0e7 100644 --- a/x11-toolkits/Makefile +++ b/x11-toolkits/Makefile @@ -23,6 +23,7 @@ SUBDIR += gnustep-gui SUBDIR += granite SUBDIR += gstreamer1-plugins-gtk + SUBDIR += gstreamer1-plugins-gtk4 SUBDIR += gstreamer1-plugins-pango SUBDIR += gtk-layer-shell SUBDIR += gtk-sharp-beans diff --git a/x11-toolkits/gstreamer1-plugins-gtk4/Makefile b/x11-toolkits/gstreamer1-plugins-gtk4/Makefile new file mode 100644 index 000000000000..61882b85e10e --- /dev/null +++ b/x11-toolkits/gstreamer1-plugins-gtk4/Makefile @@ -0,0 +1,20 @@ +PORTNAME= gstreamer1-plugins-gtk4 +DISTVERSION= 1.16.2 +CATEGORIES= x11-toolkits +MASTER_SITES= GNOME/sources/${DISTNAME:S/-${DISTVERSION}/\/${DISTVERSION:R}/} \ + https://gstreamer.freedesktop.org/src/${DISTNAME:S/-${DISTVERSION}//}/ +DISTNAME= gst-plugins-good-${DISTVERSION} + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= GStreamer GTK4 video sink plugin + +LICENSE= LGPL21+ +LICENSE_FILE= ${WRKSRC}/COPYING + +USES= compiler:c11 gnome meson pkgconfig tar:xz +USE_GNOME= cairo gtk40 +USE_GSTREAMER1= gl +MESON_ARGS= --auto-features=disabled -Dgtk4=enabled +PLIST_FILES= lib/gstreamer-1.0/libgstgtk4.so + +.include diff --git a/x11-toolkits/gstreamer1-plugins-gtk4/distinfo b/x11-toolkits/gstreamer1-plugins-gtk4/distinfo new file mode 100644 index 000000000000..c4d7ce4bad12 --- /dev/null +++ b/x11-toolkits/gstreamer1-plugins-gtk4/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1575371194 +SHA256 (gst-plugins-good-1.16.2.tar.xz) = 40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97ac3f9b0171b1319 +SIZE (gst-plugins-good-1.16.2.tar.xz) = 3897172 diff --git a/x11-toolkits/gstreamer1-plugins-gtk4/files/patch-gtk4 b/x11-toolkits/gstreamer1-plugins-gtk4/files/patch-gtk4 new file mode 100644 index 000000000000..8b1fe8e0a512 --- /dev/null +++ b/x11-toolkits/gstreamer1-plugins-gtk4/files/patch-gtk4 @@ -0,0 +1,1145 @@ +https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/767 + +--- ext/gtk/gstgtkbasesink.c.orig 2019-12-03 11:06:37 UTC ++++ ext/gtk/gstgtkbasesink.c +@@ -1,6 +1,7 @@ + /* + * GStreamer + * Copyright (C) 2015 Matthew Waters ++ * Copyright (C) 2020 Rafał Dzięgiel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public +@@ -77,7 +78,7 @@ G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstGtkBaseSink, gst_ + G_IMPLEMENT_INTERFACE (GST_TYPE_NAVIGATION, + gst_gtk_base_sink_navigation_interface_init); + GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_sink, +- "gtkbasesink", 0, "Gtk Video Sink base class")); ++ "gtkbasesink", 0, "GTK Video Sink base class")); + + + static void +@@ -97,7 +98,7 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl + gobject_class->get_property = gst_gtk_base_sink_get_property; + + g_object_class_install_property (gobject_class, PROP_WIDGET, +- g_param_spec_object ("widget", "Gtk Widget", ++ g_param_spec_object ("widget", "GTK Widget", + "The GtkWidget to place in the widget hierarchy " + "(must only be get from the GTK main thread)", + GTK_TYPE_WIDGET, G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); +@@ -114,10 +115,13 @@ gst_gtk_base_sink_class_init (GstGtkBaseSinkClass * kl + "The pixel aspect ratio of the device", DEFAULT_PAR_N, DEFAULT_PAR_D, + G_MAXINT, 1, 1, 1, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + ++ /* Disabling alpha was removed in GTK4 */ ++#if !defined(BUILD_FOR_GTK4) + g_object_class_install_property (gobject_class, PROP_IGNORE_ALPHA, + g_param_spec_boolean ("ignore-alpha", "Ignore Alpha", + "When enabled, alpha will be ignored and converted to black", + DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); ++#endif + + gobject_class->finalize = gst_gtk_base_sink_finalize; + +@@ -144,6 +148,8 @@ gst_gtk_base_sink_finalize (GObject * object) + { + GstGtkBaseSink *gtk_sink = GST_GTK_BASE_SINK (object); + ++ GST_DEBUG ("finalizing base sink"); ++ + GST_OBJECT_LOCK (gtk_sink); + if (gtk_sink->window && gtk_sink->window_destroy_id) + g_signal_handler_disconnect (gtk_sink->window, gtk_sink->window_destroy_id); +@@ -168,6 +174,14 @@ static void + window_destroy_cb (GtkWidget * widget, GstGtkBaseSink * gtk_sink) + { + GST_OBJECT_LOCK (gtk_sink); ++ if (gtk_sink->widget) { ++ if (gtk_sink->widget_destroy_id) { ++ g_signal_handler_disconnect (gtk_sink->widget, ++ gtk_sink->widget_destroy_id); ++ gtk_sink->widget_destroy_id = 0; ++ } ++ g_clear_object (>k_sink->widget); ++ } + gtk_sink->window = NULL; + GST_OBJECT_UNLOCK (gtk_sink); + } +@@ -180,7 +194,11 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin + + /* Ensure GTK is initialized, this has no side effect if it was already + * initialized. Also, we do that lazily, so the application can be first */ +- if (!gtk_init_check (NULL, NULL)) { ++ if (!gtk_init_check ( ++#if !defined(BUILD_FOR_GTK4) ++ NULL, NULL ++#endif ++ )) { + GST_ERROR_OBJECT (gtk_sink, "Could not ensure GTK initialization."); + return NULL; + } +@@ -195,13 +213,16 @@ gst_gtk_base_sink_get_widget (GstGtkBaseSink * gtk_sin + gtk_sink->bind_pixel_aspect_ratio = + g_object_bind_property (gtk_sink, "pixel-aspect-ratio", gtk_sink->widget, + "pixel-aspect-ratio", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); ++#if !defined(BUILD_FOR_GTK4) + gtk_sink->bind_ignore_alpha = + g_object_bind_property (gtk_sink, "ignore-alpha", gtk_sink->widget, + "ignore-alpha", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); ++#endif + + /* Take the floating ref, other wise the destruction of the container will + * make this widget disapear possibly before we are done. */ + gst_object_ref_sink (gtk_sink->widget); ++ + gtk_sink->widget_destroy_id = g_signal_connect (gtk_sink->widget, "destroy", + G_CALLBACK (widget_destroy_cb), gtk_sink); + +@@ -311,25 +332,55 @@ gst_gtk_base_sink_start_on_main (GstBaseSink * bsink) + GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink); + GstGtkBaseSinkClass *klass = GST_GTK_BASE_SINK_GET_CLASS (bsink); + GtkWidget *toplevel; ++#if defined(BUILD_FOR_GTK4) ++ GtkRoot *root; ++#endif + + if (gst_gtk_base_sink_get_widget (gst_sink) == NULL) + return FALSE; + + /* After this point, gtk_sink->widget will always be set */ + ++#if defined(BUILD_FOR_GTK4) ++ root = gtk_widget_get_root (GTK_WIDGET (gst_sink->widget)); ++ if (!GTK_IS_ROOT (root)) { ++ GtkWidget *parent = gtk_widget_get_parent (GTK_WIDGET (gst_sink->widget)); ++ if (parent) { ++ GtkWidget *temp_parent; ++ while ((temp_parent = gtk_widget_get_parent (parent))) ++ parent = temp_parent; ++ } ++ toplevel = (parent) ? parent : GTK_WIDGET (gst_sink->widget); ++#else + toplevel = gtk_widget_get_toplevel (GTK_WIDGET (gst_sink->widget)); + if (!gtk_widget_is_toplevel (toplevel)) { ++#endif + /* sanity check */ + g_assert (klass->window_title); + + /* User did not add widget its own UI, let's popup a new GtkWindow to + * make gst-launch-1.0 work. */ +- gst_sink->window = gtk_window_new (GTK_WINDOW_TOPLEVEL); ++ gst_sink->window = gtk_window_new ( ++#if !defined(BUILD_FOR_GTK4) ++ GTK_WINDOW_TOPLEVEL ++#endif ++ ); + gtk_window_set_default_size (GTK_WINDOW (gst_sink->window), 640, 480); + gtk_window_set_title (GTK_WINDOW (gst_sink->window), klass->window_title); +- gtk_container_add (GTK_CONTAINER (gst_sink->window), toplevel); +- gst_sink->window_destroy_id = g_signal_connect (gst_sink->window, "destroy", +- G_CALLBACK (window_destroy_cb), gst_sink); ++#if defined(BUILD_FOR_GTK4) ++ gtk_window_set_child (GTK_WINDOW ( ++#else ++ gtk_container_add (GTK_CONTAINER ( ++#endif ++ gst_sink->window), toplevel); ++ ++ gst_sink->window_destroy_id = g_signal_connect ( ++#if defined(BUILD_FOR_GTK4) ++ GTK_WINDOW (gst_sink->window), ++#else ++ gst_sink->window, ++#endif ++ "destroy", G_CALLBACK (window_destroy_cb), gst_sink); + } + + return TRUE; +@@ -348,7 +399,11 @@ gst_gtk_base_sink_stop_on_main (GstBaseSink * bsink) + GstGtkBaseSink *gst_sink = GST_GTK_BASE_SINK (bsink); + + if (gst_sink->window) { ++#if defined(BUILD_FOR_GTK4) ++ gtk_window_destroy (GTK_WINDOW (gst_sink->window)); ++#else + gtk_widget_destroy (gst_sink->window); ++#endif + gst_sink->window = NULL; + gst_sink->widget = NULL; + } +@@ -369,10 +424,14 @@ gst_gtk_base_sink_stop (GstBaseSink * bsink) + } + + static void +-gst_gtk_widget_show_all_and_unref (GtkWidget * widget) ++gst_gtk_window_show_all_and_unref (GtkWidget * window) + { +- gtk_widget_show_all (widget); +- g_object_unref (widget); ++#if defined(BUILD_FOR_GTK4) ++ gtk_window_present (GTK_WINDOW (window)); ++#else ++ gtk_widget_show_all (window); ++#endif ++ g_object_unref (window); + } + + static GstStateChangeReturn +@@ -400,7 +459,7 @@ gst_gtk_base_sink_change_state (GstElement * element, + GST_OBJECT_UNLOCK (gtk_sink); + + if (window) +- gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_widget_show_all_and_unref, ++ gst_gtk_invoke_on_main ((GThreadFunc) gst_gtk_window_show_all_and_unref, + window); + + break; +--- ext/gtk/gstgtkbasesink.h.orig 2019-12-03 11:06:37 UTC ++++ ext/gtk/gstgtkbasesink.h +@@ -51,14 +51,14 @@ GType gst_gtk_base_sink_get_type (void); + struct _GstGtkBaseSink + { + /* */ +- GstVideoSink parent; ++ GstVideoSink parent; + +- GstVideoInfo v_info; ++ GstVideoInfo v_info; + + GtkGstBaseWidget *widget; + + /* properties */ +- gboolean force_aspect_ratio; ++ gboolean force_aspect_ratio; + GBinding *bind_aspect_ratio; + + gint par_n; +@@ -69,8 +69,8 @@ struct _GstGtkBaseSink + GBinding *bind_ignore_alpha; + + GtkWidget *window; +- gulong widget_destroy_id; +- gulong window_destroy_id; ++ gulong widget_destroy_id; ++ gulong window_destroy_id; + }; + + /** +--- ext/gtk/gstgtkglsink.c.orig 2019-12-03 11:06:37 UTC ++++ ext/gtk/gstgtkglsink.c +@@ -1,6 +1,7 @@ + /* + * GStreamer + * Copyright (C) 2015 Matthew Waters ++ * Copyright (C) 2020 Rafał Dzięgiel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public +@@ -23,12 +24,18 @@ + * @title: gtkglsink + */ + ++/** ++ * SECTION:element-gtk4glsink ++ * @title: gtk4glsink ++ */ ++ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + + #include + ++#include "gtkconfig.h" + #include "gstgtkglsink.h" + #include "gtkgstglwidget.h" + +@@ -58,7 +65,7 @@ static GstStaticPadTemplate gst_gtk_gl_sink_template = + #define gst_gtk_gl_sink_parent_class parent_class + G_DEFINE_TYPE_WITH_CODE (GstGtkGLSink, gst_gtk_gl_sink, + GST_TYPE_GTK_BASE_SINK, GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_gl_sink, +- "gtkglsink", 0, "Gtk GL Video Sink")); ++ GTKCONFIG_GLSINK, 0, GTKCONFIG_NAME " GL Video Sink")); + + static void + gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass) +@@ -82,11 +89,13 @@ gst_gtk_gl_sink_class_init (GstGtkGLSinkClass * klass) + gstbasesink_class->get_caps = gst_gtk_gl_sink_get_caps; + + gstgtkbasesink_class->create_widget = gtk_gst_gl_widget_new; +- gstgtkbasesink_class->window_title = "Gtk+ GL renderer"; ++ gstgtkbasesink_class->window_title = GTKCONFIG_NAME " GL Renderer"; + +- gst_element_class_set_metadata (gstelement_class, "Gtk GL Video Sink", ++ gst_element_class_set_metadata (gstelement_class, ++ GTKCONFIG_NAME " GL Video Sink", + "Sink/Video", "A video sink that renders to a GtkWidget using OpenGL", +- "Matthew Waters "); ++ "Matthew Waters , " ++ "Rafał Dzięgiel "); + + gst_element_class_add_static_pad_template (gstelement_class, + &gst_gtk_gl_sink_template); +@@ -120,16 +129,18 @@ gst_gtk_gl_sink_query (GstBaseSink * bsink, GstQuery * + } + + static void +-_size_changed_cb (GtkWidget * widget, GdkRectangle * rectangle, +- GstGtkGLSink * gtk_sink) ++_size_changed_cb (GtkWidget * widget, gint width, ++ gint height, GstGtkGLSink * gtk_sink) + { +- gint scale_factor, width, height; + gboolean reconfigure; + +- scale_factor = gtk_widget_get_scale_factor (widget); +- width = scale_factor * gtk_widget_get_allocated_width (widget); +- height = scale_factor * gtk_widget_get_allocated_height (widget); ++ GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget); + ++ /* Ignore size changes before widget is negotiated ++ * we are going to queue a resize after negotiation */ ++ if (!base_widget->negotiated) ++ return; ++ + GST_OBJECT_LOCK (gtk_sink); + reconfigure = + (width != gtk_sink->display_width || height != gtk_sink->display_height); +@@ -138,7 +149,7 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r + GST_OBJECT_UNLOCK (gtk_sink); + + if (reconfigure) { +- GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad."); ++ GST_DEBUG_OBJECT (gtk_sink, "Sending reconfigure event on sinkpad"); + gst_pad_push_event (GST_BASE_SINK (gtk_sink)->sinkpad, + gst_event_new_reconfigure ()); + } +@@ -147,9 +158,9 @@ _size_changed_cb (GtkWidget * widget, GdkRectangle * r + static void + destroy_cb (GtkWidget * widget, GstGtkGLSink * gtk_sink) + { +- if (gtk_sink->size_allocate_sig_handler) { +- g_signal_handler_disconnect (widget, gtk_sink->size_allocate_sig_handler); +- gtk_sink->size_allocate_sig_handler = 0; ++ if (gtk_sink->widget_resize_sig_handler) { ++ g_signal_handler_disconnect (widget, gtk_sink->widget_resize_sig_handler); ++ gtk_sink->widget_resize_sig_handler = 0; + } + + if (gtk_sink->widget_destroy_sig_handler) { +@@ -172,29 +183,34 @@ gst_gtk_gl_sink_start (GstBaseSink * bsink) + gst_widget = GTK_GST_GL_WIDGET (base_sink->widget); + + /* Track the allocation size */ +- gtk_sink->size_allocate_sig_handler = +- g_signal_connect (gst_widget, "size-allocate", +- G_CALLBACK (_size_changed_cb), gtk_sink); ++ if (!gtk_sink->widget_resize_sig_handler) { ++ gtk_sink->widget_resize_sig_handler = ++ g_signal_connect (gst_widget, "resize", ++ G_CALLBACK (_size_changed_cb), gtk_sink); ++ } + +- gtk_sink->widget_destroy_sig_handler = +- g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb), +- gtk_sink); ++ if (!gtk_sink->widget_destroy_sig_handler) { ++ gtk_sink->widget_destroy_sig_handler = ++ g_signal_connect (gst_widget, "destroy", G_CALLBACK (destroy_cb), ++ gtk_sink); ++ } + +- _size_changed_cb (GTK_WIDGET (gst_widget), NULL, gtk_sink); +- + if (!gtk_gst_gl_widget_init_winsys (gst_widget)) { + GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s", +- "Failed to initialize OpenGL with Gtk"), (NULL)); ++ "Failed to initialize OpenGL with GTK"), (NULL)); + return FALSE; + } + +- gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget); +- gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget); +- gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget); ++ if (!gtk_sink->display) ++ gtk_sink->display = gtk_gst_gl_widget_get_display (gst_widget); ++ if (!gtk_sink->context) ++ gtk_sink->context = gtk_gst_gl_widget_get_context (gst_widget); ++ if (!gtk_sink->gtk_context) ++ gtk_sink->gtk_context = gtk_gst_gl_widget_get_gtk_context (gst_widget); + + if (!gtk_sink->display || !gtk_sink->context || !gtk_sink->gtk_context) { + GST_ELEMENT_ERROR (bsink, RESOURCE, NOT_FOUND, ("%s", +- "Failed to retrieve OpenGL context from Gtk"), (NULL)); ++ "Failed to retrieve OpenGL context from GTK"), (NULL)); + return FALSE; + } + +@@ -208,7 +224,14 @@ static gboolean + gst_gtk_gl_sink_stop (GstBaseSink * bsink) + { + GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (bsink); ++ GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (bsink); + ++ if (gtk_sink->widget_resize_sig_handler) { ++ g_signal_handler_disconnect (base_sink->widget, ++ gtk_sink->widget_resize_sig_handler); ++ gtk_sink->widget_resize_sig_handler = 0; ++ } ++ + if (gtk_sink->display) { + gst_object_unref (gtk_sink->display); + gtk_sink->display = NULL; +@@ -348,10 +371,10 @@ gst_gtk_gl_sink_finalize (GObject * object) + GstGtkGLSink *gtk_sink = GST_GTK_GL_SINK (object); + GstGtkBaseSink *base_sink = GST_GTK_BASE_SINK (object); + +- if (gtk_sink->size_allocate_sig_handler) { ++ if (gtk_sink->widget_resize_sig_handler) { + g_signal_handler_disconnect (base_sink->widget, +- gtk_sink->size_allocate_sig_handler); +- gtk_sink->size_allocate_sig_handler = 0; ++ gtk_sink->widget_resize_sig_handler); ++ gtk_sink->widget_resize_sig_handler = 0; + } + + if (gtk_sink->widget_destroy_sig_handler) { +--- ext/gtk/gstgtkglsink.h.orig 2019-12-03 11:06:37 UTC ++++ ext/gtk/gstgtkglsink.h +@@ -65,7 +65,7 @@ struct _GstGtkGLSink + gint display_width; + gint display_height; + +- gulong size_allocate_sig_handler; ++ gulong widget_resize_sig_handler; + gulong widget_destroy_sig_handler; + }; + +--- ext/gtk/gstgtksink.c.orig 2019-12-03 11:06:37 UTC ++++ ext/gtk/gstgtksink.c +@@ -19,15 +19,22 @@ + */ + + /** +- * SECTION:element-gtkgstsink +- * @title: gtkgstsink ++ * SECTION:element-gtksink ++ * @title: gtksink + * + */ + ++/** ++ * SECTION:element-gtk4sink ++ * @title: gtk4sink ++ * ++ */ ++ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + ++#include "gtkconfig.h" + #include "gtkgstwidget.h" + #include "gstgtksink.h" + +@@ -49,8 +56,8 @@ GST_STATIC_PAD_TEMPLATE ("sink", + + #define gst_gtk_sink_parent_class parent_class + G_DEFINE_TYPE_WITH_CODE (GstGtkSink, gst_gtk_sink, GST_TYPE_GTK_BASE_SINK, +- GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_sink, "gtksink", 0, +- "Gtk Video Sink")); ++ GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_sink, GTKCONFIG_SINK, 0, ++ GTKCONFIG_NAME " Video Sink")); + + static void + gst_gtk_sink_class_init (GstGtkSinkClass * klass) +@@ -62,9 +69,10 @@ gst_gtk_sink_class_init (GstGtkSinkClass * klass) + base_class = (GstGtkBaseSinkClass *) klass; + + base_class->create_widget = gtk_gst_widget_new; +- base_class->window_title = "Gtk+ Cairo renderer"; ++ base_class->window_title = GTKCONFIG_NAME " Cairo Renderer"; + +- gst_element_class_set_metadata (gstelement_class, "Gtk Video Sink", ++ gst_element_class_set_metadata (gstelement_class, ++ GTKCONFIG_NAME " Video Sink", + "Sink/Video", "A video sink that renders to a GtkWidget", + "Matthew Waters "); + +--- ext/gtk/gstplugin.c.orig 2019-12-03 11:06:37 UTC ++++ ext/gtk/gstplugin.c +@@ -1,6 +1,7 @@ + /* + * GStreamer + * Copyright (C) 2015 Matthew Waters ++ * Copyright (C) 2020 Rafał Dzięgiel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public +@@ -22,31 +23,31 @@ + #include "config.h" + #endif + ++#include "gtkconfig.h" + #include "gstgtksink.h" +-#if defined(HAVE_GTK3_GL) ++ ++#if defined(HAVE_GTK_GL) + #include "gstgtkglsink.h" + #endif + + static gboolean + plugin_init (GstPlugin * plugin) + { +- if (!gst_element_register (plugin, "gtksink", ++ if (!gst_element_register (plugin, GTKCONFIG_SINK, + GST_RANK_NONE, GST_TYPE_GTK_SINK)) { + return FALSE; + } +-#if defined(HAVE_GTK3_GL) +- if (!gst_element_register (plugin, "gtkglsink", ++#if defined(HAVE_GTK_GL) ++ if (!gst_element_register (plugin, GTKCONFIG_GLSINK, + GST_RANK_NONE, GST_TYPE_GTK_GL_SINK)) { + return FALSE; + } + #endif +- + return TRUE; + } + + GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, + GST_VERSION_MINOR, +- gtk, +- "Gtk+ sink", ++ GTKCONFIG_PLUGIN, GTKCONFIG_NAME " sink", + plugin_init, PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, + GST_PACKAGE_ORIGIN) +--- ext/gtk/gtkconfig.h.orig 2021-08-23 11:11:05 UTC ++++ ext/gtk/gtkconfig.h +@@ -0,0 +1,31 @@ ++/* ++ * GStreamer ++ * Copyright (C) 2020 Rafał Dzięgiel ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with this library; if not, write to the ++ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ */ ++ ++#if defined(BUILD_FOR_GTK4) ++#define GTKCONFIG_PLUGIN gtk4 ++#define GTKCONFIG_NAME "GTK4" ++#define GTKCONFIG_SINK "gtk4sink" ++#define GTKCONFIG_GLSINK "gtk4glsink" ++#else ++#define GTKCONFIG_PLUGIN gtk ++#define GTKCONFIG_NAME "GTK" ++#define GTKCONFIG_SINK "gtksink" ++#define GTKCONFIG_GLSINK "gtkglsink" ++#endif +--- ext/gtk/gtkgstbasewidget.c.orig 2019-12-03 11:06:37 UTC ++++ ext/gtk/gtkgstbasewidget.c +@@ -1,6 +1,7 @@ + /* + * GStreamer + * Copyright (C) 2015 Matthew Waters ++ * Copyright (C) 2020 Rafał Dzięgiel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public +@@ -74,7 +75,23 @@ gtk_gst_base_widget_get_preferred_height (GtkWidget * + *natural = video_height; + } + ++#if defined(BUILD_FOR_GTK4) + static void ++gtk_gst_base_widget_measure (GtkWidget * widget, GtkOrientation orientation, ++ gint for_size, gint * min, gint * natural, ++ gint * minimum_baseline, gint * natural_baseline) ++{ ++ if (orientation == GTK_ORIENTATION_HORIZONTAL) ++ gtk_gst_base_widget_get_preferred_width (widget, min, natural); ++ else ++ gtk_gst_base_widget_get_preferred_height (widget, min, natural); ++ ++ *minimum_baseline = -1; ++ *natural_baseline = -1; ++} ++#endif ++ ++static void + gtk_gst_base_widget_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) + { +@@ -235,22 +252,46 @@ _gdk_key_to_navigation_string (guint keyval) + } + } + ++static GdkEvent * ++_get_current_event (GtkEventController * controller) ++{ ++#if defined(BUILD_FOR_GTK4) ++ return gtk_event_controller_get_current_event (controller); ++#else ++ return gtk_get_current_event (); ++#endif ++} ++ ++static void ++_gdk_event_free (GdkEvent * event) ++{ ++#if !defined(BUILD_FOR_GTK4) ++ if (event) ++ gdk_event_free (event); ++#endif ++} ++ + static gboolean +-gtk_gst_base_widget_key_event (GtkWidget * widget, GdkEventKey * event) ++gtk_gst_base_widget_key_event (GtkEventControllerKey * key_controller, ++ guint keyval, guint keycode, GdkModifierType state) + { ++ GtkEventController *controller = GTK_EVENT_CONTROLLER (key_controller); ++ GtkWidget *widget = gtk_event_controller_get_widget (controller); + GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget); + GstElement *element; + + if ((element = g_weak_ref_get (&base_widget->element))) { + if (GST_IS_NAVIGATION (element)) { +- const gchar *str = _gdk_key_to_navigation_string (event->keyval); +- const gchar *key_type = +- event->type == GDK_KEY_PRESS ? "key-press" : "key-release"; ++ GdkEvent *event = _get_current_event (controller); ++ const gchar *str = _gdk_key_to_navigation_string (keyval); + +- if (!str) +- str = event->string; +- +- gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str); ++ if (str) { ++ const gchar *key_type = ++ gdk_event_get_event_type (event) == ++ GDK_KEY_PRESS ? "key-press" : "key-release"; ++ gst_navigation_send_key_event (GST_NAVIGATION (element), key_type, str); ++ } ++ _gdk_event_free (event); + } + g_object_unref (element); + } +@@ -325,22 +366,43 @@ _display_size_to_stream_size (GtkGstBaseWidget * base_ + } + + static gboolean +-gtk_gst_base_widget_button_event (GtkWidget * widget, GdkEventButton * event) ++gtk_gst_base_widget_button_event ( ++#if defined(BUILD_FOR_GTK4) ++ GtkGestureClick * gesture, ++#else ++ GtkGestureMultiPress * gesture, ++#endif ++ gint n_press, gdouble x, gdouble y) + { ++ GtkEventController *controller = GTK_EVENT_CONTROLLER (gesture); ++ GtkWidget *widget = gtk_event_controller_get_widget (controller); + GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget); + GstElement *element; + + if ((element = g_weak_ref_get (&base_widget->element))) { + if (GST_IS_NAVIGATION (element)) { ++ GdkEvent *event = _get_current_event (controller); + const gchar *key_type = +- event->type == +- GDK_BUTTON_PRESS ? "mouse-button-press" : "mouse-button-release"; +- gdouble x, y; ++ gdk_event_get_event_type (event) == GDK_BUTTON_PRESS ++ ? "mouse-button-press" : "mouse-button-release"; ++ gdouble stream_x, stream_y; ++#if !defined(BUILD_FOR_GTK4) ++ guint button; ++ gdk_event_get_button (event, &button); ++#endif + +- _display_size_to_stream_size (base_widget, event->x, event->y, &x, &y); ++ _display_size_to_stream_size (base_widget, x, y, &stream_x, &stream_y); + + gst_navigation_send_mouse_event (GST_NAVIGATION (element), key_type, +- event->button, x, y); ++#if defined(BUILD_FOR_GTK4) ++ /* Gesture is set to ignore other buttons so we do not have to check */ ++ GDK_BUTTON_PRIMARY, ++#else ++ button, ++#endif ++ stream_x, stream_y); ++ ++ _gdk_event_free (event); + } + g_object_unref (element); + } +@@ -349,19 +411,22 @@ gtk_gst_base_widget_button_event (GtkWidget * widget, + } + + static gboolean +-gtk_gst_base_widget_motion_event (GtkWidget * widget, GdkEventMotion * event) ++gtk_gst_base_widget_motion_event (GtkEventControllerMotion * motion_controller, ++ gdouble x, gdouble y) + { ++ GtkEventController *controller = GTK_EVENT_CONTROLLER (motion_controller); ++ GtkWidget *widget = gtk_event_controller_get_widget (controller); + GtkGstBaseWidget *base_widget = GTK_GST_BASE_WIDGET (widget); + GstElement *element; + + if ((element = g_weak_ref_get (&base_widget->element))) { + if (GST_IS_NAVIGATION (element)) { +- gdouble x, y; ++ gdouble stream_x, stream_y; + +- _display_size_to_stream_size (base_widget, event->x, event->y, &x, &y); ++ _display_size_to_stream_size (base_widget, x, y, &stream_x, &stream_y); + + gst_navigation_send_mouse_event (GST_NAVIGATION (element), "mouse-move", +- 0, x, y); ++ 0, stream_x, stream_y); + } + g_object_unref (element); + } +@@ -395,23 +460,20 @@ gtk_gst_base_widget_class_init (GtkGstBaseWidgetClass + "When enabled, alpha will be ignored and converted to black", + DEFAULT_IGNORE_ALPHA, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + ++#if defined(BUILD_FOR_GTK4) ++ widget_klass->measure = gtk_gst_base_widget_measure; ++#else + widget_klass->get_preferred_width = gtk_gst_base_widget_get_preferred_width; + widget_klass->get_preferred_height = gtk_gst_base_widget_get_preferred_height; +- widget_klass->key_press_event = gtk_gst_base_widget_key_event; +- widget_klass->key_release_event = gtk_gst_base_widget_key_event; +- widget_klass->button_press_event = gtk_gst_base_widget_button_event; +- widget_klass->button_release_event = gtk_gst_base_widget_button_event; +- widget_klass->motion_notify_event = gtk_gst_base_widget_motion_event; ++#endif + + GST_DEBUG_CATEGORY_INIT (gst_debug_gtk_base_widget, "gtkbasewidget", 0, +- "Gtk Video Base Widget"); ++ "GTK Video Base Widget"); + } + + void + gtk_gst_base_widget_init (GtkGstBaseWidget * widget) + { +- int event_mask; +- + widget->force_aspect_ratio = DEFAULT_FORCE_ASPECT_RATIO; + widget->par_n = DEFAULT_PAR_N; + widget->par_d = DEFAULT_PAR_D; +@@ -423,20 +485,66 @@ gtk_gst_base_widget_init (GtkGstBaseWidget * widget) + g_weak_ref_init (&widget->element, NULL); + g_mutex_init (&widget->lock); + ++ widget->key_controller = gtk_event_controller_key_new ( ++#if !defined(BUILD_FOR_GTK4) ++ GTK_WIDGET (widget) ++#endif ++ ); ++ g_signal_connect (widget->key_controller, "key-pressed", ++ G_CALLBACK (gtk_gst_base_widget_key_event), NULL); ++ g_signal_connect (widget->key_controller, "key-released", ++ G_CALLBACK (gtk_gst_base_widget_key_event), NULL); ++ ++ widget->motion_controller = gtk_event_controller_motion_new ( ++#if !defined(BUILD_FOR_GTK4) ++ GTK_WIDGET (widget) ++#endif ++ ); ++ g_signal_connect (widget->motion_controller, "motion", ++ G_CALLBACK (gtk_gst_base_widget_motion_event), NULL); ++ ++ widget->click_gesture = ++#if defined(BUILD_FOR_GTK4) ++ gtk_gesture_click_new (); ++#else ++ gtk_gesture_multi_press_new (GTK_WIDGET (widget)); ++#endif ++ g_signal_connect (widget->click_gesture, "pressed", ++ G_CALLBACK (gtk_gst_base_widget_button_event), NULL); ++ g_signal_connect (widget->click_gesture, "released", ++ G_CALLBACK (gtk_gst_base_widget_button_event), NULL); ++ ++#if defined(BUILD_FOR_GTK4) ++ /* Otherwise widget in grid will appear as a 1x1px ++ * video which might be misleading for users */ ++ gtk_widget_set_hexpand (GTK_WIDGET (widget), TRUE); ++ gtk_widget_set_vexpand (GTK_WIDGET (widget), TRUE); ++ ++ gtk_widget_set_focusable (GTK_WIDGET (widget), TRUE); ++ gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (widget->click_gesture), ++ GDK_BUTTON_PRIMARY); ++ ++ gtk_widget_add_controller (GTK_WIDGET (widget), widget->key_controller); ++ gtk_widget_add_controller (GTK_WIDGET (widget), widget->motion_controller); ++ gtk_widget_add_controller (GTK_WIDGET (widget), ++ GTK_EVENT_CONTROLLER (widget->click_gesture)); ++#endif ++ + gtk_widget_set_can_focus (GTK_WIDGET (widget), TRUE); +- event_mask = gtk_widget_get_events (GTK_WIDGET (widget)); +- event_mask |= GDK_KEY_PRESS_MASK +- | GDK_KEY_RELEASE_MASK +- | GDK_BUTTON_PRESS_MASK +- | GDK_BUTTON_RELEASE_MASK +- | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK; +- gtk_widget_set_events (GTK_WIDGET (widget), event_mask); + } + + void + gtk_gst_base_widget_finalize (GObject * object) + { + GtkGstBaseWidget *widget = GTK_GST_BASE_WIDGET (object); ++ ++ /* GTK4 takes ownership of EventControllers ++ * while GTK3 still needs manual unref */ ++#if !defined(BUILD_FOR_GTK4) ++ g_object_unref (widget->key_controller); ++ g_object_unref (widget->motion_controller); ++ g_object_unref (widget->click_gesture); ++#endif + + gst_buffer_replace (&widget->pending_buffer, NULL); + gst_buffer_replace (&widget->buffer, NULL); +--- ext/gtk/gtkgstbasewidget.h.orig 2019-12-03 11:06:37 UTC ++++ ext/gtk/gtkgstbasewidget.h +@@ -1,6 +1,7 @@ + /* + * GStreamer + * Copyright (C) 2015 Matthew Waters ++ * Copyright (C) 2020 Rafał Dzięgiel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public +@@ -25,6 +26,10 @@ + #include + #include + ++#if !defined(BUILD_FOR_GTK4) ++#include ++#endif ++ + #define GTK_GST_BASE_WIDGET(w) ((GtkGstBaseWidget *)(w)) + #define GTK_GST_BASE_WIDGET_CLASS(k) ((GtkGstBaseWidgetClass *)(k)) + #define GTK_GST_BASE_WIDGET_LOCK(w) g_mutex_lock(&((GtkGstBaseWidget*)(w))->lock) +@@ -39,9 +44,7 @@ struct _GtkGstBaseWidget + { + union { + GtkDrawingArea drawing_area; +-#if GTK_CHECK_VERSION(3, 15, 0) + GtkGLArea gl_area; +-#endif + } parent; + + /* properties */ +@@ -67,6 +70,11 @@ struct _GtkGstBaseWidget + GMutex lock; + GWeakRef element; + ++ /* event controllers */ ++ GtkEventController *key_controller; ++ GtkEventController *motion_controller; ++ GtkGesture *click_gesture; ++ + /* Pending draw idles callback */ + guint draw_id; + }; +@@ -75,9 +83,7 @@ struct _GtkGstBaseWidgetClass + { + union { + GtkDrawingAreaClass drawing_area_class; +-#if GTK_CHECK_VERSION(3, 15, 0) + GtkGLAreaClass gl_area_class; +-#endif + } parent_class; + }; + +--- ext/gtk/gtkgstglwidget.c.orig 2019-12-03 11:06:37 UTC ++++ ext/gtk/gtkgstglwidget.c +@@ -1,6 +1,7 @@ + /* + * GStreamer + * Copyright (C) 2015 Matthew Waters ++ * Copyright (C) 2020 Rafał Dzięgiel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public +@@ -30,12 +31,20 @@ *** 272 LINES SKIPPED *** From owner-dev-commits-ports-all@freebsd.org Mon Aug 23 12:52:46 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 362DA66AEB2; Mon, 23 Aug 2021 12:52:46 +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 4GtXG60tHlz3Ptc; Mon, 23 Aug 2021 12:52:46 +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 01403147C8; Mon, 23 Aug 2021 12:52:46 +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 17NCqj4S050945; Mon, 23 Aug 2021 12:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17NCqjra050944; Mon, 23 Aug 2021 12:52:45 GMT (envelope-from git) Date: Mon, 23 Aug 2021 12:52:45 GMT Message-Id: <202108231252.17NCqjra050944@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: b5c2b9bdf086 - main - security/authenticator: add new port MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b5c2b9bdf08683a455ac5ef8fe45f7241a5cf623 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Aug 2021 12:52:46 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5c2b9bdf08683a455ac5ef8fe45f7241a5cf623 commit b5c2b9bdf08683a455ac5ef8fe45f7241a5cf623 Author: Jan Beich AuthorDate: 2021-08-22 16:36:02 +0000 Commit: Jan Beich CommitDate: 2021-08-23 12:52:23 +0000 security/authenticator: add new port Simple application for generating Two-Factor Authentication Codes. Features: - Time-based/Counter-based/Steam methods support - SHA-1/SHA-256/SHA-512 algorithms support - QR code scanner using a camera or from a screenshot - Lock the application with a password - Beautiful UI - Backup/Restore from/into known applications like FreeOTP+, andOTP https://gitlab.gnome.org/World/Authenticator --- security/Makefile | 1 + security/authenticator/Makefile | 389 ++++++++++++++++++++ security/authenticator/distinfo | 631 ++++++++++++++++++++++++++++++++ security/authenticator/files/patch-gtk | 283 ++++++++++++++ security/authenticator/files/patch-zbus | 226 ++++++++++++ security/authenticator/pkg-descr | 11 + security/authenticator/pkg-plist | 41 +++ 7 files changed, 1582 insertions(+) diff --git a/security/Makefile b/security/Makefile index be4e71c56c82..35a14d99f308 100644 --- a/security/Makefile +++ b/security/Makefile @@ -34,6 +34,7 @@ SUBDIR += arti SUBDIR += asignify SUBDIR += assh + SUBDIR += authenticator SUBDIR += autossh SUBDIR += aws-c-cal SUBDIR += aws-iam-authenticator diff --git a/security/authenticator/Makefile b/security/authenticator/Makefile new file mode 100644 index 000000000000..b6ac58ebf48e --- /dev/null +++ b/security/authenticator/Makefile @@ -0,0 +1,389 @@ +PORTNAME= authenticator +DISTVERSION= 4.0.3 +CATEGORIES= security + +PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ +PATCHFILES+= 5d68dae3c878.patch:-p1 # https://gitlab.gnome.org/World/Authenticator/-/merge_requests/211 + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Generate Two-Factor Codes + +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libcurl.so:ftp/curl \ + libgraphene-1.0.so:graphics/graphene \ + libzbar.so:graphics/zbar + +USES= cargo gettext gnome meson pkgconfig python:build shebangfix sqlite ssl +USE_GITHUB= nodefault +USE_GITLAB= yes +USE_GNOME= gtk40 libadwaita +USE_GSTREAMER1= gl gtk4 zbar +GH_TUPLE= bilelmoussaoui:ashpd:d7ec2103565301b8476d6706ef34090e197b021c:ashpd \ + gtk-rs:gtk3-rs:6e3c8739f9f5b8dc0a234f4a485e254574af5953:gtk3 \ + gtk-rs:gtk4-rs:13a8317a2ef8738362b9fa7f55a29dd5d3dbc459:gtk4 +GL_SITE= https://gitlab.gnome.org +GL_ACCOUNT= World +GL_PROJECT= Authenticator +GL_COMMIT= ba1894159358275be2765bc42ef89782a2d1d45d +GL_TUPLE= https://gitlab.freedesktop.org:gstreamer:gstreamer-rs:762450bb5335d8c79cc29a6111874d89bd3b5c00:gstreamer \ + bilelmoussaoui:libadwaita-rs:6ae4d3670565064acc9da2f51434eca0a0c51ac9:libadwaita +SHEBANG_FILES= build-aux/meson_post_install.py +CARGO_ENV= ZBAR_INCLUDE_DIRS="${LOCALBASE}/include" ZBAR_LIB_DIRS="${LOCALBASE}/lib" +MAKE_ENV= ${CARGO_ENV} +GLIB_SCHEMAS= com.belmoussaoui.Authenticator.gschema.xml +INSTALLS_ICONS= yes + +CARGO_CRATES= adler-1.0.2 \ + adler32-1.2.0 \ + aead-0.3.2 \ + aes-0.6.0 \ + aes-gcm-0.8.0 \ + aes-soft-0.6.4 \ + aesni-0.10.0 \ + aho-corasick-0.7.15 \ + anyhow-1.0.39 \ + arrayref-0.3.6 \ + arrayvec-0.5.2 \ + async-channel-1.6.1 \ + async-executor-1.4.0 \ + async-global-executor-2.0.2 \ + async-io-1.3.1 \ + async-lock-2.3.0 \ + async-mutex-1.4.0 \ + async-std-1.9.0 \ + async-task-4.0.3 \ + async-trait-0.1.48 \ + atomic-waker-1.0.0 \ + atty-0.2.14 \ + autocfg-1.0.1 \ + base-x-0.2.8 \ + base64-0.13.0 \ + binascii-0.1.4 \ + bitflags-1.2.1 \ + blake2b_simd-0.5.11 \ + block-0.1.6 \ + block-buffer-0.9.0 \ + block-modes-0.7.0 \ + block-padding-0.2.1 \ + blocking-1.0.2 \ + bumpalo-3.6.1 \ + bytemuck-1.5.1 \ + byteorder-1.4.3 \ + bytes-0.5.6 \ + bytes-1.0.1 \ + cache-padded-1.1.1 \ + cc-1.0.67 \ + cfg-expr-0.7.4 \ + cfg-if-1.0.0 \ + checked_int_cast-1.0.0 \ + cipher-0.2.5 \ + cmake-0.1.45 \ + color_quant-1.1.0 \ + concurrent-queue-1.2.2 \ + const_fn-0.4.5 \ + constant_time_eq-0.1.5 \ + cookie-0.14.4 \ + cpuid-bool-0.1.2 \ + cpuid-bool-0.2.0 \ + crc32fast-1.2.1 \ + crossbeam-channel-0.5.0 \ + crossbeam-deque-0.8.0 \ + crossbeam-epoch-0.9.3 \ + crossbeam-utils-0.8.3 \ + crypto-mac-0.10.0 \ + ctor-0.1.20 \ + ctr-0.6.0 \ + curl-0.4.35 \ + curl-sys-0.4.41+curl-7.75.0 \ + dashmap-4.0.2 \ + data-encoding-2.3.2 \ + deflate-0.8.6 \ + derivative-2.2.0 \ + diesel-1.4.6 \ + diesel_derives-1.4.1 \ + diesel_migrations-1.4.0 \ + digest-0.9.0 \ + discard-1.0.4 \ + dlib-0.5.0 \ + doc-comment-0.3.3 \ + downcast-rs-1.2.0 \ + either-1.6.1 \ + encoding_rs-0.8.28 \ + enum-ordinalize-3.1.9 \ + enumflags2-0.6.4 \ + enumflags2_derive-0.6.4 \ + env_logger-0.7.1 \ + event-listener-2.5.1 \ + fastrand-1.4.0 \ + field-offset-0.3.3 \ + flume-0.9.2 \ + fnv-1.0.7 \ + form_urlencoded-1.0.1 \ + freetype-0.7.0 \ + freetype-sys-0.13.1 \ + futures-0.3.13 \ + futures-channel-0.3.13 \ + futures-core-0.3.13 \ + futures-executor-0.3.13 \ + futures-io-0.3.13 \ + futures-lite-1.11.3 \ + futures-macro-0.3.13 \ + futures-sink-0.3.13 \ + futures-task-0.3.13 \ + futures-util-0.3.13 \ + generic-array-0.14.4 \ + getrandom-0.1.16 \ + getrandom-0.2.2 \ + gettext-rs-0.6.0 \ + gettext-sys-0.21.0 \ + ghash-0.3.1 \ + gif-0.11.2 \ + gloo-timers-0.2.1 \ + gtk-macros-0.2.0 \ + heck-0.3.2 \ + hermit-abi-0.1.18 \ + hex-0.4.3 \ + hkdf-0.10.0 \ + hmac-0.10.1 \ + http-0.2.3 \ + http-client-6.3.5 \ + http-types-2.10.0 \ + humantime-1.3.0 \ + idna-0.2.2 \ + image-0.23.14 \ + infer-0.2.3 \ + instant-0.1.9 \ + isahc-0.9.14 \ + itertools-0.9.0 \ + itertools-0.10.0 \ + itoa-0.4.7 \ + jpeg-decoder-0.1.22 \ + js-sys-0.3.49 \ + kv-log-macro-1.0.7 \ + lazy_static-1.4.0 \ + libc-0.2.91 \ + libloading-0.7.0 \ + libnghttp2-sys-0.1.6+1.43.0 \ + libsqlite3-sys-0.20.1 \ + libz-sys-1.1.2 \ + locale_config-0.3.0 \ + lock_api-0.4.2 \ + log-0.4.14 \ + malloc_buf-0.0.6 \ + matches-0.1.8 \ + memchr-2.3.4 \ + memoffset-0.6.1 \ + migrations_internals-1.4.1 \ + migrations_macros-1.4.2 \ + mime-0.3.16 \ + mime_guess-2.0.3 \ + miniz_oxide-0.3.7 \ + miniz_oxide-0.4.4 \ + muldiv-1.0.0 \ + nb-connect-1.1.0 \ + nix-0.20.0 \ + num-0.3.1 \ + num-bigint-0.3.2 \ + num-complex-0.3.1 \ + num-integer-0.1.44 \ + num-iter-0.1.42 \ + num-rational-0.3.2 \ + num-rational-0.4.0 \ + num-traits-0.2.14 \ + num_cpus-1.13.0 \ + objc-0.2.7 \ + objc-foundation-0.1.1 \ + objc_id-0.1.1 \ + once_cell-1.7.2 \ + opaque-debug-0.3.0 \ + openssl-probe-0.1.2 \ + openssl-sys-0.9.61 \ + parking-2.0.0 \ + parking_lot-0.11.1 \ + parking_lot_core-0.8.3 \ + paste-1.0.5 \ + percent-encoding-2.1.0 \ + pest-2.1.3 \ + pin-project-1.0.6 \ + pin-project-internal-1.0.6 \ + pin-project-lite-0.2.6 \ + pin-utils-0.1.0 \ + pkg-config-0.3.19 \ + png-0.16.8 \ + polling-2.0.3 \ + polyval-0.4.5 \ + ppv-lite86-0.2.10 \ + pretty-hex-0.2.1 \ + pretty_env_logger-0.4.0 \ + proc-macro-crate-0.1.5 \ + proc-macro-error-1.0.4 \ + proc-macro-error-attr-1.0.4 \ + proc-macro-hack-0.5.19 \ + proc-macro-nested-0.1.7 \ + proc-macro2-1.0.24 \ + qrcode-0.12.0 \ + quick-error-1.2.3 \ + quick-xml-0.22.0 \ + quote-1.0.9 \ + r2d2-0.8.9 \ + rand-0.7.3 \ + rand-0.8.3 \ + rand_chacha-0.2.2 \ + rand_chacha-0.3.0 \ + rand_core-0.5.1 \ + rand_core-0.6.2 \ + rand_hc-0.2.0 \ + rand_hc-0.3.0 \ + rayon-1.5.0 \ + rayon-core-1.9.0 \ + redox_syscall-0.2.5 \ + regex-1.4.5 \ + regex-syntax-0.6.23 \ + remove_dir_all-0.5.3 \ + ring-0.16.20 \ + roxmltree-0.13.1 \ + rust-argon2-0.8.3 \ + rustc_version-0.2.3 \ + rustc_version-0.3.3 \ + ryu-1.0.5 \ + schannel-0.1.19 \ + scheduled-thread-pool-0.2.5 \ + scoped-tls-1.0.0 \ + scoped_threadpool-0.1.9 \ + scopeguard-1.1.0 \ + secret-service-2.0.1 \ + semver-0.9.0 \ + semver-0.11.0 \ + semver-parser-0.7.0 \ + semver-parser-0.10.2 \ + serde-1.0.125 \ + serde_derive-1.0.125 \ + serde_json-1.0.64 \ + serde_qs-0.7.2 \ + serde_repr-0.1.6 \ + serde_urlencoded-0.7.0 \ + sha1-0.6.0 \ + sha2-0.9.3 \ + slab-0.4.2 \ + sluice-0.5.4 \ + smallvec-1.6.1 \ + socket2-0.3.19 \ + socket2-0.4.0 \ + spin-0.5.2 \ + spinning_top-0.2.2 \ + standback-0.2.17 \ + stdweb-0.4.20 \ + stdweb-derive-0.5.3 \ + stdweb-internal-macros-0.2.9 \ + stdweb-internal-runtime-0.1.5 \ + strum-0.20.0 \ + strum_macros-0.20.1 \ + subtle-2.4.0 \ + surf-2.2.0 \ + svg_metadata-0.4.2 \ + syn-1.0.64 \ + system-deps-3.1.0 \ + tempfile-3.2.0 \ + termcolor-1.1.2 \ + thiserror-1.0.24 \ + thiserror-impl-1.0.24 \ + tiff-0.6.1 \ + time-0.2.26 \ + time-macros-0.1.1 \ + time-macros-impl-0.1.1 \ + tinyvec-1.1.1 \ + tinyvec_macros-0.1.0 \ + toml-0.5.8 \ + tracing-0.1.25 \ + tracing-attributes-0.1.15 \ + tracing-core-0.1.17 \ + tracing-futures-0.2.5 \ + typenum-1.13.0 \ + ucd-trie-0.1.3 \ + unicase-2.6.0 \ + unicode-bidi-0.3.4 \ + unicode-normalization-0.1.17 \ + unicode-segmentation-1.7.1 \ + unicode-xid-0.2.1 \ + universal-hash-0.4.0 \ + untrusted-0.7.1 \ + url-2.2.1 \ + value-bag-1.0.0-alpha.6 \ + vcpkg-0.2.11 \ + vec-arena-1.1.0 \ + version-compare-0.0.11 \ + version_check-0.9.3 \ + waker-fn-1.1.0 \ + wasi-0.9.0+wasi-snapshot-preview1 \ + wasi-0.10.2+wasi-snapshot-preview1 \ + wasm-bindgen-0.2.72 \ + wasm-bindgen-backend-0.2.72 \ + wasm-bindgen-futures-0.4.22 \ + wasm-bindgen-macro-0.2.72 \ + wasm-bindgen-macro-support-0.2.72 \ + wasm-bindgen-shared-0.2.72 \ + wayland-client-0.28.5 \ + wayland-commons-0.28.5 \ + wayland-scanner-0.28.5 \ + wayland-sys-0.28.5 \ + web-sys-0.3.49 \ + weezl-0.1.4 \ + wepoll-sys-3.0.1 \ + winapi-0.3.9 \ + winapi-i686-pc-windows-gnu-0.4.0 \ + winapi-util-0.1.5 \ + winapi-x86_64-pc-windows-gnu-0.4.0 \ + x11-2.18.2 \ + xml-rs-0.8.3 \ + xmlparser-0.13.3 \ + zbar-rust-0.0.16 \ + zbus-1.8.0 \ + zbus_macros-1.8.0 \ + zvariant-2.6.0 \ + zvariant_derive-2.6.0 +CARGO_USE_GITHUB= yes +CARGO_USE_GITLAB= yes +CARGO_GIT_SUBDIR= gstreamer:gst_base:gstreamer-base \ + gstreamer:gst:gstreamer \ + gtk3:cairo-rs:cairo \ + gtk3:cairo-sys-rs:cairo/sys \ + gtk3:gdk-pixbuf-sys:gdk-pixbuf/sys \ + gtk3:gdk-pixbuf:gdk-pixbuf \ + gtk3:gio-sys:gio/sys \ + gtk3:gio:gio \ + gtk3:glib-sys:glib/sys \ + gtk3:glib:glib \ + gtk3:gobject-sys:glib/gobject-sys \ + gtk3:graphene-sys:graphene/sys \ + gtk3:graphene:graphene \ + gtk3:pango-sys:pango/sys \ + gtk3:pango:pango \ + gtk4:gdk-sys:gdk4/sys \ + gtk4:gdk4:gdk4 \ + gtk4:gdk4wayland:gdk4-wayland \ + gtk4:gdk4x11:gdk4-x11 \ + gtk4:gdk:gdk4 \ + gtk4:gtk-sys:gtk4/sys \ + gtk4:gtk4:gtk4 \ + gtk4:gtk:gtk4 \ + libadwaita:adw:libadwaita +CARGO_BUILD= no +CARGO_INSTALL= no +CARGO_TEST= no + +pre-patch: +# Chase gtk-rs -> gtk3-rs rename for USES=cargo patching + @${GREP} --include='*/Cargo.toml' -lr 'git.*gtk-rs' ${WRKDIR} | ${XARGS} ${REINPLACE_CMD} \ + 's,\(gtk-rs\)/gtk-rs,\1/gtk3-rs,' + +post-patch: + @${REINPLACE_CMD} -e '/gstreamer/s/1\.18/1.16/' \ + -e '/gstreamer.*bad/d' \ + ${WRKSRC}/meson.build +# Make each cargo subcommand very verbose + @${REINPLACE_CMD} -e '/cargo/s/ --/&verbose&verbose&/' \ + ${WRKSRC}/build-aux/cargo.sh + +.include diff --git a/security/authenticator/distinfo b/security/authenticator/distinfo new file mode 100644 index 000000000000..711a8eda05ef --- /dev/null +++ b/security/authenticator/distinfo @@ -0,0 +1,631 @@ +TIMESTAMP = 1616771331 +SHA256 (rust/crates/adler-1.0.2.crate) = f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe +SIZE (rust/crates/adler-1.0.2.crate) = 12778 +SHA256 (rust/crates/adler32-1.2.0.crate) = aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234 +SIZE (rust/crates/adler32-1.2.0.crate) = 6411 +SHA256 (rust/crates/aead-0.3.2.crate) = 7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331 +SIZE (rust/crates/aead-0.3.2.crate) = 11145 +SHA256 (rust/crates/aes-0.6.0.crate) = 884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561 +SIZE (rust/crates/aes-0.6.0.crate) = 86774 +SHA256 (rust/crates/aes-gcm-0.8.0.crate) = 5278b5fabbb9bd46e24aa69b2fdea62c99088e0a950a9be40e3e0101298f88da +SIZE (rust/crates/aes-gcm-0.8.0.crate) = 140896 +SHA256 (rust/crates/aes-soft-0.6.4.crate) = be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072 +SIZE (rust/crates/aes-soft-0.6.4.crate) = 99980 +SHA256 (rust/crates/aesni-0.10.0.crate) = ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce +SIZE (rust/crates/aesni-0.10.0.crate) = 100248 +SHA256 (rust/crates/aho-corasick-0.7.15.crate) = 7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5 +SIZE (rust/crates/aho-corasick-0.7.15.crate) = 113071 +SHA256 (rust/crates/anyhow-1.0.39.crate) = 81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767 +SIZE (rust/crates/anyhow-1.0.39.crate) = 34017 +SHA256 (rust/crates/arrayref-0.3.6.crate) = a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544 +SIZE (rust/crates/arrayref-0.3.6.crate) = 10035 +SHA256 (rust/crates/arrayvec-0.5.2.crate) = 23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b +SIZE (rust/crates/arrayvec-0.5.2.crate) = 27838 +SHA256 (rust/crates/async-channel-1.6.1.crate) = 2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319 +SIZE (rust/crates/async-channel-1.6.1.crate) = 12574 +SHA256 (rust/crates/async-executor-1.4.0.crate) = eb877970c7b440ead138f6321a3b5395d6061183af779340b65e20c0fede9146 +SIZE (rust/crates/async-executor-1.4.0.crate) = 15661 +SHA256 (rust/crates/async-global-executor-2.0.2.crate) = 9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6 +SIZE (rust/crates/async-global-executor-2.0.2.crate) = 11665 +SHA256 (rust/crates/async-io-1.3.1.crate) = 9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd +SIZE (rust/crates/async-io-1.3.1.crate) = 31300 +SHA256 (rust/crates/async-lock-2.3.0.crate) = 1996609732bde4a9988bc42125f55f2af5f3c36370e27c778d5191a4a1b63bfb +SIZE (rust/crates/async-lock-2.3.0.crate) = 15977 +SHA256 (rust/crates/async-mutex-1.4.0.crate) = 479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e +SIZE (rust/crates/async-mutex-1.4.0.crate) = 10223 +SHA256 (rust/crates/async-std-1.9.0.crate) = d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341 +SIZE (rust/crates/async-std-1.9.0.crate) = 222169 +SHA256 (rust/crates/async-task-4.0.3.crate) = e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0 +SIZE (rust/crates/async-task-4.0.3.crate) = 28770 +SHA256 (rust/crates/async-trait-0.1.48.crate) = 36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf +SIZE (rust/crates/async-trait-0.1.48.crate) = 25044 +SHA256 (rust/crates/atomic-waker-1.0.0.crate) = 065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a +SIZE (rust/crates/atomic-waker-1.0.0.crate) = 11771 +SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 +SIZE (rust/crates/atty-0.2.14.crate) = 5470 +SHA256 (rust/crates/autocfg-1.0.1.crate) = cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a +SIZE (rust/crates/autocfg-1.0.1.crate) = 12908 +SHA256 (rust/crates/base-x-0.2.8.crate) = a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b +SIZE (rust/crates/base-x-0.2.8.crate) = 10614 +SHA256 (rust/crates/base64-0.13.0.crate) = 904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd +SIZE (rust/crates/base64-0.13.0.crate) = 62070 +SHA256 (rust/crates/binascii-0.1.4.crate) = 383d29d513d8764dcdc42ea295d979eb99c3c9f00607b3692cf68a431f7dca72 +SIZE (rust/crates/binascii-0.1.4.crate) = 6076 +SHA256 (rust/crates/bitflags-1.2.1.crate) = cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693 +SIZE (rust/crates/bitflags-1.2.1.crate) = 16745 +SHA256 (rust/crates/blake2b_simd-0.5.11.crate) = afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587 +SIZE (rust/crates/blake2b_simd-0.5.11.crate) = 34096 +SHA256 (rust/crates/block-0.1.6.crate) = 0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a +SIZE (rust/crates/block-0.1.6.crate) = 4077 +SHA256 (rust/crates/block-buffer-0.9.0.crate) = 4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4 +SIZE (rust/crates/block-buffer-0.9.0.crate) = 7108 +SHA256 (rust/crates/block-modes-0.7.0.crate) = 57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0 +SIZE (rust/crates/block-modes-0.7.0.crate) = 13464 +SHA256 (rust/crates/block-padding-0.2.1.crate) = 8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae +SIZE (rust/crates/block-padding-0.2.1.crate) = 7672 +SHA256 (rust/crates/blocking-1.0.2.crate) = c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9 +SIZE (rust/crates/blocking-1.0.2.crate) = 18571 +SHA256 (rust/crates/bumpalo-3.6.1.crate) = 63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe +SIZE (rust/crates/bumpalo-3.6.1.crate) = 133836 +SHA256 (rust/crates/bytemuck-1.5.1.crate) = bed57e2090563b83ba8f83366628ce535a7584c9afa4c9fc0612a03925c6df58 +SIZE (rust/crates/bytemuck-1.5.1.crate) = 24562 +SHA256 (rust/crates/byteorder-1.4.3.crate) = 14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610 +SIZE (rust/crates/byteorder-1.4.3.crate) = 22512 +SHA256 (rust/crates/bytes-0.5.6.crate) = 0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38 +SIZE (rust/crates/bytes-0.5.6.crate) = 46291 +SHA256 (rust/crates/bytes-1.0.1.crate) = b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040 +SIZE (rust/crates/bytes-1.0.1.crate) = 48142 +SHA256 (rust/crates/cache-padded-1.1.1.crate) = 631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba +SIZE (rust/crates/cache-padded-1.1.1.crate) = 8798 +SHA256 (rust/crates/cc-1.0.67.crate) = e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd +SIZE (rust/crates/cc-1.0.67.crate) = 53486 +SHA256 (rust/crates/cfg-expr-0.7.4.crate) = 30aa9e2ffbb838c6b451db14f3cd8e63ed622bf859f9956bc93845a10fafc26a +SIZE (rust/crates/cfg-expr-0.7.4.crate) = 34162 +SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd +SIZE (rust/crates/cfg-if-1.0.0.crate) = 7934 +SHA256 (rust/crates/checked_int_cast-1.0.0.crate) = 17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919 +SIZE (rust/crates/checked_int_cast-1.0.0.crate) = 2669 +SHA256 (rust/crates/cipher-0.2.5.crate) = 12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801 +SIZE (rust/crates/cipher-0.2.5.crate) = 13099 +SHA256 (rust/crates/cmake-0.1.45.crate) = eb6210b637171dfba4cda12e579ac6dc73f5165ad56133e5d72ef3131f320855 +SIZE (rust/crates/cmake-0.1.45.crate) = 14375 +SHA256 (rust/crates/color_quant-1.1.0.crate) = 3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b +SIZE (rust/crates/color_quant-1.1.0.crate) = 6649 +SHA256 (rust/crates/concurrent-queue-1.2.2.crate) = 30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3 +SIZE (rust/crates/concurrent-queue-1.2.2.crate) = 15859 +SHA256 (rust/crates/const_fn-0.4.5.crate) = 28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6 +SIZE (rust/crates/const_fn-0.4.5.crate) = 13107 +SHA256 (rust/crates/constant_time_eq-0.1.5.crate) = 245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc +SIZE (rust/crates/constant_time_eq-0.1.5.crate) = 4936 +SHA256 (rust/crates/cookie-0.14.4.crate) = 03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951 +SIZE (rust/crates/cookie-0.14.4.crate) = 30261 +SHA256 (rust/crates/cpuid-bool-0.1.2.crate) = 8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634 +SIZE (rust/crates/cpuid-bool-0.1.2.crate) = 7173 +SHA256 (rust/crates/cpuid-bool-0.2.0.crate) = dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba +SIZE (rust/crates/cpuid-bool-0.2.0.crate) = 7329 +SHA256 (rust/crates/crc32fast-1.2.1.crate) = 81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a +SIZE (rust/crates/crc32fast-1.2.1.crate) = 38172 +SHA256 (rust/crates/crossbeam-channel-0.5.0.crate) = dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775 +SIZE (rust/crates/crossbeam-channel-0.5.0.crate) = 86811 +SHA256 (rust/crates/crossbeam-deque-0.8.0.crate) = 94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9 +SIZE (rust/crates/crossbeam-deque-0.8.0.crate) = 20756 +SHA256 (rust/crates/crossbeam-epoch-0.9.3.crate) = 2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12 +SIZE (rust/crates/crossbeam-epoch-0.9.3.crate) = 42766 +SHA256 (rust/crates/crossbeam-utils-0.8.3.crate) = e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49 +SIZE (rust/crates/crossbeam-utils-0.8.3.crate) = 37268 +SHA256 (rust/crates/crypto-mac-0.10.0.crate) = 4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6 +SIZE (rust/crates/crypto-mac-0.10.0.crate) = 9476 +SHA256 (rust/crate