January 2022 - crux-commits

ports/contrib (3.6): ostree: 2021.6 -> 2022.1
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit 82cb6005fef5f158957b23aa9bd7e7c5c11f3cca Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:40:25 2022 +0100 ostree: 2021.6 -> 2022.1 diff --git a/ostree/.footprint b/ostree/.footprint index 8f950ad92..130523e68 100644 --- a/ostree/.footprint +++ b/ostree/.footprint @@ -10,11 +10,13 @@ drwxr-xr-x root/root usr/include/ostree-1/ -rw-r--r-- root/root usr/include/ostree-1/ostree-async-progress.h -rw-r--r-- root/root usr/include/ostree-1/ostree-autocleanups.h -rw-r--r-- root/root usr/include/ostree-1/ostree-bootconfig-parser.h +-rw-r--r-- root/root usr/include/ostree-1/ostree-content-writer.h -rw-r--r-- root/root usr/include/ostree-1/ostree-core.h -rw-r--r-- root/root usr/include/ostree-1/ostree-deployment.h -rw-r--r-- root/root usr/include/ostree-1/ostree-diff.h -rw-r--r-- root/root usr/include/ostree-1/ostree-dummy-enumtypes.h -rw-r--r-- root/root usr/include/ostree-1/ostree-gpg-verify-result.h +-rw-r--r-- root/root usr/include/ostree-1/ostree.h -rw-r--r-- root/root usr/include/ostree-1/ostree-kernel-args.h -rw-r--r-- root/root usr/include/ostree-1/ostree-mutable-tree.h -rw-r--r-- root/root usr/include/ostree-1/ostree-ref.h @@ -23,26 +25,25 @@ drwxr-xr-x root/root usr/include/ostree-1/ -rw-r--r-- root/root usr/include/ostree-1/ostree-repo-file.h -rw-r--r-- root/root usr/include/ostree-1/ostree-repo-finder-avahi.h -rw-r--r-- root/root usr/include/ostree-1/ostree-repo-finder-config.h +-rw-r--r-- root/root usr/include/ostree-1/ostree-repo-finder.h -rw-r--r-- root/root usr/include/ostree-1/ostree-repo-finder-mount.h -rw-r--r-- root/root usr/include/ostree-1/ostree-repo-finder-override.h --rw-r--r-- root/root usr/include/ostree-1/ostree-repo-finder.h --rw-r--r-- root/root usr/include/ostree-1/ostree-repo-os.h -rw-r--r-- root/root usr/include/ostree-1/ostree-repo.h +-rw-r--r-- root/root usr/include/ostree-1/ostree-repo-os.h -rw-r--r-- root/root usr/include/ostree-1/ostree-sepolicy.h -rw-r--r-- root/root usr/include/ostree-1/ostree-sign-ed25519.h -rw-r--r-- root/root usr/include/ostree-1/ostree-sign.h --rw-r--r-- root/root usr/include/ostree-1/ostree-sysroot-upgrader.h -rw-r--r-- root/root usr/include/ostree-1/ostree-sysroot.h +-rw-r--r-- root/root usr/include/ostree-1/ostree-sysroot-upgrader.h -rw-r--r-- root/root usr/include/ostree-1/ostree-types.h -rw-r--r-- root/root usr/include/ostree-1/ostree-version.h --rw-r--r-- root/root usr/include/ostree-1/ostree.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/OSTree-1.0.typelib -rwxr-xr-x root/root usr/lib/libostree-1.la -lrwxrwxrwx root/root usr/lib/libostree-1.so -> libostree-1.so.1.0.0 -lrwxrwxrwx root/root usr/lib/libostree-1.so.1 -> libostree-1.so.1.0.0 -rwxr-xr-x root/root usr/lib/libostree-1.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libostree-1.so.1 -> libostree-1.so.1.0.0 +lrwxrwxrwx root/root usr/lib/libostree-1.so -> libostree-1.so.1.0.0 drwxr-xr-x root/root usr/lib/ostree/ drwxr-xr-x root/root usr/lib/ostree/libostree/ -rwxr-xr-x root/root usr/lib/ostree/libostree/ostree-trivial-httpd diff --git a/ostree/.signature b/ostree/.signature index 75437895a..d3f4b7e31 100644 --- a/ostree/.signature +++ b/ostree/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36IkRkBMxICriTYJFp7QbIVILd5qOBHt5lwMCWRQ9FqggM329BGy23+UfNxAMMwguTAWo5coAibQmnI9vJc0JAE= -SHA256 (Pkgfile) = fdbe2db0603885593985997724e96dfc5a4152612c0411396bb48148729d541b -SHA256 (.footprint) = 49e8d187e3cf2c1ee36bc55b5ad3cba193a9048b83413974a1f53a385c101470 -SHA256 (libostree-2021.6.tar.xz) = e80631cb1363d4734fe9d0c91f69a68be3848166d6e0481db19ce44a9cb4f531 +RWSagIOpLGJF3zcWqYq5t2D8uoj+L33lIQbTcO5EInUaY4D4/WQoMimyuTJ4uv7ijUGTOdQMczk4xMml/+V964qFVSIQCZAHOwU= +SHA256 (Pkgfile) = f328aed8fdaec68b7381b41de42408eb76cfc1081749ce5e8184371ac8f4901f +SHA256 (.footprint) = a5b474618d25f95c9565ffcb84b28b5904ae0f92b05a4be78e7131a9b4fba52b +SHA256 (libostree-2022.1.tar.xz) = 43a00e7856842b8a34f6616fc2ce1ce238ef43210cca41f70e6b4b0d2a9fcad5 diff --git a/ostree/Pkgfile b/ostree/Pkgfile index 3e67c74e4..9ec34fb45 100644 --- a/ostree/Pkgfile +++ b/ostree/Pkgfile @@ -5,7 +5,7 @@ # Optional: docbook-xsl name=ostree -version=2021.6 +version=2022.1 release=1 source=(https://github.com/ostreedev/ostree/releases/download/v$version/lib…

1 0

ports/contrib (3.6): p5-http-message: 6.35 -> 6.36
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit f6f37fa685da06c400755cb5fe0dc9de757b384e Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:39:21 2022 +0100 p5-http-message: 6.35 -> 6.36 diff --git a/p5-http-message/.footprint b/p5-http-message/.footprint index 3072728ed..40ad96c05 100644 --- a/p5-http-message/.footprint +++ b/p5-http-message/.footprint @@ -7,15 +7,15 @@ drwxr-xr-x root/root usr/lib/perl5/site_perl/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/HTTP/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Config.pm --r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Headers.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/HTTP/Headers/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Headers/Auth.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Headers/ETag.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Headers.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Headers/Util.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Message.pm --r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Request.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/HTTP/Request/ -r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Request/Common.pm +-r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Request.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Response.pm -r--r--r-- root/root usr/lib/perl5/site_perl/5.32/HTTP/Status.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/linux-thread-multi/ diff --git a/p5-http-message/.signature b/p5-http-message/.signature index 6e94e8fa0..d3732778b 100644 --- a/p5-http-message/.signature +++ b/p5-http-message/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3y+IcMBdUer35ufE9k5vGjzcUS6rwEyWiFCjooDVqmgKRuWUYEu64D6SKE/zidvXE6iHUFu5uI5zFYMX1GwBWA4= -SHA256 (Pkgfile) = fbd1387ab2217745dd88443128f5b204e33c7e382482f9683fa8c2fdfb3a4697 -SHA256 (.footprint) = 116db616bc978084d31b260404323455eb408d7c3e01e6a366e7125798b7772c -SHA256 (HTTP-Message-6.35.tar.gz) = d77c3a64c2991c58e0694564fea7ed3610ae1790fa9eb32b51972b0a62bc6619 +RWSagIOpLGJF3wNiqigcl7d59+MvskYz6ZnlD7g8BzWxEPVfH9w0+g/wFoyGrogo8tnTjV6BFHnRgWbtr+uWFECoTnlYA9+mFQQ= +SHA256 (Pkgfile) = dbcfdb1521d547764e82066e149f7978d5a68bad2aa7c81388cba2660da7d7f2 +SHA256 (.footprint) = 9060c9d26f38902a6ff08595e5e86c6cac141e29fc924ebfb2d6e24caaaa8557 +SHA256 (HTTP-Message-6.36.tar.gz) = 576a53b486af87db56261a36099776370c06f0087d179fc8c7bb803b48cddd76 diff --git a/p5-http-message/Pkgfile b/p5-http-message/Pkgfile index 8909e3f76..c3fffc1ac 100644 --- a/p5-http-message/Pkgfile +++ b/p5-http-message/Pkgfile @@ -4,7 +4,7 @@ # Depends on: p5-encode-locale p5-http-date p5-io-html p5-lwp-mediatypes p5-uri p5-try-tiny name=p5-http-message -version=6.35 +version=6.36 release=1 source=(https://cpan.metacpan.org/authors/id/O/OA/OALDERS/HTTP-Message-$ver…

1 0

ports/contrib (3.6): p5-mro-compat: 0.13 -> 0.15
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit cdce660d0b5cee3fc9609f7ac7192837820590f6 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:39:07 2022 +0100 p5-mro-compat: 0.13 -> 0.15 diff --git a/p5-mro-compat/.footprint b/p5-mro-compat/.footprint index 8c7c4f41d..fbeef12e8 100644 --- a/p5-mro-compat/.footprint +++ b/p5-mro-compat/.footprint @@ -5,12 +5,12 @@ drwxr-xr-x root/root usr/lib/perl5/5.32/ drwxr-xr-x root/root usr/lib/perl5/5.32/linux-thread-multi/ drwxr-xr-x root/root usr/lib/perl5/site_perl/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/ -drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/MRO/ --r--r--r-- root/root usr/lib/perl5/site_perl/5.32/MRO/Compat.pm drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/linux-thread-multi/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/linux-thread-multi/auto/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/linux-thread-multi/auto/MRO/ drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/linux-thread-multi/auto/MRO/Compat/ +drwxr-xr-x root/root usr/lib/perl5/site_perl/5.32/MRO/ +-r--r--r-- root/root usr/lib/perl5/site_perl/5.32/MRO/Compat.pm drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man3/ diff --git a/p5-mro-compat/.signature b/p5-mro-compat/.signature index a14f4bab0..ab955ea38 100644 --- a/p5-mro-compat/.signature +++ b/p5-mro-compat/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3yItfrk+pyg7gSWKtZoHVuAH+hKZxJrfRmwe9YhS8WXWqTxbDhIPv8vwgu79dSweYtGQneodBuSjwY0r5CuDLQE= -SHA256 (Pkgfile) = 3d675288fb99bc83f2ceb5120e984785e6e04e86a7fb7070e30b935187068a43 -SHA256 (.footprint) = 2e21a933f842d345887be31a0a282d5b2cac94d1bd919bcba9344dca43ffd391 -SHA256 (MRO-Compat-0.13.tar.gz) = 8a2c3b6ccc19328d5579d02a7d91285e2afd85d801f49d423a8eb16f323da4f8 +RWSagIOpLGJF3wleuvliJa80Nuhjx4i1JwRtsatwAcpblr9o3D4K6Ut0RnxSvnJqzKnAgc8u8feqSCAc/K6mkacK8qdxxaRe9w4= +SHA256 (Pkgfile) = 936d13824d48ed03aa728598e9f68001b3fbd2eba867dbbd3ec5d8d266243dbb +SHA256 (.footprint) = b2b72624b39a8509eac040345b435b8e7f59390af1b9f9e199b460e8a147a43d +SHA256 (MRO-Compat-0.15.tar.gz) = 0d4535f88e43babd84ab604866215fc4d04398bd4db7b21852d4a31b1c15ef61 diff --git a/p5-mro-compat/Pkgfile b/p5-mro-compat/Pkgfile index 035596bc6..a711fd47d 100644 --- a/p5-mro-compat/Pkgfile +++ b/p5-mro-compat/Pkgfile @@ -4,7 +4,7 @@ # Depends on: name=p5-mro-compat -version=0.13 +version=0.15 release=1 source=(https://cpan.metacpan.org/authors/id/H/HA/HAARG/MRO-Compat-$version…

1 0

ports/contrib (3.6): pipewire: 0.3.42 -> 0.3.43
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit 21d0d69dfa3760b632e260c95fb6ac4664dce0c3 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:38:54 2022 +0100 pipewire: 0.3.42 -> 0.3.43 diff --git a/pipewire/.footprint b/pipewire/.footprint index c31339096..9f02d2eeb 100644 --- a/pipewire/.footprint +++ b/pipewire/.footprint @@ -188,8 +188,8 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/alsa-lib/ -rwxr-xr-x root/root usr/lib/alsa-lib/libasound_module_ctl_pipewire.so -rwxr-xr-x root/root usr/lib/alsa-lib/libasound_module_pcm_pipewire.so --rwxr-xr-x root/root usr/lib/libpipewire-0.3.so.0.342.0 -lrwxrwxrwx root/root usr/lib/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.342.0 +-rwxr-xr-x root/root usr/lib/libpipewire-0.3.so.0.343.0 +lrwxrwxrwx root/root usr/lib/libpipewire-0.3.so.0 -> libpipewire-0.3.so.0.343.0 lrwxrwxrwx root/root usr/lib/libpipewire-0.3.so -> libpipewire-0.3.so.0 drwxr-xr-x root/root usr/lib/pipewire-0.3/ -rwxr-xr-x root/root usr/lib/pipewire-0.3/libpipewire-module-access.so @@ -316,6 +316,7 @@ drwxr-xr-x root/root usr/share/alsa-card-profile/mixer/profile-sets/ -rw-r--r-- root/root usr/share/alsa-card-profile/mixer/profile-sets/sennheiser-gsx.conf -rw-r--r-- root/root usr/share/alsa-card-profile/mixer/profile-sets/simple-headphones-mic.conf -rw-r--r-- root/root usr/share/alsa-card-profile/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf +-rw-r--r-- root/root usr/share/alsa-card-profile/mixer/profile-sets/texas-instruments-pcm2902.conf -rw-r--r-- root/root usr/share/alsa-card-profile/mixer/profile-sets/usb-gaming-headset.conf drwxr-xr-x root/root usr/share/pipewire/ -rw-r--r-- root/root usr/share/pipewire/client.conf diff --git a/pipewire/.signature b/pipewire/.signature index 518506ff6..f72d80d4e 100644 --- a/pipewire/.signature +++ b/pipewire/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37/vnVcX8C5CJHgApKz7XApv72OFykti3uzFNEPuQ757i+cmdPrrtPHvBSYJaRuCPhj+TTWZZwtOM2yQf1BAoQw= -SHA256 (Pkgfile) = df874e79f8ff477d2b9188e651c9f31d6f3663c5d0accdb7bcc0376757ade041 -SHA256 (.footprint) = 996f84d559415edbdf403dbbb682a82ef2bc33bfab19c7afc10dfe5fd15383d2 -SHA256 (pipewire-0.3.42.tar.gz) = 726d1f2faed6f1e93c1499cd20ff0d6461bc698166bea3b98d46c291794e6e1c +RWSagIOpLGJF34RUQ0/qzjGnrglOFRCSguOyjv7bQhw+Zf2cysxhgIYbx4wd0e3cd3eMStFWgq/Srb3TZz0xTcuSJGrgujyeYA4= +SHA256 (Pkgfile) = 6600ca4f95707102079151f1dac73e6f5025ebb25ea0026e6fddc6f2bb7267a3 +SHA256 (.footprint) = 3b528f219a32776c596dec7a4854748fa7a57fd27820a75e4ac26e5d843cd624 +SHA256 (pipewire-0.3.43.tar.gz) = 87f692a2cb5b14ee900e102502b5e078a0cd3f7836f03a2e7cb30690ead37b50 diff --git a/pipewire/Pkgfile b/pipewire/Pkgfile index 3fbe4a3ee..9b5a1ed7c 100644 --- a/pipewire/Pkgfile +++ b/pipewire/Pkgfile @@ -5,7 +5,7 @@ # Optional: alsa-ucm-conf avahi bluez gst-plugins-base jack libldac pulseaudio rtkit v4l2 vulkan-loader wireplumber name=pipewire -version=0.3.42 +version=0.3.43 release=1 source=(https://github.com/PipeWire/pipewire/archive/$version/$name-$versio…

1 0

ports/contrib (3.6): python3-charset-normalizer: 2.0.9 -> 2.0.10
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit 710244e55ad5c31f84982fd00a9beab854485e0e Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:36:41 2022 +0100 python3-charset-normalizer: 2.0.9 -> 2.0.10 diff --git a/python3-charset-normalizer/.footprint b/python3-charset-normalizer/.footprint index 21748fe12..87d7e964d 100644 --- a/python3-charset-normalizer/.footprint +++ b/python3-charset-normalizer/.footprint @@ -5,13 +5,13 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.9/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/charset_normalizer/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.9-py3.9.egg-info/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.9-py3.9.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.9-py3.9.egg-info/entry_points.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.9-py3.9.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.9-py3.9.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.9-py3.9.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.9-py3.9.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.10-py3.9.egg-info/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.10-py3.9.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.10-py3.9.egg-info/entry_points.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.10-py3.9.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.10-py3.9.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.10-py3.9.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer-2.0.10-py3.9.egg-info/top_level.txt -rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer/api.py drwxr-xr-x root/root usr/lib/python3.9/site-packages/charset_normalizer/assets/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/charset_normalizer/assets/__init__.py diff --git a/python3-charset-normalizer/.signature b/python3-charset-normalizer/.signature index fdef768f5..85ce8dce6 100644 --- a/python3-charset-normalizer/.signature +++ b/python3-charset-normalizer/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37eDzUPGfT+tWLidEaLtUf88nOUDLzhxeePMKDl7gHS6f8icNrGBgkWqbw6UThi7QsHnW0Lt2KtAoNI1PSsMLAw= -SHA256 (Pkgfile) = 0d3a47c1ea997500d7da9a44f019ab10b924ef0095b1d703fadde58f72174bdd -SHA256 (.footprint) = 1eef6e4bd6191e197098243a2175d4f608261f88960368b84d8ccebb27ef7b75 -SHA256 (python3-charset-normalizer-2.0.9.tar.gz) = d3a0e1a74c1ed5804c12ed4ae3d58062434ba7b1782fcbd202633074a8319d5c +RWSagIOpLGJF39F/DC3RYthDvDuwI4FcHEQOf1SnSpquGncdTngeQQ3ipm7/YleyOCcqArASCfUYvq33Dz6VWFRC2/BL7rFqRgg= +SHA256 (Pkgfile) = 04de5e544a5896d8c6a3f620ec60f10ef7c80e87636c99ac6e39766204ee6013 +SHA256 (.footprint) = f18e9db5e94d696a480917518639544efa21ffa9c1a68a8cd003e0a40723f6bc +SHA256 (python3-charset-normalizer-2.0.10.tar.gz) = f6ff5af81be8e733099e5dd79bf344f3181d1b4de25a570c0398e816b173f9f1 diff --git a/python3-charset-normalizer/Pkgfile b/python3-charset-normalizer/Pkgfile index fbb67dc2f..2ced27720 100644 --- a/python3-charset-normalizer/Pkgfile +++ b/python3-charset-normalizer/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-setuptools name=python3-charset-normalizer -version=2.0.9 +version=2.0.10 release=1 source=(https://github.com/Ousret/charset_normalizer/archive/$version/$name…

1 0

ports/contrib (3.6): python3-ruamel-yaml: 0.17.19 -> 0.17.20
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit 5ae500daabcb75d7a134508d64436d9764216b9d Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:36:21 2022 +0100 python3-ruamel-yaml: 0.17.19 -> 0.17.20 diff --git a/python3-ruamel-yaml/.footprint b/python3-ruamel-yaml/.footprint index 422d74916..dd7b830a0 100644 --- a/python3-ruamel-yaml/.footprint +++ b/python3-ruamel-yaml/.footprint @@ -4,14 +4,14 @@ drwxr-xr-x root/root usr/lib/python3.9/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ruamel/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ruamel/yaml/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.19-py3.9.egg-info/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.19-py3.9.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.19-py3.9.egg-info/namespace_packages.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.19-py3.9.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.19-py3.9.egg-info/requires.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.19-py3.9.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.19-py3.9.egg-info/top_level.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.19-py3.9-nspkg.pth +drwxr-xr-x root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.20-py3.9.egg-info/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.20-py3.9.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.20-py3.9.egg-info/namespace_packages.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.20-py3.9.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.20-py3.9.egg-info/requires.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.20-py3.9.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.20-py3.9.egg-info/top_level.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel.yaml-0.17.20-py3.9-nspkg.pth -rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel/yaml/anchor.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel/yaml/comments.py -rw-r--r-- root/root usr/lib/python3.9/site-packages/ruamel/yaml/compat.py diff --git a/python3-ruamel-yaml/.signature b/python3-ruamel-yaml/.signature index d368b983c..8ed645644 100644 --- a/python3-ruamel-yaml/.signature +++ b/python3-ruamel-yaml/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36VI0LqcjmNkoVzLPMmRou8QtZbrcT2+sgrw62LksRp7LXsbqOHDoZgp/l3oR+laMSyu0lSVUrJ0Wd71SKJRIw8= -SHA256 (Pkgfile) = ae457e0d704a2490b8472f7c3d01b864b92ed435e4193d4a19899dea1334b86b -SHA256 (.footprint) = f06e205870ec427d0753aa4cfc9e2ed6ae0da2dba49b59a6fd58ff6576bc097b -SHA256 (ruamel.yaml-0.17.19.tar.gz) = b9ce9a925d0f0c35a1dbba56b40f253c53cd526b0fa81cf7b1d24996f28fb1d7 +RWSagIOpLGJF37N+cYXTVRQ43xbyd2hOkobIoU1OlagDW2/QvziNhBlNnwbta+QkxGW6AhBvojUEWDVPfjvflYPsS5rbztuREAQ= +SHA256 (Pkgfile) = f02fffd922a8789634714549ad5e29a8d5b255fc1b434110991a3f27bde3259b +SHA256 (.footprint) = 645c3b39411c3d76bd7ad34e0f8ead09e930787f734e52474002ace1135a8f07 +SHA256 (ruamel.yaml-0.17.20.tar.gz) = 4b8a33c1efb2b443a93fcaafcfa4d2e445f8e8c29c528d9f5cdafb7cc9e4004c diff --git a/python3-ruamel-yaml/Pkgfile b/python3-ruamel-yaml/Pkgfile index e7a14af26..ac452d3ec 100644 --- a/python3-ruamel-yaml/Pkgfile +++ b/python3-ruamel-yaml/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-ruamel-yaml-clib name=python3-ruamel-yaml -version=0.17.19 +version=0.17.20 release=1 source=(https://files.pythonhosted.org/packages/source/r/ruamel.yaml/ruamel…

1 0

ports/contrib (3.6): qownnotes: 22.1.2 -> 22.1.4
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit a56652a00fb1338972df65d1fefdf83bbce5c0b5 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:35:41 2022 +0100 qownnotes: 22.1.2 -> 22.1.4 diff --git a/qownnotes/.signature b/qownnotes/.signature index efae29d9a..dbc6855f4 100644 --- a/qownnotes/.signature +++ b/qownnotes/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF30ugJgfbIdYnOhghxGtj/IEAcQd1w93uLi0/YJ0KITCrSOVefCOgJaRCuJcpplomP3c3NwGp6GKtEUr9c7DuCQw= -SHA256 (Pkgfile) = a5d8f52c9af9defeec3fc708988fe69a4300824a8c188ac1b72c3fd2497bd9ef +RWSagIOpLGJF3+lVQkt9XSmtw1TKLWFiCC7SzTRfSH93U2p7rufayU8oO6+Ct287trB9fWW2fY5wPXbV3zgIOWixRqyTr7M7MQA= +SHA256 (Pkgfile) = 9975cc1ed4e3ea71a2d4de5879de7857a65dbb062119a75d83688ff2a6b701bd SHA256 (.footprint) = d3916e94908249d530356c1e79cef586cdeacf7bd488278a3f0c61ab5be2aab3 -SHA256 (qownnotes-22.1.2.tar.xz) = 0eb9c8323923ed26cda9236b63ef757190fd29688c733cccc0f6c68016120864 +SHA256 (qownnotes-22.1.4.tar.xz) = bf560c88852d352c0677f8271c97f5413aefb5d1cbe5b69eb6d195854dd19984 diff --git a/qownnotes/Pkgfile b/qownnotes/Pkgfile index 56d189c83..d9356691f 100644 --- a/qownnotes/Pkgfile +++ b/qownnotes/Pkgfile @@ -4,7 +4,7 @@ # Depends on: qt5 name=qownnotes -version=22.1.2 +version=22.1.4 release=1 source=(https://download.tuxfamily.org/$name/src/$name-$version.tar.xz)

1 0

ports/contrib (3.6): [notify] sway: new dependency: xorg-libevdev
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit b61ece32a640abec13c2c3f45c2303b7f1e95770 Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:31:56 2022 +0100 [notify] sway: new dependency: xorg-libevdev diff --git a/sway/.signature b/sway/.signature index a7cee6677..be8daf804 100644 --- a/sway/.signature +++ b/sway/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF31sLy6atEMVw+71j8ULFNtB/kG9oBlAVkiw9kgk2ZBnC0bHNAq3fnNGqMRCuq5dce8afKW0zjySO7SuzzdkVrgw= -SHA256 (Pkgfile) = 4857a2972ed1193ffe3c8afe2d95d6a9d260c96336c3b2882e5703a12062e24a +RWSagIOpLGJF38jUd4xKNonUB23JB56L7JL7IAhP7JMK60cfFnSrYLrM3KkrYYcsfxSdnyUesb+uXAEDRCbS+vwk6N6Sqz7nAAU= +SHA256 (Pkgfile) = 930ec54b4622283d73d393edbe2e7547ef82953aaf028f230dbbf89800063103 SHA256 (.footprint) = 76cf242dac27363a8a964536eda5e54f00953e79380ee493090ca249bd688920 -SHA256 (sway-1.6.1.tar.gz) = 8b138867cd83217de07138144b1279fe58e0421eb10c91122aa33c8770fe7391 -SHA256 (6249.patch) = b12f7ba4663ac296d1bd435bd2d514fad0639391c6639bac695eb6f590917dd2 +SHA256 (sway-1.7-rc1.tar.gz) = 3bf95342eb94024589094273f4f495f8c0c9cae9bece1c08ab19101c99bbe8f2 +SHA256 (6249.patch) = 24fd8235405b82c163a260311b79936aefac3bef451fe314b1bf692038bf407a diff --git a/sway/6249.patch b/sway/6249.patch index 512c0fbbd..af9c72722 100644 --- a/sway/6249.patch +++ b/sway/6249.patch @@ -1,7 +1,10 @@ -From f641e581a5301eeaefcb0da51904946d83240a88 Mon Sep 17 00:00:00 2001 +From f65c7d9164ef18b21752259272ef6f43e1df4d2b Mon Sep 17 00:00:00 2001 From: Felix Weilbach <felix.weilbach(a)t-online.de> Date: Sun, 30 May 2021 20:45:01 +0200 -Subject: [PATCH] Tray: Implement dbusmenu +Subject: [PATCH 1/5] Tray: Implement dbusmenu + +Co-authored-by: Ian Fan <ianfan0(a)gmail.com> +Co-authored-by: Nathan Schulte <nmschulte(a)gmail.com> Signed-off-by: Felix Weilbach <felix.weilbach(a)t-online.de> --- @@ -9,12 +12,12 @@ Signed-off-by: Felix Weilbach <felix.weilbach(a)t-online.de> include/swaybar/tray/dbusmenu.h | 25 + include/swaybar/tray/item.h | 2 + include/swaybar/tray/tray.h | 3 + - swaybar/input.c | 56 +- + swaybar/input.c | 54 +- swaybar/meson.build | 3 +- swaybar/render.c | 29 +- - swaybar/tray/dbusmenu.c | 1346 +++++++++++++++++++++++++++++++ + swaybar/tray/dbusmenu.c | 1345 +++++++++++++++++++++++++++++++ swaybar/tray/item.c | 38 +- - 9 files changed, 1487 insertions(+), 25 deletions(-) + 9 files changed, 1481 insertions(+), 28 deletions(-) create mode 100644 include/swaybar/tray/dbusmenu.h create mode 100644 swaybar/tray/dbusmenu.c @@ -112,7 +115,7 @@ index d2e80a6d47..853f17cdc1 100644 struct swaybar_tray *create_tray(struct swaybar *bar); diff --git a/swaybar/input.c b/swaybar/input.c -index 6e13f17732..65c33db864 100644 +index c8c8f0d4f1..2c4c5d8fef 100644 --- a/swaybar/input.c +++ b/swaybar/input.c @@ -10,6 +10,10 @@ @@ -176,37 +179,30 @@ index 6e13f17732..65c33db864 100644 } static bool check_bindings(struct swaybar *bar, uint32_t button, -@@ -141,7 +164,11 @@ static bool check_bindings(struct swaybar *bar, uint32_t button, +@@ -141,14 +164,16 @@ static bool check_bindings(struct swaybar *bar, uint32_t button, } static bool process_hotspots(struct swaybar_output *output, - double x, double y, uint32_t button) { -+ struct swaybar_seat *seat, -+ uint32_t serial, -+ double x, -+ double y, ++ struct swaybar_seat *seat, uint32_t serial, double x, double y, + uint32_t button) { - double px = x * output->scale; - double py = y * output->scale; struct swaybar_hotspot *hotspot; -@@ -149,8 +176,14 @@ static bool process_hotspots(struct swaybar_output *output, - if (px >= hotspot->x && py >= hotspot->y - && px < hotspot->x + hotspot->width - && py < hotspot->y + hotspot->height) { + wl_list_for_each(hotspot, &output->hotspots, link) { +- if (x >= hotspot->x && y >= hotspot->y +- && x < hotspot->x + hotspot->width +- && y < hotspot->y + hotspot->height) { - if (HOTSPOT_IGNORE == hotspot->callback(output, hotspot, x, y, - button, hotspot->data)) { -+ if (HOTSPOT_IGNORE == hotspot->callback(output, -+ hotspot, -+ seat, -+ serial, -+ x, -+ y, -+ button, -+ hotspot->data)) { ++ if (x >= hotspot->x && y >= hotspot->y && ++ x < hotspot->x + hotspot->width && ++ y < hotspot->y + hotspot->height) { ++ if (HOTSPOT_IGNORE == ++ hotspot->callback(output, hotspot, seat, serial, x, y, ++ button, hotspot->data)) { return true; } } -@@ -162,6 +195,12 @@ static bool process_hotspots(struct swaybar_output *output, +@@ -160,6 +185,12 @@ static bool process_hotspots(struct swaybar_output *output, static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer, uint32_t serial, uint32_t time, uint32_t button, uint32_t state) { struct swaybar_seat *seat = data; @@ -219,7 +215,7 @@ index 6e13f17732..65c33db864 100644 struct swaybar_pointer *pointer = &seat->pointer; struct swaybar_output *output = pointer->current; if (!sway_assert(output, "button with no active output")) { -@@ -175,7 +214,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer, +@@ -173,7 +204,7 @@ static void wl_pointer_button(void *data, struct wl_pointer *wl_pointer, if (state != WL_POINTER_BUTTON_STATE_PRESSED) { return; } @@ -228,7 +224,7 @@ index 6e13f17732..65c33db864 100644 } static void workspace_next(struct swaybar *bar, struct swaybar_output *output, -@@ -232,7 +271,7 @@ static void process_discrete_scroll(struct swaybar_seat *seat, +@@ -230,7 +261,7 @@ static void process_discrete_scroll(struct swaybar_seat *seat, return; } @@ -237,7 +233,7 @@ index 6e13f17732..65c33db864 100644 return; } -@@ -405,7 +444,8 @@ static void wl_touch_up(void *data, struct wl_touch *wl_touch, +@@ -403,7 +434,8 @@ static void wl_touch_up(void *data, struct wl_touch *wl_touch, } if (time - slot->time < 500) { // Tap, treat it like a pointer click @@ -262,10 +258,10 @@ index 9feb3cd2d0..86abe93235 100644 swaybar_deps = [ diff --git a/swaybar/render.c b/swaybar/render.c -index fcc8be1d6f..68cbe853a7 100644 +index de468b4f19..e3133a422c 100644 --- a/swaybar/render.c +++ b/swaybar/render.c -@@ -160,8 +160,14 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color, +@@ -158,8 +158,14 @@ static void render_sharp_line(cairo_t *cairo, uint32_t color, } static enum hotspot_event_handling block_hotspot_callback( @@ -282,7 +278,7 @@ index fcc8be1d6f..68cbe853a7 100644 struct i3bar_block *block = data; struct status_line *status = output->bar->status; return i3bar_block_send_click(status, block, x, y, -@@ -296,7 +302,7 @@ static uint32_t render_status_block(struct render_context *ctx, +@@ -294,7 +300,7 @@ static uint32_t render_status_block(struct render_context *ctx, } else if (strncmp(block->align, "right", 5) == 0) { offset = x_pos + width - text_width; } else if (strncmp(block->align, "center", 6) == 0) { @@ -291,7 +287,7 @@ index fcc8be1d6f..68cbe853a7 100644 } double text_y = height / 2.0 - text_height / 2.0; cairo_move_to(cairo, offset, (int)floor(text_y)); -@@ -325,7 +331,7 @@ static uint32_t render_status_block(struct render_context *ctx, +@@ -322,7 +328,7 @@ static uint32_t render_status_block(struct render_context *ctx, } cairo_set_source_u32(cairo, color); if (config->sep_symbol) { @@ -300,7 +296,7 @@ index fcc8be1d6f..68cbe853a7 100644 double sep_y = height / 2.0 - sep_height / 2.0; cairo_move_to(cairo, offset, (int)floor(sep_y)); choose_text_aa_mode(ctx, color); -@@ -334,7 +340,7 @@ static uint32_t render_status_block(struct render_context *ctx, +@@ -331,7 +337,7 @@ static uint32_t render_status_block(struct render_context *ctx, } else { cairo_set_operator(cairo, CAIRO_OPERATOR_SOURCE); cairo_set_line_width(cairo, 1); @@ -309,7 +305,7 @@ index fcc8be1d6f..68cbe853a7 100644 cairo_line_to(cairo, x_pos + sep_block_width / 2, height - margin); cairo_stroke(cairo); } -@@ -596,8 +602,14 @@ static uint32_t render_binding_mode_indicator(struct render_context *ctx, +@@ -593,8 +599,14 @@ static uint32_t render_binding_mode_indicator(struct render_context *ctx, } static enum hotspot_event_handling workspace_hotspot_callback( @@ -326,7 +322,7 @@ index fcc8be1d6f..68cbe853a7 100644 if (button != BTN_LEFT) { return HOTSPOT_PROCESS; } -@@ -662,7 +674,8 @@ static uint32_t render_workspace_button(struct render_context *ctx, +@@ -659,7 +671,8 @@ static uint32_t render_workspace_button(struct render_context *ctx, double text_y = height / 2.0 - text_height / 2.0; cairo_set_source_u32(cairo, box_colors.text); @@ -334,14 +330,14 @@ index fcc8be1d6f..68cbe853a7 100644 + cairo_move_to( + cairo, *x + width / 2.0 - text_width / 2.0, (int)floor(text_y)); choose_text_aa_mode(ctx, box_colors.text); - pango_printf(cairo, config->font, output->scale, config->pango_markup, + render_text(cairo, config->font, 1, config->pango_markup, "%s", ws->label); diff --git a/swaybar/tray/dbusmenu.c b/swaybar/tray/dbusmenu.c new file mode 100644 -index 0000000000..e39699f50f +index 0000000000..e8c6480b2a --- /dev/null +++ b/swaybar/tray/dbusmenu.c -@@ -0,0 +1,1346 @@ +@@ -0,0 +1,1345 @@ +#define _POSIX_C_SOURCE 200809L +#include <pool-buffer.h> +#include <wlr-layer-shell-unstable-v1-client-protocol.h> @@ -656,7 +652,7 @@ index 0000000000..e39699f50f + uint32_t disabled_color = c - ((c & 0xFF) >> 1); + cairo_set_source_u32(cairo, disabled_color); + } -+ pango_printf(cairo, config->font, output->scale, false, "%s", ++ render_text(cairo, config->font, output->scale, false, "%s", + item->label); + + // draw icon or menu indicator if needed @@ -1606,8 +1602,7 @@ index 0000000000..e39699f50f + uint32_t serial, struct wl_surface *surface) { + struct swaybar_seat *seat = data; + struct swaybar_tray *tray = seat->bar->tray; -+ struct swaybar_dbusmenu_menu *focused_menu = tray->menu_pointer_focus; -+ if (!(tray && tray->menu && focused_menu)) { ++ if (!(tray && tray->menu)) { + return false; + } + @@ -1772,3 +1767,196 @@ index 19f4beacaa..247eab33cc 100644 return HOTSPOT_IGNORE; } else { sway_log(SWAY_DEBUG, "but it doesn't exist"); + +From d3768e479c3f138aaa52ef7ef5994547a13df1c3 Mon Sep 17 00:00:00 2001 +From: Felix Weilbach <felix.weilbach(a)t-online.de> +Date: Wed, 15 Sep 2021 21:55:34 +0200 +Subject: [PATCH 2/5] fixup! don't scroll workspaces + +--- + include/swaybar/tray/dbusmenu.h | 3 +++ + swaybar/input.c | 6 ++++++ + swaybar/tray/dbusmenu.c | 9 +++++++++ + 3 files changed, 18 insertions(+) + +diff --git a/include/swaybar/tray/dbusmenu.h b/include/swaybar/tray/dbusmenu.h +index 55db61ddd9..442e40547b 100644 +--- a/include/swaybar/tray/dbusmenu.h ++++ b/include/swaybar/tray/dbusmenu.h +@@ -22,4 +22,7 @@ bool dbusmenu_pointer_enter(void *data, struct wl_pointer *wl_pointer, + bool dbusmenu_pointer_leave(void *data, struct wl_pointer *wl_pointer, + uint32_t serial, struct wl_surface *surface); + ++bool dbusmenu_pointer_frame(struct swaybar_seat *data, ++ struct wl_pointer *wl_pointer); ++ + #endif +diff --git a/swaybar/input.c b/swaybar/input.c +index 2c4c5d8fef..c6d176946d 100644 +--- a/swaybar/input.c ++++ b/swaybar/input.c +@@ -327,6 +327,12 @@ static void wl_pointer_frame(void *data, struct wl_pointer *wl_pointer) { + struct swaybar_pointer *pointer = &seat->pointer; + struct swaybar_output *output = pointer->current; + ++#if HAVE_TRAY ++ if (dbusmenu_pointer_frame(data, wl_pointer)) { ++ return; ++ } ++#endif ++ + if (output == NULL) { + return; + } +diff --git a/swaybar/tray/dbusmenu.c b/swaybar/tray/dbusmenu.c +index e8c6480b2a..739cf4c5a9 100644 +--- a/swaybar/tray/dbusmenu.c ++++ b/swaybar/tray/dbusmenu.c +@@ -1237,6 +1237,15 @@ static void close_child_menus_outside_pointer( + } + } + ++bool dbusmenu_pointer_frame(struct swaybar_seat *data, ++ struct wl_pointer *wl_pointer) { ++ struct swaybar_tray *tray = data->bar->tray; ++ if (!(tray && tray->menu && tray->menu_pointer_focus)) { ++ return false; ++ } ++ return true; ++} ++ + bool dbusmenu_pointer_enter(void *data, struct wl_pointer *wl_pointer, + uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, + wl_fixed_t surface_y) { + +From 44f947aa9bb1cf36ef384f64867fcdfc89258573 Mon Sep 17 00:00:00 2001 +From: Felix Weilbach <felix.weilbach(a)t-online.de> +Date: Wed, 15 Sep 2021 22:44:28 +0200 +Subject: [PATCH 3/5] fixup! close submenus + +--- + swaybar/tray/dbusmenu.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/swaybar/tray/dbusmenu.c b/swaybar/tray/dbusmenu.c +index 739cf4c5a9..f8f31cf6b3 100644 +--- a/swaybar/tray/dbusmenu.c ++++ b/swaybar/tray/dbusmenu.c +@@ -1127,6 +1127,21 @@ static void close_child_menus(struct swaybar_dbusmenu_menu *menu) { + } + } + ++static void close_child_menus_except(struct swaybar_dbusmenu_menu *menu, ++ int id) { ++ if (!menu || !menu->child_menus) { ++ return; ++ } ++ ++ for (int i = 0; i < menu->child_menus->length; ++i) { ++ struct swaybar_dbusmenu_menu *child_menu = menu->child_menus->items[i]; ++ if (child_menu->item_id == id) { ++ continue; ++ } ++ close_menus(child_menu); ++ } ++} ++ + static void open_close_child_menu(struct swaybar_dbusmenu_menu *menu, + struct swaybar_dbusmenu_menu_item *item, int x, int y) { + +@@ -1137,6 +1152,7 @@ static void open_close_child_menu(struct swaybar_dbusmenu_menu *menu, + // No need to open the root menu + return; + } ++ close_child_menus_except(menu, item->id); + open_menu_id(menu->dbusmenu, item->id); + } else if (in_hotspot && !item->submenu) { + close_child_menus(menu); + +From d1a87205af0830a31fa993e4e956623bb3e59340 Mon Sep 17 00:00:00 2001 +From: Felix Weilbach <felix.weilbach(a)t-online.de> +Date: Wed, 15 Sep 2021 23:00:49 +0200 +Subject: [PATCH 4/5] fixup! Only set focused menu when pointer enters + +--- + swaybar/tray/dbusmenu.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/swaybar/tray/dbusmenu.c b/swaybar/tray/dbusmenu.c +index f8f31cf6b3..f389097a93 100644 +--- a/swaybar/tray/dbusmenu.c ++++ b/swaybar/tray/dbusmenu.c +@@ -670,12 +670,6 @@ static void swaybar_dbusmenu_draw(struct swaybar_dbusmenu *dbusmenu, int id) { + return; + } + swaybar_dbusmenu_draw_menu(dbusmenu->menu, id, true); +- +- if (!dbusmenu->sni->tray->menu_pointer_focus) { +- // First shown +- dbusmenu->sni->tray->menu_pointer_focus = +- find_menu_id(dbusmenu->menu, id); +- } + } + + struct png_stream { + +From 5c7aa54af364850c03d6f7aee8b486e53572a682 Mon Sep 17 00:00:00 2001 +From: Felix Weilbach <felix.weilbach(a)t-online.de> +Date: Thu, 16 Sep 2021 19:42:46 +0200 +Subject: [PATCH 5/5] fixup! handle also pointer axis when using tray + +--- + include/swaybar/tray/dbusmenu.h | 3 +++ + swaybar/input.c | 6 ++++++ + swaybar/tray/dbusmenu.c | 9 +++++++++ + 3 files changed, 18 insertions(+) + +diff --git a/include/swaybar/tray/dbusmenu.h b/include/swaybar/tray/dbusmenu.h +index 442e40547b..610b6e6285 100644 +--- a/include/swaybar/tray/dbusmenu.h ++++ b/include/swaybar/tray/dbusmenu.h +@@ -25,4 +25,7 @@ bool dbusmenu_pointer_leave(void *data, struct wl_pointer *wl_pointer, + bool dbusmenu_pointer_frame(struct swaybar_seat *data, + struct wl_pointer *wl_pointer); + ++bool dbusmenu_pointer_axis(struct swaybar_seat *data, ++ struct wl_pointer *wl_pointer); ++ + #endif +diff --git a/swaybar/input.c b/swaybar/input.c +index c6d176946d..adb4c940ea 100644 +--- a/swaybar/input.c ++++ b/swaybar/input.c +@@ -311,6 +311,12 @@ static void wl_pointer_axis(void *data, struct wl_pointer *wl_pointer, + return; + } + ++#if HAVE_TRAY ++ if (dbusmenu_pointer_axis(data, wl_pointer)) { ++ return; ++ } ++#endif ++ + // If there's a while since the last scroll event, + // set 'value' to zero as if to reset the "virtual scroll wheel" + if (seat->axis[axis].discrete_steps == 0 && +diff --git a/swaybar/tray/dbusmenu.c b/swaybar/tray/dbusmenu.c +index f389097a93..e4a6a9f6d6 100644 +--- a/swaybar/tray/dbusmenu.c ++++ b/swaybar/tray/dbusmenu.c +@@ -1256,6 +1256,15 @@ bool dbusmenu_pointer_frame(struct swaybar_seat *data, + return true; + } + ++bool dbusmenu_pointer_axis(struct swaybar_seat *data, ++ struct wl_pointer *wl_pointer) { ++ struct swaybar_tray *tray = data->bar->tray; ++ if (!(tray && tray->menu && tray->menu_pointer_focus)) { ++ return false; ++ } ++ return true; ++} ++ + bool dbusmenu_pointer_enter(void *data, struct wl_pointer *wl_pointer, + uint32_t serial, struct wl_surface *surface, wl_fixed_t surface_x, + wl_fixed_t surface_y) { diff --git a/sway/Pkgfile b/sway/Pkgfile index e02595cb4..ef341ef68 100644 --- a/sway/Pkgfile +++ b/sway/Pkgfile @@ -1,12 +1,12 @@ # Description: An i3-compatible wayland compositor. # URL: https://swaywm.org/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: basu json-c pango wlroots +# Depends on: basu json-c pango wlroots xorg-libevdev # Optional: gdk-pixbuf scdoc seatd name=sway -version=1.6.1 -release=5 +version=1.7-rc1 +release=1 source=(https://github.com/swaywm/sway/archive/$version/$name-$version.tar.… 6249.patch)

1 0

ports/contrib (3.6): wireplumber: 0.4.5 -> 0.4.6
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit efa3bbc97553896ebf10ce3b588abd92eb10e6fe Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:31:11 2022 +0100 wireplumber: 0.4.5 -> 0.4.6 diff --git a/wireplumber/.footprint b/wireplumber/.footprint index c1499ceb8..60e224f89 100644 --- a/wireplumber/.footprint +++ b/wireplumber/.footprint @@ -40,8 +40,8 @@ drwxr-xr-x root/root usr/include/wireplumber-0.4/wp/ -rw-r--r-- root/root usr/include/wireplumber-0.4/wp/wp.h -rw-r--r-- root/root usr/include/wireplumber-0.4/wp/wpversion.h drwxr-xr-x root/root usr/lib/ --rwxr-xr-x root/root usr/lib/libwireplumber-0.4.so.0.4.5 -lrwxrwxrwx root/root usr/lib/libwireplumber-0.4.so.0 -> libwireplumber-0.4.so.0.4.5 +-rwxr-xr-x root/root usr/lib/libwireplumber-0.4.so.0.4.6 +lrwxrwxrwx root/root usr/lib/libwireplumber-0.4.so.0 -> libwireplumber-0.4.so.0.4.6 lrwxrwxrwx root/root usr/lib/libwireplumber-0.4.so -> libwireplumber-0.4.so.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/wireplumber-0.4.pc diff --git a/wireplumber/.signature b/wireplumber/.signature index 586a17c0b..a7e8195c3 100644 --- a/wireplumber/.signature +++ b/wireplumber/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3xGk+ancvXouZ85XLW4blDzpmvPsqJoS/D55SuFwiCtkwuYV8vsEkGQIRRt+viH98cXmeBi9cA9JaCZe0VVyeAo= -SHA256 (Pkgfile) = e9f8a6ed5b3156b036789b5655025d9c455741ae5b0feffc87096143c47e1ec5 -SHA256 (.footprint) = aa47fa16721a28ca565875b2229e7035e5a8c516ad6c4a7c5471d0b33ce4cbcf -SHA256 (wireplumber-0.4.5.tar.bz2) = 3d37a867e9dd4fa106a48ab4f6cfff23e0039a86990e56f70fbde073035bc56d +RWSagIOpLGJF33Wn97p2wZsM74SM1Npq1VnFQDlkVow1kbGjGeg2ctRtvr+7+mdFGLVrt9ZOyfmmpDMLN3VQWlztasw2nlQlfgo= +SHA256 (Pkgfile) = 96b805037f8f384e4259b0dad934b4ab2696cd515f22a4d7198719962663227f +SHA256 (.footprint) = bf4ca3ce09a45022c00a70e6a1d6996c2802b1d022c4294f47f82164b93f4e82 +SHA256 (wireplumber-0.4.6.tar.bz2) = c13001964035d94985ab8d942bd67826b739bbf32fdfe91cc82b0856581a003f diff --git a/wireplumber/Pkgfile b/wireplumber/Pkgfile index 21a155809..4f0e364e5 100644 --- a/wireplumber/Pkgfile +++ b/wireplumber/Pkgfile @@ -4,7 +4,7 @@ # Depends on: cpptoml lua pipewire util-linux name=wireplumber -version=0.4.5 +version=0.4.6 release=1 source=(https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$vers…

1 0

ports/contrib (3.6): [notify] wlroots: new dependency: libinput
by crux＠crux.nu 07 Jan '22

07 Jan '22

commit 0edc6c5f029286b36589305fadfd2d9cdf4de08f Author: Tim Biermann <tbier(a)posteo.de> Date: Fri Jan 7 12:30:23 2022 +0100 [notify] wlroots: new dependency: libinput diff --git a/wlroots/.signature b/wlroots/.signature index 57a1a21d2..5266696c1 100644 --- a/wlroots/.signature +++ b/wlroots/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35k6CE5oIWTQL9+s4D1O4Tq3cbCAgGQ5gBRDHgF9j/JSs82sXPkomDIVoTwrqW2UtGkaP1BNKLddNnt/iSgVBwk= -SHA256 (Pkgfile) = d301c1a9ac11d7ae8af8889170fc95661e92cfa2be8ee99d7c85e16ebfad4ef3 +RWSagIOpLGJF30EPY5innrWqd3eYmatD3Da2/zdNNkisXqLoaNWGf+dwdS8c5HXmwNQWNj8gSp4u9xbL8LfuNUn5kFxjFBSAygI= +SHA256 (Pkgfile) = 90ffa529338826755c88830891ee02e23d09e198d0bb2359fda4c6cb36bf123b SHA256 (.footprint) = 7a16518c41eae33db387c7651c4bfe9653984a5ae24b76d889f6f8baca9b4926 SHA256 (wlroots-0.15.0.tar.bz2) = fcb9e9dbbb112f5c527c1c4155994fd97b6b1eb3950316e186e3c293e7a07fc4 diff --git a/wlroots/Pkgfile b/wlroots/Pkgfile index 21059bab3..f274b33b2 100644 --- a/wlroots/Pkgfile +++ b/wlroots/Pkgfile @@ -1,12 +1,12 @@ # Description: A modular Wayland compositor library. # URL: https://gitlab.freedesktop.org/wlroots/wlroots/ # Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: libcap libxkbcommon mesa seatd wayland-protocols xorg-libpixman xorg-xcb-util-image xorg-xcb-util-wm -# Optional: libinput xorg-libxcomposite xorg-server xorg-xcb-util-error xorg-xcb-util-renderutil xorg-xinput +# Depends on: libcap libinput libxkbcommon mesa seatd wayland-protocols xorg-libpixman xorg-xcb-util-image xorg-xcb-util-wm +# Optional: xorg-libxcomposite xorg-server xorg-xcb-util-error xorg-xcb-util-renderutil xorg-xinput name=wlroots version=0.15.0 -release=1 +release=2 source=(https://gitlab.freedesktop.org/wlroots/wlroots/-/archive/$version/w… build() {

1 0