From 0249539a6777df41824788ccc60a12a597d7efc0 Mon Sep 17 00:00:00 2001 From: Sapein <5852983+Sapein@users.noreply.github.com> Date: Sun, 13 Mar 2022 00:05:24 +0000 Subject: [PATCH 001/222] linux-firmware: move MediaTek firmware Currently only some MediaTek firmware is moved. --- srcpkgs/linux-firmware/template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index 7c55a94b343c..b945833d088e 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,7 +1,7 @@ # Template file for 'linux-firmware' pkgname=linux-firmware version=20220209 -revision=1 +revision=2 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}" short_desc="Binary firmware blobs for the Linux kernel" maintainer="Érico Nogueira " @@ -94,6 +94,10 @@ linux-firmware-network_package() { vmove usr/lib/firmware/libertas vmove usr/lib/firmware/mrvl vmove "usr/lib/firmware/mt*.bin" + vmove usr/lib/firmware/mediatek + vmove usr/lib/firmware/mediatek/mt8173/vpu_d.bin + vmove usr/lib/firmware/mediatek/mt8173/vpu_p.bin + vmove usr/lib/firmware/mediatek vmove usr/lib/firmware/ueagle-atm vmove usr/lib/firmware/ti-connectivity vmove usr/lib/firmware/dpaa2 From 008a9bd98f05236d5c4a6f7aa3ec6b5db94a2186 Mon Sep 17 00:00:00 2001 From: Luke Hannan Date: Fri, 11 Mar 2022 23:17:55 +0200 Subject: [PATCH 002/222] R: update to 4.1.3. --- srcpkgs/R/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/R/template b/srcpkgs/R/template index 8190ac146535..d506d02764b0 100644 --- a/srcpkgs/R/template +++ b/srcpkgs/R/template @@ -1,7 +1,7 @@ # Template file for 'R' pkgname=R -version=4.1.2 -revision=2 +version=4.1.3 +revision=1 build_style=gnu-configure configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R --with-blas$(vopt_if openblas '=openblas') --with-lapack @@ -22,7 +22,7 @@ license="GPL-2.0-or-later" homepage="https://www.r-project.org/" changelog="https://cran.r-project.org/doc/manuals/r-release/NEWS.html" distfiles="https://cran.r-project.org/src/base/R-4/${pkgname}-${version}.tar.gz" -checksum=2036225e9f7207d4ce097e54972aecdaa8b40d7d9911cd26491fac5a0fab38af +checksum=15ff5b333c61094060b2a52e9c1d8ec55cc42dd029e39ca22abdaa909526fed6 nocross=yes shlib_provides="libR.so" make_check=extended From 4e2ea807b7fca3dd60687bbdc1df41f67d070cea Mon Sep 17 00:00:00 2001 From: TROUVERIE Joachim Date: Fri, 4 Mar 2022 17:59:30 +0100 Subject: [PATCH 003/222] notmuch: update to 0.35. --- ...mime-session-key-extraction-support-.patch | 43 +++++++------- ...mime-x509-certificate-validity-check.patch | 56 +++++++++---------- ...-gmime-verify-with-session-key-check.patch | 39 +++++++------ srcpkgs/notmuch/template | 10 ++-- 4 files changed, 72 insertions(+), 76 deletions(-) diff --git a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch index 581c6be15590..b6445729af6f 100644 --- a/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch +++ b/srcpkgs/notmuch/patches/0005-configure-drop-gmime-session-key-extraction-support-.patch @@ -17,13 +17,13 @@ Signed-off-by: Đoàn Trần Công Danh 1 file changed, 58 deletions(-) diff --git a/configure b/configure -index 7dae745c..99b0c328 100755 +index 36f3f606..1bf2097d 100755 --- a/configure +++ b/configure -@@ -467,65 +467,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then - +@@ -492,65 +492,7 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then + printf "Checking for GMime session key extraction support... " - + - cat > _check_session_keys.c < -#include @@ -54,16 +54,16 @@ index 7dae745c..99b0c328 100755 -} -EOF - if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then -- printf 'No.\nCould not make tempdir for testing session-key support.\n' -- errors=$((errors + 1)) +- printf 'No.\nCould not make tempdir for testing session-key support.\n' +- errors=$((errors + 1)) - elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \ -- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ -- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ -- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] +- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ +- && SESSION_KEY=$(GNUPGHOME=${TEMP_GPG} ./_check_session_keys) \ +- && [ $SESSION_KEY = 9:0BACD64099D1468AB07C796F0C0AC4851948A658A15B34E803865E9FC635F2F5 ] - then - printf "OK.\n" + printf "OK.\n" - else -- cat </dev/null; then -- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)" -- else -- printf 'You do not have the GPGME development libraries installed.\n' -- fi -- errors=$((errors + 1)) +- if command -v gpgme-config >/dev/null; then +- printf 'Your current GPGME development version is: %s\n' "$(gpgme-config --version)" +- else +- printf 'You do not have the GPGME development libraries installed.\n' +- fi +- errors=$((errors + 1)) - fi - if [ -n "$TEMP_GPG" -a -d "$TEMP_GPG" ]; then -- rm -rf "$TEMP_GPG" +- rm -rf "$TEMP_GPG" - fi - + # see https://github.com/jstedfast/gmime/pull/90 # should be fixed in GMime in 3.2.7, but some distros might patch --- -2.28.0.rc2.21.g5c06d60fc5 - +-- +2.35.1 diff --git a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch index 49b5b3a0795d..c7e5addc0784 100644 --- a/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch +++ b/srcpkgs/notmuch/patches/0006-configure-drop-gmime-x509-certificate-validity-check.patch @@ -11,18 +11,17 @@ The problem has been fixed with gmime 3.2.7 already. Signed-off-by: Đoàn Trần Công Danh --- - configure | 70 ------------------------------------------------------- - 1 file changed, 70 deletions(-) + configure | 69 ------------------------------------------------------- + 1 file changed, 69 deletions(-) diff --git a/configure b/configure -index 99b0c328..ef602d10 100755 +index 36f3f606..fd23aa67 100755 --- a/configure +++ b/configure -@@ -472,78 +472,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then - # see https://github.com/jstedfast/gmime/pull/90 +@@ -556,77 +556,8 @@ EOF # should be fixed in GMime in 3.2.7, but some distros might patch printf "Checking for GMime X.509 certificate validity... " -- + - cat > _check_x509_validity.c < -#include @@ -63,40 +62,39 @@ index 99b0c328..ef602d10 100755 -} -EOF - if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then -- printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n' -- errors=$((errors + 1)) +- printf 'No.\nCould not make tempdir for testing X.509 certificate validity support.\n' +- errors=$((errors + 1)) - elif ${CC} ${CFLAGS} ${gmime_cflags} _check_x509_validity.c ${gmime_ldflags} -o _check_x509_validity \ -- && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \ -- && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \ -- && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt +- && echo disable-crl-checks > "$TEMP_GPG/gpgsm.conf" \ +- && echo "4D:E0:FF:63:C0:E9:EC:01:29:11:C8:7A:EE:DA:3A:9A:7F:6E:C1:0D S" >> "$TEMP_GPG/trustlist.txt" \ +- && GNUPGHOME=${TEMP_GPG} gpgsm --batch --quiet --import < "$srcdir"/test/smime/ca.crt - then -- if GNUPGHOME=${TEMP_GPG} ./_check_x509_validity; then - gmime_x509_cert_validity=1 - printf "Yes.\n" -- else -- gmime_x509_cert_validity=0 -- printf "No.\n" -- if pkg-config --exists "gmime-3.0 >= 3.2.7"; then -- cat <= 3.2.7"; then +- cat < 1 file changed, 66 deletions(-) diff --git a/configure b/configure -index ef602d10..204d46d9 100755 +index 36f3f606..cd99bf4a 100755 --- a/configure +++ b/configure -@@ -478,74 +478,8 @@ if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then +@@ -631,74 +631,8 @@ EOF # see https://dev.gnupg.org/T3464 # there are problems verifying signatures when decrypting with session keys with GPGME 1.13.0 and 1.13.1 printf "Checking signature verification when decrypting using session keys... " @@ -67,35 +67,34 @@ index ef602d10..204d46d9 100755 -} -EOF - if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then -- printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n' -- errors=$((errors + 1)) +- printf 'No.\nCould not make tempdir for testing signature verification when decrypting with session keys.\n' +- errors=$((errors + 1)) - elif ${CC} ${CFLAGS} ${gmime_cflags} _verify_sig_with_session_key.c ${gmime_ldflags} -o _verify_sig_with_session_key \ -- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ -- && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key +- && GNUPGHOME=${TEMP_GPG} gpg --batch --quiet --import < "$srcdir"/test/gnupg-secret-key.asc \ +- && rm -f ${TEMP_GPG}/private-keys-v1.d/*.key - then -- if GNUPGHOME=${TEMP_GPG} ./_verify_sig_with_session_key; then - gmime_verify_with_session_key=1 - printf "Yes.\n" -- else -- gmime_verify_with_session_key=0 -- printf "No.\n" -- cat <=3.2.7" checkdepends="python3-pytest mdocml dtach gdb tar xz xapian-core openssl" short_desc="Thread-based email index, search, and tagging" -maintainer="Jan S. " +maintainer="Joachim T. " license="GPL-3.0-or-later" homepage="https://notmuchmail.org" distfiles="https://notmuchmail.org/releases/notmuch-${version}.tar.xz https://notmuchmail.org/releases/test-databases/database-v1.tar.xz" -checksum="8e0a7eb8ff2e6011ef48b2bf11d79b9c4bb74511cfe2987758b64898c2a2ded7 +checksum="a831c414c4f20a6cae3a580793c855102d3295080f000eb3832b77226a40ac39 4299e051b10e1fa7b33ea2862790a09ebfe96859681804e5251e130f800e69d2" skip_extraction="database-v1.tar.xz" replaces="notmuch-emacs>=0" @@ -56,7 +56,7 @@ do_check() { # we don't ship python-cffi NOTMUCH_SKIP_TESTS+=" libconfig python-cffi" if [ $(id -u) = 0 ]; then - NOTMUCH_SKIP_TESTS+=" new.36 tagging.25" + NOTMUCH_SKIP_TESTS+=" new.36 new.39 tagging.25" fi export NOTMUCH_SKIP_TESTS make test From 8beebd455d272ee1fbc54588035f8c6c9f8c9ef9 Mon Sep 17 00:00:00 2001 From: Neel Date: Sun, 19 Dec 2021 21:54:53 +0000 Subject: [PATCH 004/222] hstr: update to 2.5 --- srcpkgs/hstr/template | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/hstr/template b/srcpkgs/hstr/template index ee259a9eac03..3f2d95c854ec 100644 --- a/srcpkgs/hstr/template +++ b/srcpkgs/hstr/template @@ -1,6 +1,6 @@ # Template file for 'hstr' pkgname=hstr -version=2.3 +version=2.5 revision=1 build_style=gnu-configure hostmakedepends="automake pkg-config" @@ -11,12 +11,9 @@ license="Apache-2.0" homepage="https://github.com/dvorka/hstr" changelog="https://raw.githubusercontent.com/dvorka/hstr/master/Changelog" distfiles="https://github.com/dvorka/hstr/archive/${version}.tar.gz" -checksum=c7e7408671757b3f4be9c5a59b4e2d56e7a7b601ace2a94eb6b2b61f20ee890b +checksum=7f5933fc07d55d09d5f7f9a6fbfdfc556d8a7d8575c3890ac1e672adabd2bec4 pre_configure() { - vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h - vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr_curses.h - aclocal - automake --force-missing --add-missing - autoconf + vsed -i 's|ncursesw/curses.h|curses.h|g' src/include/hstr.h src/include/hstr_curses.h + autoreconf -fi } From 6de5de9f96af207bd0882d3dcade43dab3ad819d Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Sat, 12 Mar 2022 16:15:07 +0200 Subject: [PATCH 005/222] dbus-glib: update to 0.112. Additionally fix xlint and tests. --- srcpkgs/dbus-glib/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dbus-glib/template b/srcpkgs/dbus-glib/template index ee905b75bfe6..3da4c3010605 100644 --- a/srcpkgs/dbus-glib/template +++ b/srcpkgs/dbus-glib/template @@ -1,18 +1,19 @@ # Template file for 'dbus-glib' pkgname=dbus-glib -version=0.110 +version=0.112 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-bash-completion" hostmakedepends="pkg-config" makedepends="libglib-devel dbus-devel" depends="dbus" +checkdepends="dbus glib-devel" short_desc="GLib bindings for D-Bus" maintainer="Orphaned " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://www.freedesktop.org/wiki/Software/DBusBindings" distfiles="http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$version.tar.gz" -checksum=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825 +checksum=7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a if [ "$CROSS_BUILD" ]; then configure_args+=" --with-dbus-binding-tool=dbus-binding-tool" From 5dcafda3554bb116bc42248adbae9d2690190ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:11:18 +0700 Subject: [PATCH 006/222] mutt: no needs libidn2-devel in hostmakedepends --- srcpkgs/mutt/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template index 42039d5d78f4..7ae82f76bd8c 100644 --- a/srcpkgs/mutt/template +++ b/srcpkgs/mutt/template @@ -8,7 +8,7 @@ configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache --with-gpgme-prefix=${XBPS_CROSS_BASE}/usr --sysconfdir=/etc/$pkgname --with-gdbm=${XBPS_CROSS_BASE}/usr" conf_files="/etc/${pkgname}/Muttrc" -hostmakedepends="libidn2-devel perl pkg-config" +hostmakedepends="perl pkg-config" makedepends="gdbm-devel gpgme-devel libidn2-devel openssl-devel libsasl-devel ncurses-devel" depends="cyrus-sasl-modules mime-types" From 3cc5b79ac56e413976b993f4b42b137dd254c5b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:14:36 +0700 Subject: [PATCH 007/222] fcitx5: update to 5.0.15. --- srcpkgs/fcitx5/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5/template b/srcpkgs/fcitx5/template index 3f55cd914dc9..ffc3011295f8 100644 --- a/srcpkgs/fcitx5/template +++ b/srcpkgs/fcitx5/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5' pkgname=fcitx5 -version=5.0.14 +version=5.0.15 revision=1 build_style=cmake build_helper=qemu @@ -21,7 +21,7 @@ homepage="https://fcitx-im.org/wiki/Fcitx" _en_dict_ver=20121020 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-${version}.tar.xz https://download.fcitx-im.org/data/en_dict-${_en_dict_ver}.tar.gz" -checksum="d30658323f6620c43e306af233980b2dbd765ee2240ac7db865c00052d1c313b +checksum="343df0f278dc6db4afebc778664ee477d9bd6c011c8446e5aa89c20bb1786e41 c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb" skip_extraction=en_dict-${_en_dict_ver}.tar.gz lib32disabled=yes From b667455131df8ba84902352caca9c92fff8bdde6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:14:41 +0700 Subject: [PATCH 008/222] fcitx5-anthy: update to 5.0.10. --- srcpkgs/fcitx5-anthy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-anthy/template b/srcpkgs/fcitx5-anthy/template index 3077b0796431..f2003e8be2c6 100644 --- a/srcpkgs/fcitx5-anthy/template +++ b/srcpkgs/fcitx5-anthy/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-anthy' pkgname=fcitx5-anthy -version=5.0.9 +version=5.0.10 revision=1 build_style=cmake hostmakedepends="pkg-config gettext extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-anthy/fcitx5-anthy-${version}.tar.xz" -checksum=73f96564d003ecc4160ceb311b2416547dcdf1a7cb6996d7d00cc01dae834a44 +checksum=1dab20b65c65059f707d64cbf1cd0f98a88016161240ad514b811a161bfed7fd fcitx5-anthy-icons_package() { short_desc+=" - icons" From 2999568e05d2dc067343f0205b13c38e11a448d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:14:44 +0700 Subject: [PATCH 009/222] fcitx5-chewing: update to 5.0.10. --- srcpkgs/fcitx5-chewing/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-chewing/template b/srcpkgs/fcitx5-chewing/template index 5bdde29ffaa0..ab4df7c374dd 100644 --- a/srcpkgs/fcitx5-chewing/template +++ b/srcpkgs/fcitx5-chewing/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-chewing' pkgname=fcitx5-chewing -version=5.0.8 +version=5.0.10 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules" @@ -10,7 +10,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chewing/fcitx5-chewing-${version}.tar.xz" -checksum=993acad34d3490c1903827e6ee6de4b946419b14c970e7b02154eaba28971eba +checksum=70843186dfa571eef674dde049abf2cbf16fbc9434dfb3060986bcc92cc4dadd lib32disabled=yes fcitx5-chewing-icons_package() { From 880a49abcde0ea07b4d456d48190d1a8462eab06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:14:51 +0700 Subject: [PATCH 010/222] fcitx5-chinese-addons: update to 5.0.12. --- srcpkgs/fcitx5-chinese-addons/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template index 97e8ef4c575e..519e91a0dd44 100644 --- a/srcpkgs/fcitx5-chinese-addons/template +++ b/srcpkgs/fcitx5-chinese-addons/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-chinese-addons' pkgname=fcitx5-chinese-addons -version=5.0.11 +version=5.0.12 revision=1 build_style=cmake hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake @@ -17,7 +17,7 @@ _pystroke_version=20121124 distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/fcitx5-chinese-addons-${version}.tar.xz http://download.fcitx-im.org/data/py_table-${_pytable_version}.tar.gz http://download.fcitx-im.org/data/py_stroke-${_pystroke_version}.tar.gz" -checksum="1fdc6749e5b3e6bfd5b30921008fd037cbf2f0e10e66904b79ba02fce8f71b0a +checksum="f872c755290ca8610ebfd22e1492bde065028c6e75b59555b4a82b0377b79005 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248" skip_extraction=" From 8c9f3a27f55cd2feb56859836ea0bcf3d9e38276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:14:55 +0700 Subject: [PATCH 011/222] fcitx5-configtool: update to 5.0.12. --- srcpkgs/fcitx5-configtool/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-configtool/template b/srcpkgs/fcitx5-configtool/template index f4c554c85e48..136a79694953 100644 --- a/srcpkgs/fcitx5-configtool/template +++ b/srcpkgs/fcitx5-configtool/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-configtool' pkgname=fcitx5-configtool -version=5.0.11 +version=5.0.12 revision=1 build_style=cmake hostmakedepends="cldr-emoji-annotation pkg-config gettext doxygen @@ -17,7 +17,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-configtool/fcitx5-configtool-${version}.tar.xz" -checksum=bf005d01220343d24c488f6559675da694ec64354592451c7c38ce959dce8803 +checksum=293da52dbac987a3c4880433a4a93bf8b3b45e2ac3d77cb025f76dc859302a1b lib32disabled=yes post_install() { From 44f1208758a498e05a4cd7b4d85813f55038f68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:15:00 +0700 Subject: [PATCH 012/222] fcitx5-gtk: update to 5.0.13. --- srcpkgs/fcitx5-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template index 430209846b81..c6d4efe52f10 100644 --- a/srcpkgs/fcitx5-gtk/template +++ b/srcpkgs/fcitx5-gtk/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-gtk' pkgname=fcitx5-gtk -version=5.0.12 +version=5.0.13 revision=1 build_style=cmake build_helper=gir @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz" -checksum=5a2ca9629695fe7500e0574b6f942a0a93d386cb6a12734f506a521537d6d11d +checksum=a38053806b23c097e8fca5a6c405326c14e5e0bc26595d144553006ed90c32d4 lib32disabled=yes build_options="gir" From 8b81946e64c9a19b8b369fa947ca5b3f215b2b2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:15:04 +0700 Subject: [PATCH 013/222] fcitx5-hangul: update to 5.0.8. --- srcpkgs/fcitx5-hangul/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-hangul/template b/srcpkgs/fcitx5-hangul/template index d51f9b3a99d5..2e6dc2e0b4e8 100644 --- a/srcpkgs/fcitx5-hangul/template +++ b/srcpkgs/fcitx5-hangul/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-hangul' pkgname=fcitx5-hangul -version=5.0.7 +version=5.0.8 revision=1 build_style=cmake hostmakedepends="pkg-config gettext extra-cmake-modules" @@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-hangul/fcitx5-hangul-${version}.tar.xz" -checksum=281f44c9d024b6a9984aad0f51a3840fc3873d7e3a629aeed77025f00b08bb27 +checksum=a784d80761b16269ebe6e780aac23fb1bfb6c06e9aa03bcca442bc3a62ec6220 lib32disabled=yes fcitx5-hangul-icons_package() { From 425b0dbb27657272a59465549695aeee046b0415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:15:08 +0700 Subject: [PATCH 014/222] fcitx5-qt: update to 5.0.11. --- srcpkgs/fcitx5-qt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-qt/template b/srcpkgs/fcitx5-qt/template index d72af31d0adf..d36f9369b1cf 100644 --- a/srcpkgs/fcitx5-qt/template +++ b/srcpkgs/fcitx5-qt/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-qt' pkgname=fcitx5-qt -version=5.0.10 +version=5.0.11 revision=1 build_style=cmake configure_args="-DENABLE_QT4=OFF -DENABLE_QT5=ON -DENABLE_QT6=ON @@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later, BSD-3-Clause" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-qt/fcitx5-qt-${version}.tar.xz" -checksum=29daa4454825e316aa89b6c2610078e4cc9924e288ccd45b38e47db9df721f85 +checksum=7196798d4c6f9305c028dab30a31eb64566b9b47b1cb916518d33f3a0f053d62 lib32disabled=yes if [ "$XBPS_TARGET_NOATOMIC8" ]; then From f1e6020bc45c20a912a662de28d2f0b03559e716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:15:12 +0700 Subject: [PATCH 015/222] fcitx5-rime: update to 5.0.12. --- srcpkgs/fcitx5-rime/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-rime/template b/srcpkgs/fcitx5-rime/template index a557cec20a0f..d76a1b3f01a3 100644 --- a/srcpkgs/fcitx5-rime/template +++ b/srcpkgs/fcitx5-rime/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-rime' pkgname=fcitx5-rime -version=5.0.11 +version=5.0.12 revision=1 build_style=cmake configure_args="-DRIME_DATA_DIR=/usr/share/rime-data" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-rime/fcitx5-rime-${version}.tar.xz" -checksum=f00fd7d53bf22d7f14c66946dbd84f70d22334ad72198e2213e8f13447168cb4 +checksum=8b7e4945fc43c2815af2e2229ce71e19959ce24cdeffe92b42ae18522410eb12 lib32disabled=yes fcitx5-rime-icons_package() { From 37b9731f94365e8c002931cffb72a83ed4d2a685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:15:18 +0700 Subject: [PATCH 016/222] fcitx5-table-extra: update to 5.0.9. --- srcpkgs/fcitx5-table-extra/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-table-extra/template b/srcpkgs/fcitx5-table-extra/template index 8d2545d40a5e..0cd1610e4ad9 100644 --- a/srcpkgs/fcitx5-table-extra/template +++ b/srcpkgs/fcitx5-table-extra/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-table-extra' pkgname=fcitx5-table-extra -version=5.0.8 +version=5.0.9 revision=1 build_style=cmake hostmakedepends="gettext libime-utils extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh " license="Public Domain" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/fcitx5-table-extra-${version}.tar.xz" -checksum=9ca4ab67b65efdd1b4462f20982f54c644ae822746e5c8cb02216686024c28aa +checksum=cf791178f5871f58bf008042359ffd55e8cf11fbc4c74e77e33debe7f3ddbce4 From ab53c0c4195a8ca4a7b34c0605629698d9452594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:15:22 +0700 Subject: [PATCH 017/222] fcitx5-lua: update to 5.0.7. --- srcpkgs/fcitx5-lua/template | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/srcpkgs/fcitx5-lua/template b/srcpkgs/fcitx5-lua/template index 1952c78ae475..1c1ab31f1683 100644 --- a/srcpkgs/fcitx5-lua/template +++ b/srcpkgs/fcitx5-lua/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-lua' pkgname=fcitx5-lua -version=5.0.6 +version=5.0.7 revision=1 build_style=cmake configure_args="-DUSE_DLOPEN=No" @@ -14,16 +14,9 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.1-or-later" homepage="https://github.com/fcitx/fcitx5-lua" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-${version}.tar.xz" -checksum=bd55815df13cfee8b0ac90dab1dec0aca6b1b3943f80543b04a0cf2e8f03c8a9 +checksum=bff8e5143912b212726b2bab8cf62bbd11ca4f3837b65cb8ce94a7c56fc15f2d lib32disabled=yes -pre_build() { - mkdir -p native - $CXX_FOR_BUILD $CXXFLAGS_FOR_BUILD $LDFLAGS_FOR_BUILD \ - -o native/file2cstring src/file2cstring/file2cstring.cpp - PATH="${wrksrc}/native:$PATH" -} - fcitx5-lua-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From bb7ee5e6c67ef99df350ddb54d013be7307decea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:15:26 +0700 Subject: [PATCH 018/222] fcitx5-table-other: update to 5.0.8. --- srcpkgs/fcitx5-table-other/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-table-other/template b/srcpkgs/fcitx5-table-other/template index 00ebafb93cdb..febce6577128 100644 --- a/srcpkgs/fcitx5-table-other/template +++ b/srcpkgs/fcitx5-table-other/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-table-other' pkgname=fcitx5-table-other -version=5.0.7 +version=5.0.8 revision=1 build_style=cmake hostmakedepends="gettext libime-utils extra-cmake-modules" @@ -11,4 +11,4 @@ maintainer="Đoàn Trần Công Danh " license="GPL-3.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-table-other/fcitx5-table-other-${version}.tar.xz" -checksum=7df2445a93f2117f315a0b26d738876d205ae83d2b3e8a898ac64c3860abac70 +checksum=f741f42c72d415dccab3d1e699fa582046e4f8a64bd8d21ce6da4dc557594fac From 75a079fe85a289e90ed3cb82e72232b366b6e704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 19:15:30 +0700 Subject: [PATCH 019/222] fcitx5-unikey: update to 5.0.9. --- srcpkgs/fcitx5-unikey/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fcitx5-unikey/template b/srcpkgs/fcitx5-unikey/template index 81c35b310d5b..f054cb3b5360 100644 --- a/srcpkgs/fcitx5-unikey/template +++ b/srcpkgs/fcitx5-unikey/template @@ -1,6 +1,6 @@ # Template file for 'fcitx5-unikey' pkgname=fcitx5-unikey -version=5.0.8 +version=5.0.9 revision=1 build_style=cmake #configure_args="" @@ -16,7 +16,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://fcitx-im.org/wiki/Fcitx" distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-unikey/fcitx5-unikey-${version}.tar.xz" -checksum=7505d9f937512272baf348ba38c72bef7f27fd2df9ae5dbc99cf738c5fcef8d0 +checksum=a72d59e21ddde6ccfa5f66accd9d763ded7c8210dbb19a99435aa35b4ac7d5ed conflicts="fcitx-unikey>=0" fcitx5-unikey-macro-editor_package() { From d8dba1bb6736d1cd4a0632f858ab78c7cc439364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 20:09:35 +0700 Subject: [PATCH 020/222] libchewing: cross-compiling --- srcpkgs/libchewing-data | 1 - .../libchewing/patches/cross-compile.patch | 23 +++++++++++++++++++ srcpkgs/libchewing/template | 13 +++-------- 3 files changed, 26 insertions(+), 11 deletions(-) delete mode 120000 srcpkgs/libchewing-data create mode 100644 srcpkgs/libchewing/patches/cross-compile.patch diff --git a/srcpkgs/libchewing-data b/srcpkgs/libchewing-data deleted file mode 120000 index 5ea20a615bbb..000000000000 --- a/srcpkgs/libchewing-data +++ /dev/null @@ -1 +0,0 @@ -libchewing \ No newline at end of file diff --git a/srcpkgs/libchewing/patches/cross-compile.patch b/srcpkgs/libchewing/patches/cross-compile.patch new file mode 100644 index 000000000000..d127a83589f7 --- /dev/null +++ b/srcpkgs/libchewing/patches/cross-compile.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 07112b0..597a764 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -229,15 +229,16 @@ set_target_properties(${ALL_TOOLS} PROPERTIES + ) + + # tools command ++file(MAKE_DIRECTORY ${DATA_BIN_DIR}) + add_custom_command( + OUTPUT + ${ALL_DATA} +- COMMAND ${CMAKE_COMMAND} -E make_directory ${DATA_BIN_DIR} +- COMMAND ${CMAKE_COMMAND} -E chdir ${DATA_BIN_DIR} ${TOOLS_BIN_DIR}/init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src ++ COMMAND init_database ${DATA_SRC_DIR}/phone.cin ${DATA_SRC_DIR}/tsi.src + DEPENDS + ${ALL_TOOLS} + ${DATA_SRC_DIR}/phone.cin + ${DATA_SRC_DIR}/tsi.src ++ WORKING_DIRECTORY ${DATA_BIN_DIR} + ) + + # test diff --git a/srcpkgs/libchewing/template b/srcpkgs/libchewing/template index 7e1acca89dcc..9345a70fe6ff 100644 --- a/srcpkgs/libchewing/template +++ b/srcpkgs/libchewing/template @@ -1,18 +1,18 @@ # Template file for 'libchewing' pkgname=libchewing version=0.5.1 -revision=4 +revision=5 build_style=cmake +build_helper="qemu" hostmakedepends="texinfo" makedepends="sqlite-devel" -depends="libchewing-data-${version}_${revision}" short_desc="Intelligent phonetic (Zhuyin/Bopomofo) input method" maintainer="Robert Stancil " license="LGPL-2.1-only" homepage="http://chewing.im/" distfiles="https://github.com/chewing/libchewing/releases/download/v${version}/${pkgname}-${version}.tar.bz2" checksum=9708c63415fa6034435c0f38100e7d30d0e1bac927f67bec6dfeb3fef016172b -nocross="/builddir/libchewing-0.5.1/build/src/tools/init_database: cannot execute binary file" +replaces="libchewing-data>=0" libchewing-devel_package() { depends="libchewing>=${version}_${revision}" @@ -25,10 +25,3 @@ libchewing-devel_package() { vmove usr/share/info } } - -libchewing-data_package() { - short_desc+=" - data files" - pkg_install() { - vmove usr/share/libchewing - } -} From c9f286c50372f74f5f263d239a057bb88a2e5432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 13 Mar 2022 20:23:48 +0700 Subject: [PATCH 021/222] fcitx-chewing: need libfcitx in hostmakedepends --- srcpkgs/fcitx-chewing/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fcitx-chewing/template b/srcpkgs/fcitx-chewing/template index 8f2c9c4ce432..67d01e039272 100644 --- a/srcpkgs/fcitx-chewing/template +++ b/srcpkgs/fcitx-chewing/template @@ -3,7 +3,7 @@ pkgname=fcitx-chewing version=0.2.3 revision=2 build_style=cmake -hostmakedepends="pkg-config" +hostmakedepends="pkg-config libfcitx" makedepends="fcitx-devel libchewing-devel" depends="fcitx5-chewing-icons" short_desc="Fcitx wrapper for Chewing IM engine" From 610d54ff57f9f15933a01123091402bba529b30a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 13 Mar 2022 15:40:18 +0100 Subject: [PATCH 022/222] linux5.15: update to 5.15.28. --- srcpkgs/linux5.15/files/arm64-dotconfig | 4 ++-- srcpkgs/linux5.15/template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig index a90de90be07d..f2091f4a8972 100644 --- a/srcpkgs/linux5.15/files/arm64-dotconfig +++ b/srcpkgs/linux5.15/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.22 Kernel Configuration +# Linux/arm64 5.15.28 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -424,6 +424,7 @@ CONFIG_TRANS_TABLE=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y @@ -2643,7 +2644,6 @@ CONFIG_OF_KOBJ=y CONFIG_OF_DYNAMIC=y CONFIG_OF_ADDRESS=y CONFIG_OF_IRQ=y -CONFIG_OF_NET=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_OF_OVERLAY=y diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template index 387e8abc54dc..d314a6f8a251 100644 --- a/srcpkgs/linux5.15/template +++ b/srcpkgs/linux5.15/template @@ -1,6 +1,6 @@ # Template file for 'linux5.15' pkgname=linux5.15 -version=5.15.26 +version=5.15.28 revision=1 wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -10,7 +10,7 @@ homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz" checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8 - 5ceba1332b26e735342a76dd85a5b1b53cc4873e202e58b99a25da0cf6e20992" + 1019709aa85b87904e901aca141f8ade27b3719333be8a3e9d3b2cb0e05ad345" skip_extraction="patch-${version}.xz" python_version=3 From 0328268e79eb4b9c4fc2098f409b537261d1d201 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 13 Mar 2022 15:42:25 +0100 Subject: [PATCH 023/222] linux5.10: update to 5.10.105. --- srcpkgs/linux5.10/files/arm64-dotconfig | 3 ++- srcpkgs/linux5.10/template | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig index 5294c39d31d5..f5587464698f 100644 --- a/srcpkgs/linux5.10/files/arm64-dotconfig +++ b/srcpkgs/linux5.10/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.99 Kernel Configuration +# Linux/arm64 5.10.105 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -419,6 +419,7 @@ CONFIG_CRASH_DUMP=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template index d12ac8cfdb27..305d9822a51c 100644 --- a/srcpkgs/linux5.10/template +++ b/srcpkgs/linux5.10/template @@ -1,6 +1,6 @@ # Template file for 'linux5.10' pkgname=linux5.10 -version=5.10.103 +version=5.10.105 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=4fb8ad55e6430342e4fbc94d54e594e9be8eb6a8bea1d71eccf835948d08580a +checksum=3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85 python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. From 7c289d0e885102d859ff7cab61c21797ef3cf15d Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sat, 29 Jan 2022 14:37:43 +0100 Subject: [PATCH 024/222] praat: update to 6.2.09 --- srcpkgs/praat/template | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/srcpkgs/praat/template b/srcpkgs/praat/template index b64c721ab717..ac2777a445cc 100644 --- a/srcpkgs/praat/template +++ b/srcpkgs/praat/template @@ -1,6 +1,6 @@ # Template file for 'praat' pkgname=praat -version=6.2.04 +version=6.2.09 revision=1 create_wrksrc=yes hostmakedepends="pkg-config" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="http://www.praat.org/" changelog="http://www.fon.hum.uva.nl/praat/manual/What_s_new_.html" distfiles="https://github.com/praat/praat/archive/v${version}.tar.gz" -checksum=65c8a70d02760fdf36e04d892412441d8d338867db30d593aea1c202aa937c24 +checksum=3c38b8af267b152a3fda1af78fe8cc26a1717f70a886387e657c55746f666af1 # there are a number of pre-defined Makefiles for certain configurations # build options are used to choose which one to use among a selected few @@ -34,13 +34,11 @@ do_build() { cp makefiles/makefile.defs.linux.${_variant} ./makefile.defs sed -i -e 's/$(LIBS)/& $(LDFLAGS)/' Makefile - sed -i -e 's/CC = gcc/CC = "${CC}"/' \ - -e 's/CXX = g++/CXX = "${CXX}"/' \ - -e 's/LINK = g++/LINK = "${CXX}"/' \ - -e 's/AR = ar/AR = "${AR}"/' \ + sed -i -e 's/AR = ar/AR = "${AR}"/' \ -e 's/-O\(1\|3\)//' \ -e 's/CFLAGS =/CFLAGS +=/' \ -e 's/CXXFLAGS =/CXXFLAGS +=/' \ + -e 's/-no-pie//' \ makefile.defs if [ $XBPS_TARGET_ENDIAN == "le" ]; then From 31a5c0d98c8c4687b6f655182da4fd32b4776063 Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Mon, 3 Jan 2022 09:48:03 +0100 Subject: [PATCH 025/222] dhcpcd: update to 9.4.1. --- srcpkgs/dhcpcd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dhcpcd/template b/srcpkgs/dhcpcd/template index e651bd019067..12be60c1efcf 100644 --- a/srcpkgs/dhcpcd/template +++ b/srcpkgs/dhcpcd/template @@ -1,6 +1,6 @@ # Template file for 'dhcpcd' pkgname=dhcpcd -version=9.4.0 +version=9.4.1 revision=1 build_style=configure make_check_target=test @@ -14,7 +14,7 @@ maintainer="Cameron Nemo " license="BSD-2-Clause" homepage="https://roy.marples.name/projects/dhcpcd" distfiles="https://roy.marples.name/downloads/dhcpcd/dhcpcd-${version}.tar.xz" -checksum=41a69297f380bf15ee8f94f73154f8c2bca7157a087c0d5aca8de000ba1d4513 +checksum=819357634efed1ea5cf44ec01b24d3d3f8852fec8b4249925dcc5667c54e376c lib32disabled=yes conf_files=/etc/dhcpcd.conf From c3286ad14df2f7ba0b5aa9a85ed096f4545b19a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Fri, 11 Mar 2022 17:27:59 +0100 Subject: [PATCH 026/222] kopia: update to 0.10.6. --- srcpkgs/kopia/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kopia/template b/srcpkgs/kopia/template index e366eb0282b5..056235ef545f 100644 --- a/srcpkgs/kopia/template +++ b/srcpkgs/kopia/template @@ -1,6 +1,6 @@ # Template file for 'kopia' pkgname=kopia -version=0.10.5 +version=0.10.6 revision=1 build_style=go build_helper=qemu @@ -12,7 +12,7 @@ maintainer="Daniel Eyßer " license="Apache-2.0" homepage="https://kopia.io/" distfiles="https://github.com/kopia/kopia/archive/v${version}.tar.gz" -checksum=3d6418e6909050204078e389fe2ecb3e6080e3185378eba243c4101cc873c770 +checksum=07df866ff4a2662f503a1348fe02bb62e6cf195260217d7e1234b03ff7b27797 post_install() { for shell in bash zsh; do From 618fcec74707368db0f998d0968278ac7e45e47c Mon Sep 17 00:00:00 2001 From: skmpz Date: Sat, 12 Mar 2022 12:23:13 +0400 Subject: [PATCH 027/222] python3-curl: update to 7.45.0, adopt. --- srcpkgs/python3-curl/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template index 9bba5853691b..ea7831c2f087 100644 --- a/srcpkgs/python3-curl/template +++ b/srcpkgs/python3-curl/template @@ -1,6 +1,6 @@ # Template file for 'python3-curl' pkgname=python3-curl -version=7.44.1 +version=7.45.0 revision=1 wrksrc="pycurl-${version}" build_style=python3-module @@ -8,12 +8,12 @@ hostmakedepends="python3-devel" makedepends="openssl-devel libcurl-devel ${hostmakedepends}" depends="python3" short_desc="Python3 interface to cURL library" -maintainer="Orphaned " +maintainer="skmpz " license="LGPL-2.1-or-later, MIT" homepage="http://pycurl.io/" changelog="https://raw.githubusercontent.com/pycurl/pycurl/master/ChangeLog" distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz" -checksum=5bcef4d988b74b99653602101e17d8401338d596b9234d263c728a0c3df003e8 +checksum=5036c53c6f4106e9160d053a4baa3433a0215fb3386073e211273c56a3a95f3d pre_build() { vsed -i "/setup_args\['data_files'\] = /d" setup.py From a57957f974b00279159e5370668244defd454034 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Fri, 11 Mar 2022 20:56:32 -0500 Subject: [PATCH 028/222] procs: update to 0.12.1. --- srcpkgs/procs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/procs/template b/srcpkgs/procs/template index 309ff8c6f5c9..84e47b23614b 100644 --- a/srcpkgs/procs/template +++ b/srcpkgs/procs/template @@ -1,6 +1,6 @@ # Template file for 'procs' pkgname=procs -version=0.12.0 +version=0.12.1 revision=1 build_style=cargo build_helper=qemu @@ -10,7 +10,7 @@ license="MIT" homepage="https://github.com/dalance/procs" changelog="https://raw.githubusercontent.com/dalance/procs/master/CHANGELOG.md" distfiles="https://github.com/dalance/procs/archive/refs/tags/v${version}.tar.gz" -checksum=04dbb3ddc734a9d1305b26b546a913e3e04d556b5863212a2675d29268aebed3 +checksum=ce84e98dd85cb8d5afda871ad2ddceb4faec077d9e019469aa668a75821e4fc2 post_build() { PROCS="target/${RUST_TARGET}/release/procs" From 705c1f65d8b99bb3fb4ba72ddc582ab678e722bf Mon Sep 17 00:00:00 2001 From: anelki Date: Thu, 10 Mar 2022 11:21:59 -0600 Subject: [PATCH 029/222] Signal-Desktop: update to 5.35 --- srcpkgs/Signal-Desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Signal-Desktop/template b/srcpkgs/Signal-Desktop/template index 97cac6378e09..038af9b6e175 100644 --- a/srcpkgs/Signal-Desktop/template +++ b/srcpkgs/Signal-Desktop/template @@ -1,6 +1,6 @@ # Template file for 'Signal-Desktop' pkgname=Signal-Desktop -version=5.34.0 +version=5.35.0 revision=1 # Signal officially only supports x86_64 (also due to Electron) # discontinued Electron 32-bit support: https://www.electronjs.org/blog/linux-32bit-support @@ -14,7 +14,7 @@ maintainer="Orphaned " license="AGPL-3.0-only" homepage="https://github.com/signalapp/Signal-Desktop" distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz" -checksum=54d81b6fa1be05d60a840b9ffcf3f8fc1642863c0a5a6ec2cfa3e02ff6e9e31d +checksum=12d4766356d50f4eaff907a738860be91bf4c012fd2db62d00757078923dca67 nostrip_files="signal-desktop" post_extract() { From 13cec14c7586a92b3941bf5f65eee194082e9822 Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Fri, 11 Mar 2022 10:44:50 -0500 Subject: [PATCH 030/222] texlab: update to 3.3.2, restore cross. --- srcpkgs/texlab/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/texlab/template b/srcpkgs/texlab/template index 6e60a74ebf9f..8891cb68bf1c 100644 --- a/srcpkgs/texlab/template +++ b/srcpkgs/texlab/template @@ -1,6 +1,6 @@ # Template file for 'texlab' pkgname=texlab -version=3.3.1 +version=3.3.2 revision=1 build_style=cargo short_desc="Implementation of the Language Server Protocol for LaTeX" @@ -9,8 +9,7 @@ license="GPL-3.0-or-later" homepage="https://texlab.netlify.app/" changelog="https://raw.githubusercontent.com/latex-lsp/texlab/master/CHANGELOG.md" distfiles="https://github.com/latex-lsp/${pkgname}/archive/v${version}.tar.gz" -checksum="a39766f497dfb2cf9e370ddc430b7d275cb055b4d8a0751d718a86072747a75c" -nocross=yes # https://github.com/void-linux/void-packages/issues/34889 +checksum=380395a37ee2ece590c0db04ac4898f5f430ee37d0ab0fa0801805167fff066a if [ "$XBPS_TARGET_ENDIAN" = "be" -a "$XBPS_TARGET_WORDSIZE" = "32" ]; then broken="smartstring fails to compile" From b9be688e2eb80bc94f32464fa9891f254ebe7cae Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Fri, 11 Mar 2022 19:22:20 -0500 Subject: [PATCH 031/222] just: update to 1.1.0. --- srcpkgs/just/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/just/template b/srcpkgs/just/template index 156d04e3120d..436ea6d5d455 100644 --- a/srcpkgs/just/template +++ b/srcpkgs/just/template @@ -1,6 +1,6 @@ # Template file for 'just' pkgname=just -version=1.0.1 +version=1.1.0 revision=1 build_style=cargo short_desc="Just a command runner" @@ -9,7 +9,7 @@ license="CC0-1.0" homepage="https://github.com/casey/just" changelog="https://raw.githubusercontent.com/casey/just/master/CHANGELOG.md" distfiles="https://github.com/casey/just/archive/refs/tags/${version}.tar.gz" -checksum=261532a3b72b34a79df01bb0c4a366bcc3fd870c5706340fec260faebddb42c6 +checksum=b0eaf3c7da507be9ad8e0ce050a10459eeead72b94d50bc3261e3dcda516b03a make_check=ci-skip # test fails when run as root # Fix failing test From af60ebce2dd7afded9f511bb0e4995e8a05d0e2f Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Thu, 10 Mar 2022 17:40:25 -0600 Subject: [PATCH 032/222] kubernetes-kind: update to 0.12.0. --- srcpkgs/kubernetes-kind/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kubernetes-kind/template b/srcpkgs/kubernetes-kind/template index 810e9935e3dd..c40e1a1f98f2 100644 --- a/srcpkgs/kubernetes-kind/template +++ b/srcpkgs/kubernetes-kind/template @@ -1,6 +1,6 @@ # Template file for 'kubernetes-kind' pkgname=kubernetes-kind -version=0.11.1 +version=0.12.0 revision=1 wrksrc="kind-${version}" build_style=go @@ -11,7 +11,7 @@ maintainer="Andy Cobaugh " license="Apache-2.0" homepage="https://kind.sigs.k8s.io/" distfiles="https://github.com/kubernetes-sigs/kind/archive/v${version}.tar.gz" -checksum=95ce0e7b01c00be149e5bd777936cef3f79ba7f1f3e5872e7ed60595858a2491 +checksum=cd1d09921b3c8a0f58c6423e5706be0c6e556f0c3d2b9e62f42be59263b209bb _completions="bash zsh fish" post_build() { From 6adfc2584a57220419aa4efe804222f7df57362c Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Mon, 28 Feb 2022 20:32:26 -0600 Subject: [PATCH 033/222] gns3-server: update to 2.2.31. --- srcpkgs/gns3-server/patches/requirements.patch | 17 ++++++++++------- srcpkgs/gns3-server/template | 6 +++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch index 1c61d2dd6ae1..4cfa85b16ba2 100644 --- a/srcpkgs/gns3-server/patches/requirements.patch +++ b/srcpkgs/gns3-server/patches/requirements.patch @@ -1,18 +1,21 @@ diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt -@@ -1,9 +1,8 @@ +@@ -1,12 +1,11 @@ -jsonschema==3.2.0 +jsonschema>=3.2.0 -aiohttp==3.7.4.post0 +aiohttp>=3.7.4 aiohttp-cors==0.7.0 --aiofiles==0.7.0 -+aiofiles>=0.8.0 --Jinja2==3.0.1 -+Jinja2>=3.0.1 --sentry-sdk==1.3.1 --psutil==5.8.0 + aiofiles==0.8.0 +-Jinja2==3.0.3 ++Jinja2>=3.0.3 +-sentry-sdk==1.5.4 +-psutil==5.9.0 +psutil>=5.9.0 async-timeout==3.0.1 distro==1.6.0 + py-cpuinfo==8.0.0 +-setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 ++setuptools>=60.5.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 + setuptools==59.6.0; python_version < '3.7' # v59.7.0 dropped support for Python 3.6 diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index 1845cc2e3fcf..038457a27a3b 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,7 +1,7 @@ # Template file for 'gns3-server' pkgname=gns3-server -version=2.2.29 -revision=2 +version=2.2.31 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://gns3.com" changelog="https://raw.githubusercontent.com/GNS3/gns3-server/master/CHANGELOG" distfiles="https://github.com/GNS3/gns3-server/archive/v${version}.tar.gz" -checksum=34237771bb743ac9142569e67284123b6090f78cfd802a729e2f11b9d5d48929 +checksum=10a530866a156cea6b544be9b557f61ca0baa7e58c3064d79a1d523b70301edc # The source archive contains statically linked artifacts for x86_64 # glibc, since this is the only architecture supported by upstream, we From c6e1a646549059d6d8eb82406eae436e63822111 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Mon, 28 Feb 2022 20:32:36 -0600 Subject: [PATCH 034/222] gns3-gui: update to 2.2.31. --- srcpkgs/gns3-gui/patches/requirements.patch | 9 ++++++--- srcpkgs/gns3-gui/template | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch index d594ea77de5b..ab3d55dea830 100644 --- a/srcpkgs/gns3-gui/patches/requirements.patch +++ b/srcpkgs/gns3-gui/patches/requirements.patch @@ -1,10 +1,13 @@ diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt -@@ -1,4 +1,3 @@ +@@ -1,6 +1,5 @@ -jsonschema==3.2.0 +jsonschema>=3.2.0 --sentry-sdk==1.3.1 --psutil==5.8.0 +-sentry-sdk==1.5.4 +-psutil==5.9.0 +psutil>=5.9.0 distro==1.6.0 +-setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 ++setuptools>=60.5.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 + setuptools==59.6.0; python_version < '3.7' # v59.7.0 dropped support for Python 3.6 diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index a4d9d410e3fc..175eab41080c 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,7 +1,7 @@ # Template file for 'gns3-gui' pkgname=gns3-gui -version=2.2.29 -revision=2 +version=2.2.31 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-psutil python3-jsonschema @@ -14,7 +14,7 @@ license="GPL-3.0-or-later" homepage="https://gns3.com" changelog="https://raw.githubusercontent.com/GNS3/gns3-gui/master/CHANGELOG" distfiles="https://github.com/GNS3/${pkgname}/archive/v${version}.tar.gz" -checksum=5b9b6db1917af66d0e4bf32c41ff17d6a03a487a2a870d18b04e68e7b572bf28 +checksum=7b6f041f88a63dc44e33680ea489556abc7d96d1c3d4bb5d85dd15b15db6d036 post_install() { vinstall gns3-gui.desktop 644 usr/share/applications From 1ce791a70385dffac10693996dee381f1b040bb1 Mon Sep 17 00:00:00 2001 From: ologantr Date: Sat, 12 Mar 2022 21:24:39 +0100 Subject: [PATCH 035/222] sqlite: update to 3.38.1. --- srcpkgs/sqlite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sqlite/template b/srcpkgs/sqlite/template index 8760d30aee97..0ef5405dfa66 100644 --- a/srcpkgs/sqlite/template +++ b/srcpkgs/sqlite/template @@ -1,6 +1,6 @@ # Template file for 'sqlite' pkgname=sqlite -version=3.38.0 +version=3.38.1 revision=1 _amalgamationver=$(printf "%d%02d%02d00\n" ${version//./ }) wrksrc="sqlite-autoconf-${_amalgamationver}" @@ -13,7 +13,7 @@ license="Public Domain" homepage="https://sqlite.org/" changelog="https://www.sqlite.org/releaselog/${version//./_}.html" distfiles="${homepage}/2022/sqlite-autoconf-${_amalgamationver}.tar.gz" -checksum=1c76e25dc63d9f3935e0f406aec520a33ee77cf54ea5147dffe1fae8369eff68 +checksum=8e3a8ceb9794d968399590d2ddf9d5c044a97dd83d38b9613364a245ec8a2fc4 CFLAGS="-DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_COLUMN_METADATA \ -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE \ From e32299918690d69425e8d02c75115827388990fc Mon Sep 17 00:00:00 2001 From: Frank Steinborn Date: Sat, 26 Feb 2022 14:52:18 +0100 Subject: [PATCH 036/222] xterm: update to 372. --- srcpkgs/xterm/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/xterm/template b/srcpkgs/xterm/template index 0af0328c6f96..ed4be0755e8f 100644 --- a/srcpkgs/xterm/template +++ b/srcpkgs/xterm/template @@ -1,6 +1,6 @@ # Template file for 'xterm' pkgname=xterm -version=370 +version=372 revision=1 build_style=gnu-configure configure_args="--enable-wide-chars --enable-88-color --enable-broken-osc @@ -17,11 +17,10 @@ makedepends="libXaw-devel libXft-devel libutempter-devel libxkbfile-devel short_desc="X Terminal Emulator" maintainer="Frank Steinborn " license="MIT, X11" -homepage="http://invisible-island.net/xterm/" -changelog="http://invisible-island.net/xterm/xterm.log.html" -# using HTTP TEMPORARILY due to cert issues -distfiles="http://invisible-mirror.net/archives/xterm/xterm-${version}.tgz" -checksum=963c5d840a0f0f4c077ff284586e8b1f83f3f983dca6f74f4b361975b5388c82 +homepage="https://invisible-island.net/xterm/" +changelog="https://invisible-island.net/xterm/xterm.log.html" +distfiles="https://invisible-mirror.net/archives/xterm/xterm-${version}.tgz" +checksum=c6d08127cb2409c3a04bcae559b7025196ed770bb7bf26630abcb45d95f60ab1 post_install() { for f in {u,}xterm.desktop; do From 1552c895ff16f8529d8b03477793dd0070c9712e Mon Sep 17 00:00:00 2001 From: Roberto Ricci Date: Thu, 10 Mar 2022 12:39:11 +0100 Subject: [PATCH 037/222] fscrypt: update to 0.3.3. --- srcpkgs/fscrypt/template | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fscrypt/template b/srcpkgs/fscrypt/template index 87799d6b9c14..50849c9f7070 100644 --- a/srcpkgs/fscrypt/template +++ b/srcpkgs/fscrypt/template @@ -1,10 +1,11 @@ # Template file for 'fscrypt' pkgname=fscrypt -version=0.2.9 +version=0.3.3 revision=1 build_style=go go_import_path=github.com/google/fscrypt go_package="${go_import_path}/cmd/fscrypt" +go_ldflags="-X main.version=v${version}" hostmakedepends="m4" makedepends="pam-devel" short_desc="Tool for managing Linux filesystem encryption" @@ -12,9 +13,13 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://github.com/google/fscrypt" distfiles="https://github.com/google/fscrypt/archive/v${version}.tar.gz" -checksum=36f1166d9886548b0d72beeeffb9ca8fb5b28b63a42b369923bc3f0bea78bb3d +checksum=7485232dc4c48d8db262e0280b34b3c869e7b6f41f8ee8601ebfe04297796410 conf_files="/etc/pam.d/fscrypt" +do_check() { + make test +} + post_install() { # build and install the PAM module LDFLAGS= make PREFIX=/usr DESTDIR=${DESTDIR} install-pam @@ -22,4 +27,8 @@ post_install() { rm -rf ${DESTDIR}/usr/share/pam-configs/ # add PAM config file vinstall ${FILESDIR}/pam_config 644 etc/pam.d fscrypt + + vcompletion cmd/fscrypt/fscrypt_bash_completion bash + + vdoc README.md } From fa0f2f2c667a132ed984024d5186ebf9996bb5ef Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 8 Mar 2022 22:43:50 +0100 Subject: [PATCH 038/222] libgusb: update to 0.3.10. --- srcpkgs/libgusb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libgusb/template b/srcpkgs/libgusb/template index 0064f3f07e51..6860869a82c9 100644 --- a/srcpkgs/libgusb/template +++ b/srcpkgs/libgusb/template @@ -1,6 +1,6 @@ # Template file for 'libgusb' pkgname=libgusb -version=0.3.7 +version=0.3.10 revision=1 build_style=meson build_helper="gir" @@ -15,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://github.com/hughsie/libgusb" changelog="https://raw.githubusercontent.com/hughsie/libgusb/master/NEWS" distfiles="http://people.freedesktop.org/~hughsient/releases/${pkgname}-${version}.tar.xz" -checksum=da5f25d6873622689b3351486cbe028efc254403f646dd81225dfe8542d8c67d +checksum=0eb0b9ab0f8bba0c59631c809c37b616ef34eb3c8e000b0b9b71cf11e4931bdc # requires access to USB devices, not available on CI make_check=ci-skip From 158749f6061751d07e2c013377446c9b7993b921 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Tue, 8 Mar 2022 22:07:02 +0200 Subject: [PATCH 039/222] skalibs: update to 2.11.2.0. --- srcpkgs/skalibs/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skalibs/template b/srcpkgs/skalibs/template index 8b6b7b79227c..bac3772b161c 100644 --- a/srcpkgs/skalibs/template +++ b/srcpkgs/skalibs/template @@ -1,6 +1,6 @@ # Template file for 'skalibs' pkgname=skalibs -version=2.11.1.0 +version=2.11.2.0 revision=1 build_style=configure configure_args="--libdir=/usr/lib --enable-static --enable-shared @@ -14,7 +14,7 @@ license="ISC" homepage="https://skarnet.org/software/skalibs/" changelog="https://skarnet.org/software/skalibs/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=400180b4d5b651e4fafaf0297b933f5f863b467d357f5b36a6545cf6eb14eab9 +checksum=649cf3236fe3103f45366b6196b1bcd0457c9c17ca86f2b80007696a2baa7b77 post_install() { vlicense COPYING LICENSE From 4c554b6a2d063721eedd7fab694458d2be76378d Mon Sep 17 00:00:00 2001 From: mobinmob Date: Tue, 8 Mar 2022 22:07:08 +0200 Subject: [PATCH 040/222] execline: update to 2.8.3.0. --- srcpkgs/execline/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/execline/template b/srcpkgs/execline/template index b938a86b8018..f27c5a33e5fb 100644 --- a/srcpkgs/execline/template +++ b/srcpkgs/execline/template @@ -1,6 +1,6 @@ # Template file for 'execline' pkgname=execline -version=2.8.2.0 +version=2.8.3.0 revision=1 build_style=configure configure_args="--libdir=/usr/lib --bindir=/usr/bin @@ -14,7 +14,7 @@ license="ISC" homepage="https://skarnet.org/software/execline/" changelog="https://skarnet.org/software/execline/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=2fdf7607f306e94fe42ebe2b49872d0f654aa2297a576d5a2d8037d4d9583341 +checksum=235dbecd594c82e0523c87c2eacf04c48781b39264158f57049f1a1ff8b4ad80 CFLAGS="-fPIC" From edf498f12a247e076e0e139993ca5f437edb2956 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Tue, 8 Mar 2022 22:07:12 +0200 Subject: [PATCH 041/222] s6: update to 2.11.1.0. --- srcpkgs/s6/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6/template b/srcpkgs/s6/template index 863800141414..5812c18784b0 100644 --- a/srcpkgs/s6/template +++ b/srcpkgs/s6/template @@ -1,6 +1,6 @@ # Template file for 's6' pkgname=s6 -version=2.11.0.1 +version=2.11.1.0 revision=1 build_style=configure configure_args="--libdir=/usr/lib --bindir=/usr/bin @@ -15,7 +15,7 @@ license="ISC" homepage="http://skarnet.org/software/s6/" changelog="https://skarnet.org/software/s6/upgrade.html" distfiles="http://skarnet.org/software/s6/s6-${version}.tar.gz" -checksum=ad7f204587634eeb20ef8f7a7beb6dd63ba3080a46a3a650448ca7cc0826f90a +checksum=ae64dc2ba208ff80e4ac4792ce90dd526b42bf19c966dc7d8eb9a6870e4bc23a build_options="static" From 9b8a7138c3fe6e6c30e955811bc497cc03f310f2 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Tue, 8 Mar 2022 22:07:18 +0200 Subject: [PATCH 042/222] s6-portable-utils: update to 2.2.4.0. --- srcpkgs/s6-portable-utils/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/s6-portable-utils/template b/srcpkgs/s6-portable-utils/template index 4f775e6459e8..e7de2cf69b93 100644 --- a/srcpkgs/s6-portable-utils/template +++ b/srcpkgs/s6-portable-utils/template @@ -1,6 +1,6 @@ # Template file for 's6-portable-utils' pkgname=s6-portable-utils -version=2.2.3.4 +version=2.2.4.0 revision=1 build_style=configure configure_args="--prefix=/usr --libdir=/usr/lib --includedir=/usr/include @@ -14,7 +14,7 @@ license="ISC" homepage="https://skarnet.org/software/s6-portable-utils/" changelog="https://skarnet.org/software/s6-portable-utils/upgrade.html" distfiles="https://skarnet.org/software/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=37ba98f727a9e382bf742af32ddbd8464c226a13a0a51bef586c28d57c8ac912 +checksum=cb1eea89f0311006f0132aa45324ff96fa7756d11a5f4366c68d084839e5a56f build_options="static" From a5d99b0de11d8ce7d7d2c42c0694270aa54189fd Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 8 Mar 2022 19:33:53 +0100 Subject: [PATCH 043/222] pass-git-helper: update to 1.2.0. --- srcpkgs/pass-git-helper/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/pass-git-helper/template b/srcpkgs/pass-git-helper/template index eaf7d1f49ab0..863a14a28137 100644 --- a/srcpkgs/pass-git-helper/template +++ b/srcpkgs/pass-git-helper/template @@ -1,7 +1,7 @@ # Template file for 'pass-git-helper' pkgname=pass-git-helper -version=1.1.2 -revision=2 +version=1.2.0 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" depends="pass python3-xdg" @@ -11,4 +11,4 @@ maintainer="teldra " license="LGPL-3.0-or-later" homepage="https://github.com/languitar/pass-git-helper" distfiles="https://github.com/languitar/${pkgname}/archive/v${version}.tar.gz" -checksum=4acfb486d0873014376383167792ee2b46926386718eb2331a1b4564576a2076 +checksum=d9ab12d81e283411a65285a0030cbfef2548dc580631d2337628e57f10e463aa From c9861b824b88fbdb1f6f72817d77b7991c1dd168 Mon Sep 17 00:00:00 2001 From: teldra Date: Tue, 8 Mar 2022 19:29:11 +0100 Subject: [PATCH 044/222] py3status: update to 3.41. --- srcpkgs/py3status/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template index 092ccfbe2bd9..13a91c28109b 100644 --- a/srcpkgs/py3status/template +++ b/srcpkgs/py3status/template @@ -1,6 +1,6 @@ # Template file for 'py3status' pkgname=py3status -version=3.40 +version=3.41 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/ultrabug/py3status" changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=84885ec8a43626dcd7576b9cad029406c98675ca00ba66ff124d7607290d2b66 +checksum=9728ff6913a13087201c73f682f67afcd8dc73a71b044d6833737ee227ad5fba post_install() { vlicense LICENSE From e69ff9a43dbf306e1b6f4d064c99075ec353c8c7 Mon Sep 17 00:00:00 2001 From: teldra Date: Mon, 21 Feb 2022 10:03:27 +0100 Subject: [PATCH 045/222] openimagedenoise: update to 1.4.3. --- srcpkgs/openimagedenoise/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/openimagedenoise/template b/srcpkgs/openimagedenoise/template index 59bbde5bf3ab..15c98835c051 100644 --- a/srcpkgs/openimagedenoise/template +++ b/srcpkgs/openimagedenoise/template @@ -1,7 +1,7 @@ # Template file for 'openimagedenoise' pkgname=openimagedenoise -version=1.4.2 -revision=3 +version=1.4.3 +revision=1 archs="x86_64*" wrksrc=oidn-${version} build_style=cmake @@ -11,8 +11,9 @@ short_desc="Intel(R) Open Image Denoise library" maintainer="teldra " license="Apache-2.0" homepage="https://openimagedenoise.github.io" +changelog="https://github.com/OpenImageDenoise/oidn/blob/master/CHANGELOG.md" distfiles="https://github.com/OpenImageDenoise/oidn/releases/download/v${version}/oidn-${version}.src.tar.gz" -checksum=e70d27ce24b41364782376c1b3b4f074f77310ccfe5f8ffec4a13a347e48a0ea +checksum=3276e252297ebad67a999298d8f0c30cfb221e166b166ae5c955d88b94ad062a do_check() { build/oidnTest From dac45bac1013c212c7f12aeebd0078dac98c1b1d Mon Sep 17 00:00:00 2001 From: Animesh Sahu Date: Sun, 6 Mar 2022 16:24:32 +0530 Subject: [PATCH 046/222] touchegg: update to 2.0.13 --- srcpkgs/touchegg/patches/musl.patch | 24 ------------------- srcpkgs/touchegg/patches/no-systemd.patch | 28 ----------------------- srcpkgs/touchegg/template | 6 +++-- 3 files changed, 4 insertions(+), 54 deletions(-) delete mode 100644 srcpkgs/touchegg/patches/musl.patch delete mode 100644 srcpkgs/touchegg/patches/no-systemd.patch diff --git a/srcpkgs/touchegg/patches/musl.patch b/srcpkgs/touchegg/patches/musl.patch deleted file mode 100644 index 8504cfa2f8c0..000000000000 --- a/srcpkgs/touchegg/patches/musl.patch +++ /dev/null @@ -1,24 +0,0 @@ -From da9a3a95cfe9965ff6e15e3a0e1a98f8840a34d7 Mon Sep 17 00:00:00 2001 -From: Alexander Gehrke -Date: Tue, 25 May 2021 23:47:51 +0000 -Subject: [PATCH] Fix missing header for musl - ---- - src/utils/client-lock.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/utils/client-lock.cpp b/src/utils/client-lock.cpp -index fb1e67b..27c6c6a 100644 ---- a/src/utils/client-lock.cpp -+++ b/src/utils/client-lock.cpp -@@ -19,6 +19,7 @@ - - #include - #include -+#include - - #include - #include --- -2.31.1 - diff --git a/srcpkgs/touchegg/patches/no-systemd.patch b/srcpkgs/touchegg/patches/no-systemd.patch deleted file mode 100644 index efd2ca83347d..000000000000 --- a/srcpkgs/touchegg/patches/no-systemd.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 938167799926ad70849d8088bdef023b5e8a0700 Mon Sep 17 00:00:00 2001 -From: Alexander Gehrke -Date: Tue, 25 May 2021 20:11:29 +0000 -Subject: [PATCH] Fix CMake failing because of missing Systemd service dir - ---- - CMakeLists.txt | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dee220d..13b773f 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -76,11 +76,6 @@ include(GNUInstallDirs) - set(SYSTEM_CONFIG_FILE_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/touchegg/touchegg.conf") - target_compile_definitions(touchegg PUBLIC SYSTEM_CONFIG_FILE_PATH=\"${SYSTEM_CONFIG_FILE_PATH}\") - --# configure systemd service unit to use the right path, e.g. @CMAKE_INSTALL_BINDIR@/touchegg --configure_file(${PROJECT_SOURCE_DIR}/installation/touchegg.service.in ${PROJECT_SOURCE_DIR}/installation/touchegg.service @ONLY) --pkg_get_variable(SYSTEMD_SERVICE_DIR systemd systemdsystemunitdir) -- - install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.conf DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/touchegg) # /usr/share/touchegg/touchegg.conf --install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.service DESTINATION ${SYSTEMD_SERVICE_DIR}) - install(FILES ${PROJECT_SOURCE_DIR}/installation/touchegg.desktop DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/autostart) - install(PROGRAMS ${PROJECT_BINARY_DIR}/touchegg DESTINATION ${CMAKE_INSTALL_BINDIR}) # /usr/bin/touchegg --- -2.31.1 - diff --git a/srcpkgs/touchegg/template b/srcpkgs/touchegg/template index 538277a2c683..a8526763517f 100644 --- a/srcpkgs/touchegg/template +++ b/srcpkgs/touchegg/template @@ -1,8 +1,9 @@ # Template file for 'touchegg' pkgname=touchegg -version=2.0.9 +version=2.0.13 revision=1 build_style=cmake +configure_args="-DUSE_SYSTEMD=false" hostmakedepends="pkg-config" makedepends="eudev-libudev-devel libinput-devel pugixml-devel cairo-devel libX11-devel libXtst-devel libXrandr-devel libXi-devel glib-devel gtk+3-devel" @@ -10,8 +11,9 @@ short_desc="Multitouch gesture recognizer" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://github.com/JoseExposito/touchegg" +changelog="https://raw.githubusercontent.com/JoseExposito/touchegg/master/CHANGELOG.md" distfiles="https://github.com/JoseExposito/touchegg/archive/${version}.tar.gz" -checksum=efff0f2011078cea15f2f130d1501714f8e3f82b7e883e81eccf956ac7966d0e +checksum=f121cbfdf6725b86f8a6e6a3047c1fe26852217eda38d03de86ff10e23729d5d system_accounts="_touchegg" post_install() { From 1d41c7060bb622c3ded60ba82d0c5f2defb37b96 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 5 Mar 2022 12:39:20 +0200 Subject: [PATCH 047/222] LGOGDownloader: update to 3.9. --- srcpkgs/LGOGDownloader/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template index 208d25192c4e..6e7e5c685f83 100644 --- a/srcpkgs/LGOGDownloader/template +++ b/srcpkgs/LGOGDownloader/template @@ -1,6 +1,6 @@ # Template file for 'LGOGDownloader' pkgname=LGOGDownloader -version=3.8 +version=3.9 revision=1 wrksrc="lgogdownloader-${version}" build_style=cmake @@ -12,7 +12,7 @@ maintainer="RunningDroid " license="WTFPL" homepage="https://github.com/Sude-/lgogdownloader" distfiles="https://github.com/Sude-/lgogdownloader/archive/v${version}.tar.gz" -checksum=8e4cf5268cee76bb2addf5e7720b230b43b21d6e995d24407da9ca0fcd02df35 +checksum=4ab9fe89b47bde7744d5100663c7822de74bb161e2790baddede8146056430b1 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then From dc207ab83c28dd3578d191ccfbca233d5028806e Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sat, 5 Mar 2022 12:32:25 +0200 Subject: [PATCH 048/222] rage-player: update to 0.4.0. --- srcpkgs/rage-player/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rage-player/template b/srcpkgs/rage-player/template index c81765b0b5e5..656227dbf3ed 100644 --- a/srcpkgs/rage-player/template +++ b/srcpkgs/rage-player/template @@ -1,7 +1,7 @@ # Template file for 'rage-player' pkgname=rage-player -version=0.3.1 -revision=2 +version=0.4.0 +revision=1 wrksrc="rage-${version}" build_style=meson hostmakedepends="pkg-config efl-devel" @@ -12,7 +12,7 @@ maintainer="Orphaned " license="BSD-2-Clause" homepage="https://www.enlightenment.org/about-rage" distfiles="https://download.enlightenment.org/rel/apps/rage/rage-${version}.tar.xz" -checksum=e5c434ef415ec1dd268399c527f582baeef39a25dee52f828876bfb58698cd11 +checksum=7ce58419aa5197aa6c33f2e3f9eb9d78ff379cae863d5fa114fd1428d5a1ca0f post_install() { vlicense COPYING From 64ad208193e6a4f6620768e67e24051e00da1409 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 10 Mar 2022 23:34:45 -0800 Subject: [PATCH 049/222] gammastep: update to 2.0.8 --- srcpkgs/gammastep/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gammastep/template b/srcpkgs/gammastep/template index 1a12e16e3a97..1f24e8383904 100644 --- a/srcpkgs/gammastep/template +++ b/srcpkgs/gammastep/template @@ -1,11 +1,11 @@ # Template file for 'gammastep' pkgname=gammastep -version=2.0.7 -revision=2 +version=2.0.8 +revision=1 wrksrc="${pkgname}-v$version" build_style=gnu-configure configure_args="--enable-gui --enable-drm --enable-vidmode --enable-randr - --enable-wayland --enable-apparmor --with-systemdunitdir=no + --enable-wayland --enable-apparmor --with-systemduserunitdir=no $(vopt_enable geoclue2)" hostmakedepends=" tar automake libtool gettext-devel intltool pkg-config python3-devel wayland-devel" @@ -17,7 +17,7 @@ license="GPL-3.0-or-later" homepage="https://gitlab.com/chinstrap/gammastep" changelog="https://gitlab.com/chinstrap/gammastep/raw/master/NEWS.md" distfiles="${homepage}/-/archive/v$version/${pkgname}-v$version.tar.gz" -checksum=b3dc1d515088ef5578da009c4b70b22f9702397a6a21bbba79f1c01793a90e73 +checksum=46535cbeba2ec0e6e18a33f7c1bdec3f520230441e7cdff318d3cf612160bd76 build_options="geoclue2" build_options_default="geoclue2" From b8bebdefe0bb8d759cc4a84f2c91bdc60c9abd59 Mon Sep 17 00:00:00 2001 From: lemmi Date: Mon, 14 Mar 2022 02:36:47 +0100 Subject: [PATCH 050/222] abcm2ps: update to 8.14.13. --- srcpkgs/abcm2ps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/abcm2ps/template b/srcpkgs/abcm2ps/template index 31a97e4daec5..1199fa010fd2 100644 --- a/srcpkgs/abcm2ps/template +++ b/srcpkgs/abcm2ps/template @@ -1,6 +1,6 @@ # Template file for 'abcm2ps' pkgname=abcm2ps -version=8.14.12 +version=8.14.13 revision=1 build_style=configure hostmakedepends="pkg-config python3-docutils which" @@ -10,7 +10,7 @@ maintainer="lemmi " license="GPL-3.0-or-later" homepage="http://moinejf.free.fr/" distfiles="https://github.com/leesavide/abcm2ps/archive/v${version}.tar.gz" -checksum=f98701bc25f52e98a9283d0cef04591351b62ff8dc80fa54bb21467d60886feb +checksum=8db29e33f30fce609ddffeb641c3bfe60ae5d16c3305402157ddc88bcaaf0c5b pre_configure() { echo CC=${CC} >> custom From e7b56c67c912ad6efe53772d1e3b7bbbc6a427e8 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Wed, 23 Feb 2022 23:55:47 -0500 Subject: [PATCH 051/222] common/build-helper/rust.sh: fix cross for bindgen When using a build.rs script to dynamically generate bindgen bindings at build-time, it will run on the host, and by default bindgen will generate bindings for the host arch/libc instead of the target. To generate the bindings on cross, we need to use BINDGEN_EXTRA_CLANG_ARGS to specify the proper sysroot and include path for the target. These arguments are not used for anything other than bindgen's clang invocation. --- common/build-helper/rust.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh index 431cb5f0fd43..798083709c3e 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -23,6 +23,9 @@ if [ "$CROSS_BUILD" ]; then # innocuous flags are used here just to disable its defaults export HOST_CC="gcc" export HOST_CFLAGS="-O2" + + # Crates that use bindgen via build.rs are not cross-aware unless these are set + export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE} -I${XBPS_CROSS_BASE}/usr/include" else unset CARGO_BUILD_TARGET fi From 30335f786f21c5c35e3cd102e45a2f3a9f7e6733 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 24 Feb 2022 00:07:36 -0500 Subject: [PATCH 052/222] New package: helvum-0.3.4 --- srcpkgs/helvum/patches/i686-pipewire.patch | 24 +++++++++++ srcpkgs/helvum/template | 46 ++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 srcpkgs/helvum/patches/i686-pipewire.patch create mode 100644 srcpkgs/helvum/template diff --git a/srcpkgs/helvum/patches/i686-pipewire.patch b/srcpkgs/helvum/patches/i686-pipewire.patch new file mode 100644 index 000000000000..17f0f17f8875 --- /dev/null +++ b/srcpkgs/helvum/patches/i686-pipewire.patch @@ -0,0 +1,24 @@ +From e8703de1c76f50553cedb7a1601e5b808a227604 Mon Sep 17 00:00:00 2001 +From: "Gabor Kecskemeti (sh)" +Date: Thu, 11 Nov 2021 11:41:09 +0000 +Subject: A possible fix for issue #27 + +--- + pipewire/src/loop_.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/helvum-0.3.4/pipewire/src/loop_.rs b/helvum-0.3.4/pipewire/src/loop_.rs +index 3e0d9bd..353025f 100644 +--- a/helvum-0.3.4/pipewire/src/loop_.rs ++++ b/helvum-0.3.4/pipewire/src/loop_.rs +@@ -411,7 +411,7 @@ where + fn duration_to_timespec(duration: Duration) -> spa_sys::timespec { + spa_sys::timespec { + tv_sec: duration.as_secs().try_into().expect("Duration too long"), +- tv_nsec: duration.subsec_nanos().into(), ++ tv_nsec: duration.subsec_nanos().try_into().unwrap(), + } + } + +-- + diff --git a/srcpkgs/helvum/template b/srcpkgs/helvum/template new file mode 100644 index 000000000000..49ad2dd6013a --- /dev/null +++ b/srcpkgs/helvum/template @@ -0,0 +1,46 @@ +# Template file for 'helvum' +pkgname=helvum +version=0.3.4 +revision=1 +create_wrksrc=yes +build_wrksrc="${pkgname}-${version}" +_pipewire_rs_version=0.4.1 +build_style=cargo +build_helper=rust +hostmakedepends="pkg-config clang libclang" +makedepends="gtk4-devel pipewire-devel glib-devel" +depends="pipewire" +short_desc="GTK patchbay for pipewire" +maintainer="classabbyamp " +license="GPL-3.0-only" +homepage="https://gitlab.freedesktop.org/pipewire/helvum" +distfiles="https://gitlab.freedesktop.org/pipewire/helvum/-/archive/${version}/helvum-${version}.tar.gz + https://gitlab.freedesktop.org/pipewire/pipewire-rs/-/archive/v${_pipewire_rs_version}/pipewire-rs-v${_pipewire_rs_version}.tar.gz" +checksum="e19054f3bcd1ba234c451134fe7f4c6afee35f108c122642c1d502fc16785c02 + 7df384c2a98154ae2cea8e14693db92e269437ea60fbcdfb6adb589226d12629" + +# XXX: this should not be necessary once the next version of the pipewire crate has been released +post_extract() { + pushd $build_wrksrc + echo "[patch.crates-io]" >> Cargo.toml + for crate in pipewire pipewire-sys libspa libspa-sys; do + mv ../pipewire-rs-*/$crate $crate + echo "$crate = { path = './$crate' }" >> Cargo.toml + done + popd +} + +post_install() { + # Normally, meson would do this, but it's simpler to use the cargo build style and do this manually + # This also avoids the need for makedeps/build steps that are made unnecessary by xbps' hooks + # On update, all meson.build files should be checked for changes + _app_id='org.pipewire.Helvum' + vinstall data/icons/$_app_id.svg 644 usr/share/icons/hicolor/scalable/apps/ + vinstall data/icons/$_app_id-symbolic.svg 644 usr/share/icons/hicolor/symbolic/apps/ + + vsed -i data/$_app_id.desktop.in -e "s/@icon@/$_app_id/" + vinstall data/$_app_id.desktop.in 644 usr/share/applications/ $_app_id.desktop + + vsed -i data/$_app_id.metainfo.xml.in -e "s/@app-id@/$_app_id/" + vinstall data/$_app_id.metainfo.xml.in 644 usr/share/metainfo/ $_app_id.metainfo.xml +} From bc53b980fb08a05eb14c78b5aee5724a7bf5ac46 Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Mon, 14 Mar 2022 09:41:16 +0100 Subject: [PATCH 053/222] vale: update to 2.15.2 --- srcpkgs/vale/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vale/template b/srcpkgs/vale/template index 8675c1d9b8d9..d08391061a35 100644 --- a/srcpkgs/vale/template +++ b/srcpkgs/vale/template @@ -1,6 +1,6 @@ # Template file for 'vale' pkgname=vale -version=2.13.0 +version=2.15.2 revision=1 build_style=go go_import_path="github.com/errata-ai/vale/v2" @@ -11,7 +11,7 @@ maintainer="SolitudeSF " license="MIT" homepage="https://docs.errata.ai/vale/about/" distfiles="https://github.com/errata-ai/vale/archive/v${version}.tar.gz" -checksum=4e039ac35c874e62f3380a619041c721ed7eedc1fb70b52cc3f78e632f2eddc4 +checksum=15c79d613c181edc99a0a35bde1658b33fbd5aa49f1ac7f1029eba779bf8d4bc post_install() { vlicense LICENSE From fb79d045a29733fa5d4cca596d627545970236df Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 14 Mar 2022 12:52:21 +0100 Subject: [PATCH 054/222] weechat: update to 3.4.1. --- srcpkgs/weechat/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/weechat/template b/srcpkgs/weechat/template index a496a6412e85..c5898cbf3091 100644 --- a/srcpkgs/weechat/template +++ b/srcpkgs/weechat/template @@ -1,7 +1,7 @@ # Template file for 'weechat' pkgname=weechat -version=3.4 -revision=2 +version=3.4.1 +revision=1 build_style=cmake configure_args="-DENABLE_MAN=ON -DENABLE_PERL=ON -DENABLE_LUA=ON -DENABLE_RUBY=ON -DENABLE_SPELL=ON @@ -17,7 +17,7 @@ license="GPL-3.0-or-later" homepage="https://www.weechat.org" changelog="https://raw.githubusercontent.com/weechat/weechat/master/ChangeLog.adoc" distfiles="https://www.weechat.org/files/src/weechat-${version}.tar.xz" -checksum=7cd3dcc7029e888de49e13ebbcc3749586ff59c9d97f89f5eeb611067c7bb94c +checksum=7e088109ad5dfbcb08a9a6b1dd70ea8236093fed8a13ee9d9c98881d7b1aeae7 lib32disabled=yes subpackages="weechat-aspell weechat-devel weechat-ruby weechat-python weechat-tcl weechat-lua weechat-perl" From 0253757736e8e9e625b0df76aae21e75437eeffe Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 14 Mar 2022 12:55:55 +0100 Subject: [PATCH 055/222] ugrep: update to 3.7.5. --- srcpkgs/ugrep/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template index 1653c0b8d518..16301971cb5f 100644 --- a/srcpkgs/ugrep/template +++ b/srcpkgs/ugrep/template @@ -1,6 +1,6 @@ # Template file for 'ugrep' pkgname=ugrep -version=3.7.4 +version=3.7.5 revision=1 build_style=gnu-configure makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://github.com/Genivia/ugrep" distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz" -checksum=47505886facf738aa33019ccf22a66e98a46e81171bcb6aabf1815f97925b54f +checksum=2b237330ef92017d69ed6611b9dfb91b447d4679b9fb3704514bfd5b89a1a44d post_install() { vlicense LICENSE.txt LICENSE From e5e97ee92a94bf94df6e35fe488e117a16364f47 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 14 Mar 2022 12:55:58 +0100 Subject: [PATCH 056/222] nncp: update to 8.7.2. --- srcpkgs/nncp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nncp/template b/srcpkgs/nncp/template index e6d62ac2f55f..9dd39f4ee3af 100644 --- a/srcpkgs/nncp/template +++ b/srcpkgs/nncp/template @@ -1,6 +1,6 @@ # Template file for 'nncp' pkgname=nncp -version=8.7.1 +version=8.7.2 revision=1 build_style=go go_import_path=cypherpunks.ru/nncp @@ -9,7 +9,7 @@ maintainer="Leah Neukirchen " license="GPL-3.0-only" homepage="http://www.nncpgo.org/" distfiles="http://www.nncpgo.org/download/${pkgname}-${version}.tar.xz" -checksum=ceb4d197af5a8d9e93b749d5c0f50b53e6746a318af47b364bf5cb323d6c4ebd +checksum=a0eec9b0f33059de33f13084599805d0f4a1c8c379e925bacfe8dc94d1ddc23d do_build() { make From d9bad157e66c35bd152abf2bacbd866472c496f9 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 14 Mar 2022 15:32:20 +0100 Subject: [PATCH 057/222] zchunk: update to 1.2.1. --- srcpkgs/zchunk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zchunk/template b/srcpkgs/zchunk/template index 07c43561ec28..e8679bcbabc4 100644 --- a/srcpkgs/zchunk/template +++ b/srcpkgs/zchunk/template @@ -1,6 +1,6 @@ # Template file for 'zchunk' pkgname=zchunk -version=1.2.0 +version=1.2.1 revision=1 build_style=meson hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Duncaen " license="BSD-2-Clause" homepage="https://github.com/zchunk/zchunk" distfiles="https://github.com/zchunk/zchunk/archive/${version}.tar.gz" -checksum=8c9eca82845b656ccae5c0e9dc097cd7a6830981e2529677ce9a5617a1f50321 +checksum=9639942cf36f4f36d3b635d36d5164682249cc0240015569ac948db1584499b5 case "$XBPS_TARGET_MACHINE" in *-musl) makedepends+=" argp-standalone" From c81339c96409bb5b758f01a5858b506a90681316 Mon Sep 17 00:00:00 2001 From: Christopher Brannon Date: Mon, 14 Mar 2022 09:41:00 -0700 Subject: [PATCH 058/222] tinyssh: update to 20220305. This release contains a fix for https://github.com/janmojzis/tinyssh/issues/63 --- srcpkgs/tinyssh/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tinyssh/template b/srcpkgs/tinyssh/template index a2e1012a9c0e..05245c35db62 100644 --- a/srcpkgs/tinyssh/template +++ b/srcpkgs/tinyssh/template @@ -1,6 +1,6 @@ # Template file for 'tinyssh' pkgname=tinyssh -version=20220101 +version=20220305 revision=1 build_style=gnu-makefile make_dirs="/etc/tinyssh 0755 root root" @@ -10,7 +10,7 @@ maintainer="Christopher Brannon " license="Public Domain" homepage="https://tinyssh.org" distfiles="https://github.com/janmojzis/tinyssh/archive/${version}.tar.gz" -checksum=b68e5b8d1f72304d70b25b53dd221cdc0a25730695bf4e8e08e27ece9dcb499d +checksum=26e1f14ee865fc48c173f51efa03aeeb72c44f102a0084ff267693406bd7aebe if [ -n "${CROSS_BUILD}" ] ; then make_build_target=cross-compile From 69c5f696ff6d5e8309c7832f660bf6a1c75bae8b Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Mon, 14 Mar 2022 09:20:08 +0100 Subject: [PATCH 059/222] nbd: update to 3.24 --- srcpkgs/nbd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nbd/template b/srcpkgs/nbd/template index 79c9bdf8c315..a36cb448e89c 100644 --- a/srcpkgs/nbd/template +++ b/srcpkgs/nbd/template @@ -1,6 +1,6 @@ # Template file for 'nbd' pkgname=nbd -version=3.23 +version=3.24 revision=1 build_style=gnu-configure configure_args="--enable-syslog" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://nbd.sourceforge.io/" distfiles="${SOURCEFORGE_SITE}/nbd/nbd-${version}.tar.gz" -checksum=3c969cd9cf83dae9276f999b7ff8e31e32411c8cc751221e698861bc05b8f76c +checksum=a771022599525fd4f5c17c7b1c88696a91927c227e770425a55f67a7384441b6 system_accounts="nbd" nbd_homedir="/var/chroot" From 908d199089fac1c26f39b524568e4106aec2ce43 Mon Sep 17 00:00:00 2001 From: mhmdanas Date: Mon, 21 Feb 2022 18:48:26 +0300 Subject: [PATCH 060/222] nodejs-lts: update to 12.22.10. --- srcpkgs/nodejs-lts/template | 5 ----- 1 file changed, 5 deletions(-) diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template index 5155f8ef1489..7ef99575a323 100644 --- a/srcpkgs/nodejs-lts/template +++ b/srcpkgs/nodejs-lts/template @@ -46,11 +46,6 @@ esac CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" -post_patch() { - # XXX Drop after c-ares 1.17.3 has been released. - vsed -i -e 's:::g' src/cares_wrap.cc -} - do_configure() { local _args From 63d12fe9bad4fa66210b5fbbc683584a71f9fec3 Mon Sep 17 00:00:00 2001 From: a dinosaur Date: Fri, 11 Mar 2022 00:36:25 +1100 Subject: [PATCH 061/222] Ice: orphan package(s) --- srcpkgs/Ice/template | 2 +- srcpkgs/zeroc-mcpp/template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index f85b38df28d6..31b15fbb4d92 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -10,7 +10,7 @@ make_install_args="LANGUAGES=cpp prefix=/usr lib-suffix=" makedepends="zlib-devel bzip2-devel zeroc-mcpp db-devel expat-devel openssl-devel lmdb-devel editline-devel" short_desc="Internet Communications Engine (Ice)" -maintainer="a dinosaur " +maintainer="Orphaned " license="GPL-2.0-only, custom:ICE" homepage="https://www.zeroc.com" distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz" diff --git a/srcpkgs/zeroc-mcpp/template b/srcpkgs/zeroc-mcpp/template index db9b9cc8e12b..048d464ab2ce 100644 --- a/srcpkgs/zeroc-mcpp/template +++ b/srcpkgs/zeroc-mcpp/template @@ -7,7 +7,7 @@ build_style=gnu-makefile make_build_args="LIBDIR=lib" make_install_args="LIBDIR=lib" short_desc="Simplified fork of mcpp from ZeroC, for building ICE" -maintainer="a dinosaur " +maintainer="Orphaned " license="BSD-2-Clause" homepage="https://github.com/zeroc-ice/mcpp" distfiles="https://github.com/zeroc-ice/mcpp/archive/v${version}.tar.gz" From 523dd2b63c8338582e2476000d687eef3d7f11be Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 8 Mar 2022 14:13:24 +0100 Subject: [PATCH 062/222] nlopt: update to 2.7.1. --- srcpkgs/nlopt/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nlopt/template b/srcpkgs/nlopt/template index d43d4a4f287c..38c5ab972a87 100644 --- a/srcpkgs/nlopt/template +++ b/srcpkgs/nlopt/template @@ -1,14 +1,14 @@ # Template file for 'nlopt' pkgname=nlopt -version=2.6.2 +version=2.7.1 revision=1 build_style=cmake short_desc="FOSS library for nonlinear optimization" maintainer="Orphaned " license="MIT" -homepage="http://ab-initio.mit.edu/wiki/index.php/NLopt" +homepage="https://nlopt.readthedocs.io" distfiles="https://github.com/stevengj/nlopt/archive/v${version}.tar.gz" -checksum=cfa5981736dd60d0109c534984c4e13c615314d3584cf1c392a155bfe1a3b17e +checksum=db88232fa5cef0ff6e39943fc63ab6074208831dc0031cf1545f6ecd31ae2a1a post_install() { vlicense COPYING From 224cfcddeb827deb383a89eb88d3ec56a5cb8310 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Mon, 14 Mar 2022 21:37:11 +0100 Subject: [PATCH 063/222] slack-desktop: update to 4.24.0 Closes: #36141 [via git-merge-pr] --- srcpkgs/slack-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/slack-desktop/template b/srcpkgs/slack-desktop/template index 8750d2687f69..b90525004d6c 100644 --- a/srcpkgs/slack-desktop/template +++ b/srcpkgs/slack-desktop/template @@ -1,6 +1,6 @@ # Template file for 'slack-desktop' pkgname=slack-desktop -version=4.23.0 +version=4.24.0 revision=1 archs="x86_64" hostmakedepends="tar xz" @@ -10,7 +10,7 @@ maintainer="Diogo Leal " license="custom:Proprietary" homepage="https://slack.com/" distfiles="https://downloads.slack-edge.com/releases/linux/${version}/prod/x64/${pkgname}-${version}-amd64.deb" -checksum=3a823be14d9aaea2ef565ac6c3fc62580a10775bcc1eadcc62c3256999ea59f3 +checksum=b557d264ae68cafe383d647dfd26f366ee94315f77132f64bff8f9ef44635197 restricted=yes repository="nonfree" nopie=yes From c272834f5e4f4f29ca420e68c1d6e1ca6f575fe9 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 15 Mar 2022 14:14:22 +0100 Subject: [PATCH 064/222] python3-boto3: update to 1.21.19. --- srcpkgs/python3-boto3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-boto3/template b/srcpkgs/python3-boto3/template index dce13428ee55..b96fa86eb165 100644 --- a/srcpkgs/python3-boto3/template +++ b/srcpkgs/python3-boto3/template @@ -1,6 +1,6 @@ # Template file for 'python3-boto3' pkgname=python3-boto3 -version=1.21.8 +version=1.21.19 revision=1 wrksrc="boto3-${version}" build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/boto/boto3" distfiles="https://github.com/boto/boto3/archive/${version}.tar.gz" -checksum=00a0df9ee9ff1cca084d99004f67cdfb3ec63102b1e554077791698c4f10b4e0 +checksum=fb04acb6eb998652eb52381a580d3624490982a7b17d6080b0d78163874962b7 post_install() { vlicense LICENSE From eaec095a44474b5b8c08fd21e88735a06cc741d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ey=C3=9Fer?= Date: Mon, 14 Mar 2022 23:06:17 +0100 Subject: [PATCH 065/222] mpd: update to 0.23.6. --- srcpkgs/mpd/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template index eeb298abfa1e..b34c78c11815 100644 --- a/srcpkgs/mpd/template +++ b/srcpkgs/mpd/template @@ -1,7 +1,7 @@ # Template file for 'mpd' pkgname=mpd -version=0.23.5 -revision=2 +version=0.23.6 +revision=1 build_style=meson configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled @@ -39,7 +39,7 @@ license="GPL-2.0-or-later" homepage="https://www.musicpd.org/" changelog="https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/master/NEWS" distfiles="https://www.musicpd.org/download/mpd/${version%.*}/mpd-${version}.tar.xz" -checksum=f22c2c25093a05f4566f9cd7207cfbcd8405af67ed29a989bcf8905f80b7a299 +checksum=cbc5928ee3ee1ef7ff6a58f6ba4afaee16c07e9eb42d0107bcc098010f4f26ed LDFLAGS="-Wl,-z,stack-size=1048576" system_accounts="mpd" From 2d9cc5ec34d8e39136a8c7cf2e7c31b2c7994f34 Mon Sep 17 00:00:00 2001 From: meator Date: Mon, 25 Oct 2021 19:42:25 +0200 Subject: [PATCH 066/222] New package: qrcp-0.9.1 --- srcpkgs/qrcp/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/qrcp/template diff --git a/srcpkgs/qrcp/template b/srcpkgs/qrcp/template new file mode 100644 index 000000000000..0e690a7073be --- /dev/null +++ b/srcpkgs/qrcp/template @@ -0,0 +1,18 @@ +# Template file for 'qrcp' +pkgname=qrcp +version=0.9.1 +revision=1 +build_style=go +go_import_path=github.com/claudiodangelis/qrcp +go_ldflags="-X github.com/claudiodangelis/qrcp/version.version=${version} + -X github.com/claudiodangelis/qrcp/version.date=$(date -d@$SOURCE_DATE_EPOCH +%Y-%m-%dT%H:%M:%SZ)" +short_desc="Transfer files over wifi to mobile devices by scanning a QR code" +maintainer="meator " +license="MIT" +homepage="https://claudiodangelis.com/qrcp/" +distfiles="https://github.com/claudiodangelis/qrcp/archive/refs/tags/${version}.tar.gz" +checksum=1ee0d1b04222fb2a559d412b144a49051c3315cbc99c7ea1f281bdd4f13f07bf + +post_install() { + vlicense LICENSE +} From 0503258f7fa3e1794d31aa6a1d0191f0bea99194 Mon Sep 17 00:00:00 2001 From: lemmi Date: Mon, 14 Mar 2022 02:31:24 +0100 Subject: [PATCH 067/222] flickcurl: remove package unused since 2019 --- common/shlibs | 1 - srcpkgs/flickcurl-devel | 1 - srcpkgs/flickcurl-doc | 1 - srcpkgs/flickcurl/template | 33 ------------------------------- srcpkgs/removed-packages/template | 5 ++++- 5 files changed, 4 insertions(+), 37 deletions(-) delete mode 120000 srcpkgs/flickcurl-devel delete mode 120000 srcpkgs/flickcurl-doc delete mode 100644 srcpkgs/flickcurl/template diff --git a/common/shlibs b/common/shlibs index f26b9bab58fd..230fc6a994c0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2580,7 +2580,6 @@ libglob.so.0 libglob-1.0_1 libepub.so.0 ebook-tools-0.2.2_1 libosmgpsmap-1.0.so.1 libosmgpsmap-1.1.0_1 libtspi.so.1 trousers-0.3.14_11 -libflickcurl.so.0 flickcurl-1.26_1 libpsiconv.so.6 psiconv-0.9.9_1 libshout.so.3 libshout-2.4.1_1 libfirm.so.1.22 libfirm-1.22.0_1 diff --git a/srcpkgs/flickcurl-devel b/srcpkgs/flickcurl-devel deleted file mode 120000 index 0c0d78612042..000000000000 --- a/srcpkgs/flickcurl-devel +++ /dev/null @@ -1 +0,0 @@ -flickcurl \ No newline at end of file diff --git a/srcpkgs/flickcurl-doc b/srcpkgs/flickcurl-doc deleted file mode 120000 index 0c0d78612042..000000000000 --- a/srcpkgs/flickcurl-doc +++ /dev/null @@ -1 +0,0 @@ -flickcurl \ No newline at end of file diff --git a/srcpkgs/flickcurl/template b/srcpkgs/flickcurl/template deleted file mode 100644 index 7756752110e9..000000000000 --- a/srcpkgs/flickcurl/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template file for 'flickcurl' -pkgname=flickcurl -version=1.26 -revision=4 -build_style=gnu-configure -makedepends="libcurl-devel libxml2-devel raptor-devel" -short_desc="C library for the Flickr API" -maintainer="lemmi " -license="LGPL-2.1-or-later, GPL-2.0-or-later, Apache-2.0" -homepage="http://librdf.org/flickcurl/" -distfiles="http://download.dajobe.org/flickcurl/flickcurl-${version}.tar.gz" -checksum=ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3 - -flickcurl-doc_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - Documentation (HTML Version)" - pkg_install() { - vmove usr/share/gtk-doc - } -} - -flickcurl-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/bin/flickcurl-config - vmove usr/share/man/man1/flickcurl-config.1 - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index a7a19630a01a..6a744198712d 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=64 +revision=65 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -69,6 +69,9 @@ replaces=" electron9<=9.4.1_1 enventor<=1.0.0_2 epstopdf<=2.27_3 + flickcurl-devel<=1.26_4 + flickcurl-doc<=1.26_4 + flickcurl<=1.26_4 fontmatrix<=0.6.0.20171228_2 freshplayerplugin<=0.3.9_9 fuse-usmb<=20130204_7 From e32e29643ca7858f018eb3aac78f6ff680eee860 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 13 Mar 2022 20:51:03 -0400 Subject: [PATCH 068/222] common/build-helper/rust.sh: link to libsodium dynamically without this envvar, libsodium-sys will attempt to link to libsodium staticly, and may fail. --- common/build-helper/rust.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/build-helper/rust.sh b/common/build-helper/rust.sh index 798083709c3e..272d03f52607 100644 --- a/common/build-helper/rust.sh +++ b/common/build-helper/rust.sh @@ -44,6 +44,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1 # sodium-sys export SODIUM_LIB_DIR="${XBPS_CROSS_BASE}/usr/include" export SODIUM_INC_DIR="${XBPS_CROSS_BASE}/usr/lib" +export SODIUM_SHARED=1 # openssl-sys export OPENSSL_NO_VENDOR=1 From c911ba06c4632fa2fcc7ccd6f00c05db19ee598e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 13 Mar 2022 20:53:07 -0400 Subject: [PATCH 069/222] rdedup: update to 3.2.1. removes the need for patched/backported bindgen --- srcpkgs/rdedup/patches/bindgen-cross.patch | 12 ------------ srcpkgs/rdedup/template | 21 +++++---------------- 2 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/rdedup/patches/bindgen-cross.patch diff --git a/srcpkgs/rdedup/patches/bindgen-cross.patch b/srcpkgs/rdedup/patches/bindgen-cross.patch deleted file mode 100644 index 7eab10fd3d56..000000000000 --- a/srcpkgs/rdedup/patches/bindgen-cross.patch +++ /dev/null @@ -1,12 +0,0 @@ -patch bindgen to use BINDGEN_EXTRA_CLANG_ARGS variable to set sysroot for cross builds -https://github.com/jnbr/rust-bindgen/tree/0.37.4-clang_args - ---- a/Cargo.toml 2019-06-15 13:18:05.509893680 +0200 -+++ b/Cargo.toml 2019-06-15 13:19:48.854887006 +0200 -@@ -53,3 +53,6 @@ - slog-term = "2" - slog-async = "2" - url = "1" -+ -+[patch.crates-io] -+bindgen = {git = 'https://github.com/jnbr/rust-bindgen', rev = '4afb05213b3e7e0ec928b84ea85d9f2b99477586'} diff --git a/srcpkgs/rdedup/template b/srcpkgs/rdedup/template index c392e3c0e2fc..6bd71cacfc46 100644 --- a/srcpkgs/rdedup/template +++ b/srcpkgs/rdedup/template @@ -1,25 +1,14 @@ # Template file for 'rdedup' pkgname=rdedup -version=3.1.1 -revision=6 -wrksrc=rdedup-rdedup-v${version} +version=3.2.1 +revision=1 build_style=cargo +build_helper=rust hostmakedepends="pkg-config clang" makedepends="openssl-devel liblzma-devel libsodium-devel" short_desc="Data deduplication engine" maintainer="Orphaned " license="MPL-2.0" homepage="https://github.com/dpc/rdedup" -distfiles="https://github.com/dpc/rdedup/archive/rdedup-v${version}.tar.gz" -checksum=5e7c09c40897cd2f2635e8c213c2ff0f5c4d7ceccbd22980cd4cb0a16f3dfc28 - -if [ "$CROSS_BUILD" ]; then - export HOST_CC="$BUILD_CC" - export HOST_CFLAGS="$BUILD_CFLAGS" - export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=${XBPS_CROSS_BASE}" -fi - -pre_build() { - cargo update --package openssl-sys --precise 0.9.58 - cargo update --package openssl --precise 0.10.22 -} +distfiles="https://github.com/dpc/rdedup/archive/v${version}.tar.gz" +checksum=023b5576f30ebf75c1740dd244ac13b6ef3ad7f6d4a6ab6654e12130201eb923 From 0816f07302922d1df4ea601998d16d4445f2e9e0 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sun, 13 Mar 2022 20:54:55 -0400 Subject: [PATCH 070/222] pijul: remove unnecessary bindgen workarounds --- srcpkgs/pijul/patches/bindgen.patch | 3 +-- srcpkgs/pijul/template | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch index 2457f1434d94..04ccc8381aae 100644 --- a/srcpkgs/pijul/patches/bindgen.patch +++ b/srcpkgs/pijul/patches/bindgen.patch @@ -1,10 +1,9 @@ --- a/Cargo.toml +++ b/Cargo.toml -@@ -133,3 +133,7 @@ +@@ -133,3 +133,6 @@ version = "2.0" [target."cfg(unix)".dependencies.tokio-uds] version = "0.2" + +[patch.crates-io] -+"bindgen" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"} +"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'} diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index 40df186b9387..581d77789c9c 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -1,8 +1,9 @@ # Template file for 'pijul' pkgname=pijul version=0.12.2 -revision=4 +revision=5 build_style=cargo +build_helper=rust _sequoia_ver=0.9.0 hostmakedepends="pkg-config clang" makedepends="libsodium-devel openssl-devel nettle-devel" @@ -15,12 +16,6 @@ distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${ver checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889 71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b" -if [ "$CROSS_BUILD" ]; then - export HOST_CC="$BUILD_CC" - export HOST_CFLAGS="$BUILD_CFLAGS" - export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE" -fi - # We only want to install the binary, so don't run cargo install do_install() { vbin target/${RUST_TARGET}/release/pijul From 7f54499acb746e93493af420ddce14abbf0132cd Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 15 Mar 2022 16:19:41 +0100 Subject: [PATCH 071/222] less: use last stable release for update-check. --- srcpkgs/less/update | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/less/update b/srcpkgs/less/update index 8ccb86344234..50cae37e4fa6 100644 --- a/srcpkgs/less/update +++ b/srcpkgs/less/update @@ -1 +1,2 @@ -site="${homepage}/download.html" +site='https://greenwoodsoftware.com/less/release.txt' +pattern='\d+' From f04ad15f3dc1b61baedf171fb50001fceaf19368 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 3 Mar 2022 02:20:38 -0500 Subject: [PATCH 072/222] void-artwork: update to 20220303. Adds an svg version of the logo, a script to generate icons from it, and generated icon files for the logo (with and without the VOID text) at various sizes, which are installed to the hicolor (fallback) icon theme. The logo files are pre-generated to avoid makedep on librsvg-utils, and they are small enough and change so rarely that it is not a big deal to include them in git. The source svg is slightly different than the one on alpha.de; it has a small white border added to help with legibility on dark backgrounds. This is a follow-up to #35604 --- srcpkgs/void-artwork/files/generate-icons.sh | 29 ++++++++ .../files/icons/void-logo-128.png | Bin 0 -> 8406 bytes .../void-artwork/files/icons/void-logo-16.png | Bin 0 -> 655 bytes .../void-artwork/files/icons/void-logo-22.png | Bin 0 -> 932 bytes .../files/icons/void-logo-256.png | Bin 0 -> 18160 bytes .../void-artwork/files/icons/void-logo-32.png | Bin 0 -> 1287 bytes .../void-artwork/files/icons/void-logo-48.png | Bin 0 -> 1864 bytes .../files/icons/void-logo-512.png | Bin 0 -> 39176 bytes .../void-artwork/files/icons/void-logo-64.png | Bin 0 -> 4013 bytes .../files/icons/void-logo-notext-128.png | Bin 0 -> 5156 bytes .../files/icons/void-logo-notext-16.png | Bin 0 -> 655 bytes .../files/icons/void-logo-notext-22.png | Bin 0 -> 932 bytes .../files/icons/void-logo-notext-256.png | Bin 0 -> 10660 bytes .../files/icons/void-logo-notext-32.png | Bin 0 -> 1287 bytes .../files/icons/void-logo-notext-48.png | Bin 0 -> 1864 bytes .../files/icons/void-logo-notext-512.png | Bin 0 -> 22310 bytes .../files/icons/void-logo-notext-64.png | Bin 0 -> 2534 bytes .../files/icons/void-logo-notext.svg | 8 +++ .../void-artwork/files/icons/void-logo.svg | 19 ++++++ srcpkgs/void-artwork/files/void-logo.svg | 64 ++++++++++++++++++ srcpkgs/void-artwork/template | 13 +++- 21 files changed, 130 insertions(+), 3 deletions(-) create mode 100755 srcpkgs/void-artwork/files/generate-icons.sh create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-128.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-16.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-22.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-256.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-32.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-48.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-512.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-64.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-128.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-16.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-22.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-256.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-32.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-48.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-512.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext-64.png create mode 100644 srcpkgs/void-artwork/files/icons/void-logo-notext.svg create mode 100644 srcpkgs/void-artwork/files/icons/void-logo.svg create mode 100644 srcpkgs/void-artwork/files/void-logo.svg diff --git a/srcpkgs/void-artwork/files/generate-icons.sh b/srcpkgs/void-artwork/files/generate-icons.sh new file mode 100755 index 000000000000..6c03e973acd3 --- /dev/null +++ b/srcpkgs/void-artwork/files/generate-icons.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# regenerates the files in icons/ from void-logo.svg +# run with ./generate-icons.sh +# only needed when the logo changes + +if ! command -v rsvg-convert >/dev/null; then + echo "Please install librsvg-utils" + exit 1 +fi + +[ -d "./icons" ] && rm -r ./icons +mkdir ./icons + +RESOLUTIONS="16 22 32 48 64 128 256 512" + +for res in $RESOLUTIONS; do + # at low resolutions, the text is too small to read, so the text is left out + if [ "$res" -lt 64 ]; then + rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -i circlearcs -o ./icons/void-logo-$res.png + else + rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -o ./icons/void-logo-$res.png + fi + rsvg-convert void-logo.svg --keep-aspect-ratio --width $res -i circlearcs -o ./icons/void-logo-notext-$res.png +done + +# scalable +rsvg-convert void-logo.svg --format svg -o ./icons/void-logo.svg +rsvg-convert void-logo.svg --format svg -i circlearcs -o ./icons/void-logo-notext.svg + diff --git a/srcpkgs/void-artwork/files/icons/void-logo-128.png b/srcpkgs/void-artwork/files/icons/void-logo-128.png new file mode 100644 index 0000000000000000000000000000000000000000..adf9a1f1a647b8b71a967c35364e85972ad14534 GIT binary patch literal 8406 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 F{{h|)kP-j@ literal 0 HcmV?d00001 diff --git a/srcpkgs/void-artwork/files/icons/void-logo-16.png b/srcpkgs/void-artwork/files/icons/void-logo-16.png new file mode 100644 index 0000000000000000000000000000000000000000..1bdb5f3314c1c012d5568cc2f3c8868ccd225482 GIT binary patch literal 655 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 N44$rjF6*2UngG4xc&q>b literal 0 HcmV?d00001 diff --git a/srcpkgs/void-artwork/files/icons/void-logo-32.png b/srcpkgs/void-artwork/files/icons/void-logo-32.png new file mode 100644 index 0000000000000000000000000000000000000000..8d345a61b2669c8ece2d5e4d30754882fa7082ba GIT binary patch literal 1287 zcmV+i1^D`jP)7$R&758ZjisTL_2&gfhc0bLRH} z&~nb63wAxOz4pJ>IcJ}}|1Fe=j^iC=sZ^>?RH{^Uyb*JsqCjfRLg~%T0OL&VxIL+XMwa!S1fzgEN85UO~q7 zBg9SoA;|PtRqTh716V>Nfp!(`G-6H|G3U~n4hA$ZT#!nXC@>8u&lf^n9T%^OpYa8l zw(f;U>ip#a2b|3pZ6UHIyI4gx#H-@x3I*Qv)vgLR=eDA>0737#s(v%@%E0RS`ug-O z0qR!FUykZ5Fq1!XJ~&_ay%a}VcUv_|0vPHY6J%wqD)!pH0cu}=ZUnB|Bi9$)u{2t1 zdlR>d#FvSYDtg!wqE}rV8Lx?-F#yKRy)6H&_Hhwpf1UH}kp2dUO^Tf|IWrr`dWHs? zfN2FVwQn|-E86H0j6wAIVg?<@JIXqaca#;iZ-<$Y9ACdR|0kF-{F#~ znGLprjyk6DP~}3DC0CPIM**~Tx1AJ~wG9&+Hi(FN=VUUOm7#E`8R#3fJng3IjUrVR zpZ2}ZmOriL-IZHW-UdeXd7Ot7U7zSqY*AI;uRUk-oU;g@dU=C+(g5Rq_M)A(r>{Iz zxe$2THg*GZ69*FuYy*;$kG-6VK4Jj>7AbndT14f=0_HbFEV1$ddMxY+qcF_NhI5g# zUatL6`yfRhEE)ht+ZJYq%xR1EE+Y`|ve!a{yj(hy_ARb_NL@?$w0c!ti!^J1OFpri zzSqmeYvR4YPbK*G#2=5RyksyGtgvYRGN3^y@3DL*%M~JmnYbCpAT}_D7pPUF-)s<8hx+K5hoX$7@Mo;B7~ED3jL^} zEwPEQM%zZTZQr)Lfu}6Fx`Wp!`y@i@3b&r&-5eboO&S0Vuo}pC z1R+Hd^-fbM|9(Nlr^Npby1}W69=ky$O~9;$8%^ow%Qv4=bd6>1P?x~hbt~rA^f$z; znpqb~GX*%JqN^I7X!sTSbVSuo^BrNNOKfKYWEI)yhRn(@mc8%WCHtb*X{-(h5SgvuI#gQqxgt1Re!O xaJ`qz0_T9=L5?DN@XkTKd)r=V^PPw``~wqC*;EtrvwZ*n002ovPDHLkV1iGNSrY&N literal 0 HcmV?d00001 diff --git a/srcpkgs/void-artwork/files/icons/void-logo-48.png b/srcpkgs/void-artwork/files/icons/void-logo-48.png new file mode 100644 index 0000000000000000000000000000000000000000..d394f47213edab1f6f5cb59a2614657364428911 GIT binary patch literal 1864 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 U$3`4@F%N?Db&YkZQMVucA4q>^y8r+H literal 0 HcmV?d00001 diff --git a/srcpkgs/void-artwork/files/icons/void-logo-64.png b/srcpkgs/void-artwork/files/icons/void-logo-64.png new file mode 100644 index 0000000000000000000000000000000000000000..c20179a3185183681679210a8a068fe24274e9b1 GIT binary patch literal 4013 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 SsiesO0000=1lQ5N; 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 literal 0 HcmV?d00001 diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext-48.png b/srcpkgs/void-artwork/files/icons/void-logo-notext-48.png new file mode 100644 index 0000000000000000000000000000000000000000..d394f47213edab1f6f5cb59a2614657364428911 GIT binary patch literal 1864 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 literal 0 HcmV?d00001 diff --git a/srcpkgs/void-artwork/files/icons/void-logo-notext.svg b/srcpkgs/void-artwork/files/icons/void-logo-notext.svg new file mode 100644 index 000000000000..772d80a775fd --- /dev/null +++ b/srcpkgs/void-artwork/files/icons/void-logo-notext.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/srcpkgs/void-artwork/files/icons/void-logo.svg b/srcpkgs/void-artwork/files/icons/void-logo.svg new file mode 100644 index 000000000000..5c1130adf9aa --- /dev/null +++ b/srcpkgs/void-artwork/files/icons/void-logo.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/srcpkgs/void-artwork/files/void-logo.svg b/srcpkgs/void-artwork/files/void-logo.svg new file mode 100644 index 000000000000..35e8a7c2c2af --- /dev/null +++ b/srcpkgs/void-artwork/files/void-logo.svg @@ -0,0 +1,64 @@ + + diff --git a/srcpkgs/void-artwork/template b/srcpkgs/void-artwork/template index d02a5a0fa3b1..6685641fe4e2 100644 --- a/srcpkgs/void-artwork/template +++ b/srcpkgs/void-artwork/template @@ -1,10 +1,10 @@ # Template file for 'void-artwork' pkgname=void-artwork -version=20170517 -revision=3 +version=20220303 +revision=1 short_desc="Void Linux artwork" maintainer="Enno Boland " -license="custom:Public Domain" +license="custom:Public Domain" #no vlicense check homepage="http://www.voidlinux.org" do_install() { @@ -12,4 +12,11 @@ do_install() { vinstall ${FILESDIR}/splashwhite.png 644 usr/share/void-artwork vinstall ${FILESDIR}/void-logo.png 644 usr/share/void-artwork vinstall ${FILESDIR}/void-transparent.png 644 usr/share/void-artwork + vinstall ${FILESDIR}/void-logo.svg 644 usr/share/void-artwork + for size in 16 22 32 48 64 128 256 512; do + vinstall ${FILESDIR}/icons/void-logo-${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps void-logo.png + vinstall ${FILESDIR}/icons/void-logo-notext-${size}.png 644 usr/share/icons/hicolor/${size}x${size}/apps void-logo-notext.png + done + vinstall ${FILESDIR}/icons/void-logo.svg 644 usr/share/icons/hicolor/scalable/apps + vinstall ${FILESDIR}/icons/void-logo-notext.svg 644 usr/share/icons/hicolor/scalable/apps } From 8bd8437fc1453e5049c50b834a9f7f7dcc8669aa Mon Sep 17 00:00:00 2001 From: David Wildasin Date: Sun, 13 Feb 2022 23:05:53 -0500 Subject: [PATCH 073/222] runit-void: Standardise/improve os-release --- srcpkgs/runit-void/files/os-release | 9 +++++++-- srcpkgs/runit-void/template | 6 ++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/srcpkgs/runit-void/files/os-release b/srcpkgs/runit-void/files/os-release index 12dcabd1f3e6..e652642b5571 100644 --- a/srcpkgs/runit-void/files/os-release +++ b/srcpkgs/runit-void/files/os-release @@ -1,4 +1,9 @@ -NAME="void" +NAME="Void" ID="void" +PRETTY_NAME="Void Linux" +HOME_URL="https://voidlinux.org/" +DOCUMENTATION_URL="https://docs.voidlinux.org/" +LOGO="void-logo" +ANSI_COLOR="0;38;2;71;128;97" + DISTRIB_ID="void" -PRETTY_NAME="void" diff --git a/srcpkgs/runit-void/template b/srcpkgs/runit-void/template index 0c98cadc9e18..a0aef0484c0b 100644 --- a/srcpkgs/runit-void/template +++ b/srcpkgs/runit-void/template @@ -1,7 +1,7 @@ # Template file for 'runit-void' pkgname=runit-void version=20210314 -revision=2 +revision=3 wrksrc="void-runit-${version}" build_style=gnu-makefile short_desc="Void Linux runit scripts" @@ -32,10 +32,12 @@ post_install() { vmkdir usr/bin mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin vconf ${FILESDIR}/hostname - vconf ${FILESDIR}/os-release vconf ${FILESDIR}/locale.conf vinstall ${FILESDIR}/apparmor 644 /etc/default/ vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/ + vmkdir usr/lib + vinstall ${FILESDIR}/os-release 644 /usr/lib/ + ln -s ../usr/lib/os-release ${DESTDIR}/etc/os-release # Enable services at post-install time instead. rm -f ${DESTDIR}/etc/runit/runsvdir/current rm -rf ${DESTDIR}/etc/runit/runsvdir/default From 4eb3801ed47595c0fa1bd9e1396ee60cd10da5d8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 15 Mar 2022 09:58:36 +0100 Subject: [PATCH 074/222] gjs: ignore development versions in update-check --- srcpkgs/gjs/update | 1 + 1 file changed, 1 insertion(+) create mode 100644 srcpkgs/gjs/update diff --git a/srcpkgs/gjs/update b/srcpkgs/gjs/update new file mode 100644 index 000000000000..12132d5fa5b4 --- /dev/null +++ b/srcpkgs/gjs/update @@ -0,0 +1 @@ +pattern="gjs-[0-9]+\.[0-9]*[02468]\.[0-9]+" From 0f774b8613c519f973e3d7e04dce21b50b67e486 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 11 Mar 2022 16:07:49 +0100 Subject: [PATCH 075/222] zellij: update to 0.26.0 --- srcpkgs/zellij/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zellij/template b/srcpkgs/zellij/template index 2be522145138..e2ada810e570 100644 --- a/srcpkgs/zellij/template +++ b/srcpkgs/zellij/template @@ -1,6 +1,6 @@ # Template file for 'zellij' pkgname=zellij -version=0.25.0 +version=0.26.0 revision=1 # Dependency crate `wasmer-vm` only supports the following archs: x86_64, arm64, x86 # https://docs.wasmer.io/ecosystem/wasmer/wasmer-features#compiler-support-by-chipset @@ -14,7 +14,7 @@ license="MIT" homepage="https://zellij.dev" changelog="https://github.com/zellij-org/zellij/blob/main/CHANGELOG.md" distfiles="https://github.com/zellij-org/zellij/archive/v${version}.tar.gz" -checksum=5bd4e6a726cf32e096f9c90d7dc414e63dee0613a56f5b665f4bfc6376dcf20a +checksum=f0b0cfe7b72ce842de80d5c32cc2abe624b3286fab16f313a4e43e226e95e87b post_build() { ZELLIJ="target/${RUST_TARGET}/release/zellij" From 32d2f82b87bab06e2ee167a96deb0495f93f949e Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Rozi Date: Tue, 15 Mar 2022 01:12:19 +0700 Subject: [PATCH 076/222] Converseen: update 0.9.9.5 --- srcpkgs/Converseen/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Converseen/template b/srcpkgs/Converseen/template index b457a0b6b8fa..bb8790332271 100644 --- a/srcpkgs/Converseen/template +++ b/srcpkgs/Converseen/template @@ -1,6 +1,6 @@ # Template file for 'Converseen' pkgname=Converseen -version=0.9.9.4 +version=0.9.9.5 revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" @@ -11,4 +11,4 @@ maintainer="Justin Jagieniak " license="GPL-3.0-or-later" homepage="https://github.com/Faster3ck/Converseen" distfiles="https://github.com/Faster3ck/Converseen/archive/refs/tags/v${version}.tar.gz" -checksum=c96642b0120ba8aabe02d52210f1c8ff921d97a57851d44561b89d10bc569a88 +checksum=30d731968e61ab3fb701976f05b2f5b372e9760c05665d6183921fb94f8cfa44 From 4479beedea637c46dff0f9ed65eccc6f82641e6a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 15 Mar 2022 17:32:36 +0100 Subject: [PATCH 077/222] New package: python3-listparser-0.18 --- srcpkgs/python3-listparser/template | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 srcpkgs/python3-listparser/template diff --git a/srcpkgs/python3-listparser/template b/srcpkgs/python3-listparser/template new file mode 100644 index 000000000000..dfe7ba100839 --- /dev/null +++ b/srcpkgs/python3-listparser/template @@ -0,0 +1,14 @@ +# Template file for 'python3-listparser' +pkgname=python3-listparser +version=0.18 +revision=1 +wrksrc="listparser-$version" +build_style=python3-module +hostmakedepends="python3-setuptools" +short_desc="Parse subscription lists in Python" +maintainer="Michal Vasilek " +license="LGPL-3.0-or-later" +homepage="https://github.com/kurtmckee/listparser" +changelog="https://raw.githubusercontent.com/kurtmckee/listparser/develop/CHANGELOG.rst" +distfiles="${PYPI_SITE}/l/listparser/listparser-${version}.tar.gz" +checksum=4be0cc459b9f3d9f24726f0f448ac67ff8d4c87a7010453dca817b556bd0b841 From 1c7cb9d41a8ceaf726d0696a9174c51006882988 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sun, 3 Oct 2021 01:08:10 +0200 Subject: [PATCH 078/222] New package: gfeeds-0.16.2 --- srcpkgs/gfeeds/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/gfeeds/template diff --git a/srcpkgs/gfeeds/template b/srcpkgs/gfeeds/template new file mode 100644 index 000000000000..b6ae09f74fc5 --- /dev/null +++ b/srcpkgs/gfeeds/template @@ -0,0 +1,16 @@ +# Template file for 'gfeeds' +pkgname=gfeeds +version=0.16.2 +revision=1 +build_style=meson +hostmakedepends="pkg-config gobject-introspection glib-devel gettext" +makedepends="libglib-devel gtk+3-devel libhandy1-devel" +depends="python3-gobject python3-feedparser python3-readability-lxml + python3-listparser python3-pytz python3-dateutil python3-requests + python3-html5lib gtk+3 webkit2gtk libhandy1" +short_desc="RSS/Atom feed reader for GNOME" +maintainer="Michal Vasilek " +license="GPL-3.0-or-later" +homepage="https://gfeeds.gabmus.org/" +distfiles="https://gitlab.gnome.org/World/gfeeds/-/archive/$version/gfeeds-$version.tar.gz" +checksum=f061e89a1962a5ac544ea98239c2503af8da817ded0a5bfd8094ddf43e9dd00e From db06129980f7761a7923824108fec37b8c756a5c Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Mon, 14 Mar 2022 18:53:16 -0500 Subject: [PATCH 079/222] ghostwriter: update to 2.1.2. --- srcpkgs/ghostwriter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ghostwriter/template b/srcpkgs/ghostwriter/template index 71f5f14aad66..86e4b10c4533 100644 --- a/srcpkgs/ghostwriter/template +++ b/srcpkgs/ghostwriter/template @@ -1,6 +1,6 @@ # Template file for 'ghostwriter' pkgname=ghostwriter -version=2.1.1 +version=2.1.2 revision=1 build_style=qmake hostmakedepends="pkg-config qt5-qmake qt5-host-tools" @@ -12,7 +12,7 @@ maintainer="Andrew Benson " license="GPL-3.0-or-later" homepage="http://wereturtle.github.io/ghostwriter" distfiles="https://github.com/wereturtle/ghostwriter/archive/${version}.tar.gz" -checksum=a9add6202dc1c9bb3f591fd4ec5d70e0fbd49d55f4921dc217923debc4d02f06 +checksum=65aa523a9c3d4f4c68f2cb6f5ab600cf24c98b4f0673a622d757a8e28eab120f case "$XBPS_TARGET_MACHINE" in armv5tel*) broken="qtwebengine not built for this platform";; From bad311f12cf6da00f4a437d205549a71af31da09 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 12 Mar 2022 17:21:55 +0100 Subject: [PATCH 080/222] libhandy: fix checksum --- srcpkgs/libhandy/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template index 796cd46e7359..5a46045b7173 100644 --- a/srcpkgs/libhandy/template +++ b/srcpkgs/libhandy/template @@ -12,11 +12,11 @@ hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)" makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)" checkdepends="xvfb-run" short_desc="GTK+3 building blocks for modern adaptive applications" -maintainer="Paper " +maintainer="Michal Vasilek " license="LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/libhandy" distfiles="https://gitlab.gnome.org/GNOME/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz" -checksum=645355a009f23f254eaec7752b9489c3c2f5832397fcec75433a7e00efbfe52f +checksum=138bec94e66d15a7a19350b65845d4529bcd969ea913ab3eb438f56fe47d5d37 build_options="gir glade" desc_option_glade="Generate glade modules and catalog files" From 71b6e635db7786b8ddcbbb1222fa5ab4ddba6389 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Tue, 15 Mar 2022 14:21:19 -0500 Subject: [PATCH 081/222] melonDS: update to 0.9.4. --- srcpkgs/melonDS/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/melonDS/template b/srcpkgs/melonDS/template index 58602c65746a..9594c3b3294b 100644 --- a/srcpkgs/melonDS/template +++ b/srcpkgs/melonDS/template @@ -1,7 +1,7 @@ # Template file for 'melonDS' pkgname=melonDS -version=0.9.3 -revision=2 +version=0.9.4 +revision=1 build_style=cmake hostmakedepends="pkg-config qt5-host-tools qt5-qmake" makedepends="qt5-devel libslirp-devel SDL2-devel libepoxy-devel @@ -11,4 +11,4 @@ maintainer="Francesco Circhetta " license="GPL-3.0-or-later" homepage="http://melonds.kuribo64.net/" distfiles="https://github.com/Arisotura/melonDS/archive/${version}.tar.gz" -checksum=c50a3855c1f77f58a2b15045687dc399b845224a970fe68ff95919c939ac634f +checksum=8022c8798a723f8ffae6ffdad2e7637cf9046e88f86b55b5f9ad3fa3b2e6d398 From 4cb462ef1b32e35dcdcd87368f799cdc6e804994 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 15 Mar 2022 21:05:47 +0100 Subject: [PATCH 082/222] openssl: update to 1.1.1n. --- srcpkgs/openssl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/openssl/template b/srcpkgs/openssl/template index 06d83aa0d81d..b77267e3d098 100644 --- a/srcpkgs/openssl/template +++ b/srcpkgs/openssl/template @@ -1,6 +1,6 @@ # Template file for 'openssl' pkgname=openssl -version=1.1.1l +version=1.1.1n revision=1 bootstrap=yes build_style=configure @@ -17,7 +17,7 @@ maintainer="John " license="OpenSSL" homepage="https://www.openssl.org" distfiles="https://www.openssl.org/source/openssl-${version}.tar.gz" -checksum=0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1 +checksum=40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a conf_files="/etc/ssl/openssl.cnf" replaces="libressl>=0" From dd58a04ea065f97e608a957b543a43660dbcce9d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 14 Mar 2022 15:24:34 -0400 Subject: [PATCH 083/222] sublime-text3: replace with empty meta package --- srcpkgs/sublime-text3/INSTALL.msg | 4 ++++ srcpkgs/sublime-text3/template | 33 ++++++------------------------- 2 files changed, 10 insertions(+), 27 deletions(-) create mode 100644 srcpkgs/sublime-text3/INSTALL.msg diff --git a/srcpkgs/sublime-text3/INSTALL.msg b/srcpkgs/sublime-text3/INSTALL.msg new file mode 100644 index 000000000000..cf4c4e70a7a9 --- /dev/null +++ b/srcpkgs/sublime-text3/INSTALL.msg @@ -0,0 +1,4 @@ +sublime-text3 is replaced with the restricted sublime-text3-bin +package, due to its license that restricts redistribution. +In order to install it you have to build it with xbps-src, please see: +https://docs.voidlinux.org/xbps/repositories/restricted.html diff --git a/srcpkgs/sublime-text3/template b/srcpkgs/sublime-text3/template index c693768e6e4e..c077963863d3 100644 --- a/srcpkgs/sublime-text3/template +++ b/srcpkgs/sublime-text3/template @@ -1,36 +1,15 @@ # Template file for 'sublime-text3' pkgname=sublime-text3 version=3211 -revision=2 -depends="libpng gtk+ hicolor-icon-theme desktop-file-utils" -short_desc="Sophisticated text editor for code, markup and prose" +revision=3 +archs="i686 x86_64" +build_style=meta +short_desc="Empty meta-package for sublime-text3" maintainer="Andrea Brancaleoni " -license="custom:Proprietary" +license="custom:EULA" #no vlicense check homepage="http://www.sublimetext.com/3dev" - -if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then - distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2" - checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee -else - distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2" - checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071 -fi - repository="nonfree" -archs="i686 x86_64" -wrksrc="sublime_text_3" -nopie=yes do_install() { - vmkdir "usr/bin" - vmkdir "usr/lib/sublime_text" - cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text" - vinstall "sublime_text.desktop" 644 "usr/share/applications/" - for size in 128 16 256 32 48; do - vinstall "Icon/${size}x${size}/sublime-text.png" 644 \ - "usr/share/icons/hicolor/${size}x${size}/apps/" - done - ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3 - vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \ - -i ${DESTDIR}/usr/share/applications/sublime_text.desktop + vdoc "${XBPS_SRCPKGDIR}/${pkgname}/INSTALL.msg" README.voidlinux } From fd91e6baf3fe995c643d6177c86ceeb430dfc395 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 14 Mar 2022 15:25:10 -0400 Subject: [PATCH 084/222] New package: sublime-text3-bin-3211 replaces sublime-text3 --- srcpkgs/sublime-text3-bin/template | 55 ++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 srcpkgs/sublime-text3-bin/template diff --git a/srcpkgs/sublime-text3-bin/template b/srcpkgs/sublime-text3-bin/template new file mode 100644 index 000000000000..73d67ea9c631 --- /dev/null +++ b/srcpkgs/sublime-text3-bin/template @@ -0,0 +1,55 @@ +# Template file for 'sublime-text3-bin' +pkgname=sublime-text3-bin +version=3211 +revision=1 +archs="i686 x86_64" +wrksrc="sublime_text_3" +hostmakedepends="w3m" +depends="libpng gtk+ hicolor-icon-theme desktop-file-utils" +short_desc="Sophisticated text editor for code, markup and prose" +maintainer="Andrea Brancaleoni " +license="custom:EULA" +homepage="http://www.sublimetext.com/3dev" +_license_checksum=33929b71625d13dacf2a0a5853171b9c04058f71e2955ee660b8d0f8dda45ed1 +repository="nonfree" +restricted=yes +nopie=yes +replaces="sublime-text3>0" + +if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x64.tar.bz2" + checksum=0b3c8ca5e6df376c3c24a4b9ac2e3b391333f73b229bc6e87d0b4a5f636d74ee +else + distfiles="https://download.sublimetext.com/sublime_text_3_build_${version}_x32.tar.bz2" + checksum=480609962bbbd12128b5332c7831372b8851c13e160512730d1b0a6a835a3071 +fi + +post_extract() { + $XBPS_FETCH_CMD https://www.sublimehq.com/eula + sed -n ' + /is licensed.*not sold/p + /
    /,${ /<\/ol>/{x;p;d}; H } + $a
+ ' EULA + + filesum="$(xbps-digest EULA)" + if [ "$filesum" != "$_license_checksum" ]; then + msg_error "SHA256 mismatch for EULA:\n$filesum\n" + fi +} + + +do_install() { + vmkdir "usr/bin" + vmkdir "usr/lib/sublime_text" + cp --preserve=mode -r ./* "${DESTDIR}/usr/lib/sublime_text" + vinstall "sublime_text.desktop" 644 "usr/share/applications/" + for size in 128 16 256 32 48; do + vinstall "Icon/${size}x${size}/sublime-text.png" 644 \ + "usr/share/icons/hicolor/${size}x${size}/apps/" + done + ln -s /usr/lib/sublime_text/sublime_text ${DESTDIR}/usr/bin/subl3 + vsed -e 's:Exec=/opt/sublime_text/:Exec=/usr/lib/sublime_text/:' \ + -i ${DESTDIR}/usr/share/applications/sublime_text.desktop + vlicense EULA +} From d9f494bccfe2d69d75ef9f1d8f484b0124eb1f5b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 4 Sep 2021 23:06:20 +0200 Subject: [PATCH 085/222] New package: gtksourceview5-5.2.0 --- common/shlibs | 1 + srcpkgs/gtksourceview5-devel | 1 + srcpkgs/gtksourceview5/template | 52 +++++++++++++++++++++++++++++++++ srcpkgs/gtksourceview5/update | 3 ++ 4 files changed, 57 insertions(+) create mode 120000 srcpkgs/gtksourceview5-devel create mode 100644 srcpkgs/gtksourceview5/template create mode 100644 srcpkgs/gtksourceview5/update diff --git a/common/shlibs b/common/shlibs index 230fc6a994c0..83b5783cb026 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3497,6 +3497,7 @@ liblqr-1.so.0 liblqr-0.4.2_1 libmozjs-78.so.0 mozjs78-78.1.0_1 libebur128.so.1 libebur128-1.2.4_1 libgtksourceview-4.so.0 gtksourceview4-4.0.2_1 +libgtksourceview-5.so.0 gtksourceview5-5.2.0_1 libwx_gtk3u_propgrid-3.0.so.0 wxWidgets-gtk3-3.0.4_1 libwx_gtk3u_qa-3.0.so.0 wxWidgets-gtk3-3.0.4_1 libwx_gtk3u_core-3.0.so.0 wxWidgets-gtk3-3.0.4_1 diff --git a/srcpkgs/gtksourceview5-devel b/srcpkgs/gtksourceview5-devel new file mode 120000 index 000000000000..1aac62393079 --- /dev/null +++ b/srcpkgs/gtksourceview5-devel @@ -0,0 +1 @@ +gtksourceview5 \ No newline at end of file diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template new file mode 100644 index 000000000000..c4c7d94f51e8 --- /dev/null +++ b/srcpkgs/gtksourceview5/template @@ -0,0 +1,52 @@ +# Template file for 'gtksourceview5' +pkgname=gtksourceview5 +version=5.2.0 +revision=1 +wrksrc="gtksourceview-${version}" +build_style=meson +build_helper="gir" +configure_args="-Dintrospection=$(vopt_if gir enabled disabled) + $(vopt_bool gir vapi) $(vopt_bool gtk_doc gtk_doc)" +hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext + $(vopt_if gir vala) $(vopt_if gtk_doc gtk-doc)" +makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala) + pcre2-devel" +checkdepends="xvfb-run cantarell-fonts" +short_desc="Text widget that extends GTK4 GtkTextView widget" +maintainer="Michal Vasilek " +license="LGPL-2.1-or-later" +homepage="https://wiki.gnome.org/Projects/GtkSourceView" +changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-2/NEWS" +distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz" +checksum=c9b34fa02654f56ce22fa08827d89db4ba81631b2e6d7d31ea65d13c729430e9 + +# Package build options +build_options="gir gtk_doc" +desc_option_gtk_doc="Build API docs via gtk-doc" +build_options_default="gir" + +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi + +do_check() { + xvfb-run ninja -C build test +} + +gtksourceview5-devel_package() { + depends="${sourcepkg}>=${version}_${revision} gtk4-devel libglib-devel + libxml2-devel pcre2-devel" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi + if [ "$build_option_gir" ]; then + vmove usr/share/gir-1.0 + vmove usr/share/vala + fi + } +} diff --git a/srcpkgs/gtksourceview5/update b/srcpkgs/gtksourceview5/update new file mode 100644 index 000000000000..4617ff233267 --- /dev/null +++ b/srcpkgs/gtksourceview5/update @@ -0,0 +1,3 @@ +pkgname="gtksourceview" +pattern="$pkgname-\K5\.[0-9]*[02468]\.[0-9]*(?=)" +ignore="*.99" From a34ebc1fc3d2e42ab6b9a638f8bdff832aa09517 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 6 Dec 2021 11:07:59 +0100 Subject: [PATCH 086/222] New package: gnome-text-editor-41.1 --- srcpkgs/gnome-text-editor/template | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 srcpkgs/gnome-text-editor/template diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template new file mode 100644 index 000000000000..f1e474fca5ff --- /dev/null +++ b/srcpkgs/gnome-text-editor/template @@ -0,0 +1,16 @@ +# Template file for 'gnome-text-editor' +pkgname=gnome-text-editor +version=41.1 +revision=1 +build_style=meson +hostmakedepends="pkg-config gettext itstool glib-devel" +makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel + icu-devel libadwaita-devel pcre2-devel" +short_desc="Simple text editor" +maintainer="Michal Vasilek " +license="GPL-3.0-or-later" +homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor" +changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/blob/gnome-41/NEWS" +distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz" +checksum=619ec520d6e0905d431167024e43dce0dbf6a345f2d48693501d70dc7626f861 +make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting. From 4e9f125295576175d485097c929859b2dfe4bb16 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 12 Mar 2022 18:05:48 +0100 Subject: [PATCH 087/222] NetworkManager: update to 1.36.2. --- srcpkgs/NetworkManager/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/NetworkManager/template b/srcpkgs/NetworkManager/template index 5483f5c8b35b..5502f41159d3 100644 --- a/srcpkgs/NetworkManager/template +++ b/srcpkgs/NetworkManager/template @@ -1,6 +1,6 @@ # Template file for 'NetworkManager' pkgname=NetworkManager -version=1.34.0 +version=1.36.2 revision=1 build_style=meson build_helper="gir qemu" @@ -19,7 +19,7 @@ configure_args="-Dsystemd_journal=false -Dsuspend_resume=$(vopt_if elogind elogind upower) -Dconfig_dhcp_default=internal" hostmakedepends="gettext-devel glib-devel libxslt-devel pkg-config - intltool dbus-glib-devel jansson-devel docbook-xsl gtk-doc + intltool dbus-glib-devel docbook-xsl gtk-doc $(vopt_if gir 'vala python3-gobject')" makedepends="libuuid-devel nss-devel dbus-glib-devel libgudev-devel libnl3-devel polkit-devel ppp-devel iptables-devel libcurl-devel @@ -33,8 +33,9 @@ short_desc="Network Management daemon" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/NetworkManager" +changelog="https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/nm-1-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=819795d0899076204f5672421a58f1b1d9e393536ee87bb844b911e6243bf0bd +checksum=ab855cbe3b41832e9a3b003810e7c7313dfe19e630d29806d14d87fdd1470cab # TODO: Some tests require network namespaces to run. make_check=extended lib32disabled=yes @@ -58,6 +59,9 @@ post_patch() { -e "s|@XBPS_CROSS_BASE@|${XBPS_CROSS_BASE}|g" \ -e "s|@XBPS_TARGET_QEMU_MACHINE@|${XBPS_TARGET_QEMU_MACHINE}|" \ src/libnm-client-impl/meson.build + # https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/955 + vsed -e "s#jansson_dep.get_pkgconfig_variable('libdir')#'${XBPS_CROSS_BASE}/usr/lib'#" \ + -i meson.build fi } From 1a00cd3269f622ad61ea66b5ec6e6d463ce49565 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 15 Mar 2022 23:11:07 +0100 Subject: [PATCH 088/222] google-chrome: update to 99.0.4844.74 --- srcpkgs/google-chrome/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index f50d9caa3464..5516594f44f9 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,7 +1,7 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=99.0.4844.51 -revision=2 +version=99.0.4844.74 +revision=1 _channel=stable archs="x86_64" hostmakedepends="curl tar xz python3 python3-html2text python3-setuptools" @@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}" _licenseUrl="https://www.google.com/intl/en/chrome/terms/" distfiles="$_chromeUrl" -checksum=a19354b3f8eee069cec49cdc44bea43d7f0cbddf6a94bb49c1e221a4ee757812 +checksum=0444893153d4b3b628c6465c48e7c49f06649b101ce5ab066d59b14c363ef9f7 do_extract() { mkdir -p ${DESTDIR} From f9aab4f1d2bd95f1aaa8430ecc8255f7439237f0 Mon Sep 17 00:00:00 2001 From: Jovan Lanik Date: Tue, 8 Mar 2022 10:50:56 +0100 Subject: [PATCH 089/222] nwg-launchers: add gtk-layer-shell to makedepends This dependancy makes nwg-launchers work better under wayland compositors, by enabling layer-shell support. --- srcpkgs/nwg-launchers/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nwg-launchers/template b/srcpkgs/nwg-launchers/template index 0f394bff2582..acf5bfc58349 100644 --- a/srcpkgs/nwg-launchers/template +++ b/srcpkgs/nwg-launchers/template @@ -1,10 +1,10 @@ # Template file for 'nwg-launchers' pkgname=nwg-launchers version=0.6.3 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config" -makedepends="gtkmm-devel json-c++" +makedepends="gtkmm-devel gtk-layer-shell-devel json-c++" short_desc="GTK-based launchers for window managers" maintainer="Érico Nogueira " license="GPL-3.0-or-later" From ee985912cfecc1c89c193101c7e90a533758c907 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Tue, 22 Feb 2022 09:15:54 +0100 Subject: [PATCH 090/222] vscode: update to 1.65.2 --- .../patches/disable-crash-reporter.patch | 14 ------- srcpkgs/vscode/patches/product.patch | 9 ++-- srcpkgs/vscode/patches/ripgrep.patch | 42 +++++++++---------- srcpkgs/vscode/template | 15 ++++--- 4 files changed, 32 insertions(+), 48 deletions(-) diff --git a/srcpkgs/vscode/patches/disable-crash-reporter.patch b/srcpkgs/vscode/patches/disable-crash-reporter.patch index d91f6895969c..dac81e3341c4 100644 --- a/srcpkgs/vscode/patches/disable-crash-reporter.patch +++ b/srcpkgs/vscode/patches/disable-crash-reporter.patch @@ -13,20 +13,6 @@ So, disable it entirely. No cookies for you, Visual Studio Code team. src/vs/code/electron-main/app.ts | 2 +- 3 files changed, 1 insertion(+), 20 deletions(-) -diff --git a/src/bootstrap-fork.js b/src/bootstrap-fork.js -index f7b07e49255..576c82f23e8 100644 ---- a/src/bootstrap-fork.js -+++ b/src/bootstrap-fork.js -@@ -37,9 +37,6 @@ if (process.env['VSCODE_PARENT_PID']) { - terminateWhenParentTerminates(); - } - --// Configure Crash Reporter --configureCrashReporter(); -- - // Load AMD entry point - require('./bootstrap-amd').load(process.env['VSCODE_AMD_ENTRYPOINT']); - diff --git a/src/main.js b/src/main.js index ad838aa245e..e6319e100b9 100644 --- a/src/main.js diff --git a/srcpkgs/vscode/patches/product.patch b/srcpkgs/vscode/patches/product.patch index edeebf5d1439..a7e2b79925bf 100644 --- a/srcpkgs/vscode/patches/product.patch +++ b/srcpkgs/vscode/patches/product.patch @@ -1,19 +1,18 @@ diff --git a/product.json b/product.json -index 22e93d4b7c3..335cddd4c7c 100644 +index 9d630f23cd7..eea95dce319 100644 --- a/product.json +++ b/product.json -@@ -25,13 +25,22 @@ +@@ -27,6 +27,9 @@ "licenseFileName": "LICENSE.txt", "reportIssueUrl": "https://github.com/microsoft/vscode/issues/new", "urlProtocol": "code-oss", + "quality": "stable", + "documentationUrl": "https://github.com/microsoft/vscode-docs", + "requestFeatureUrl": "https://github.com/Microsoft/vscode/issues", - "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/c42793d0357ff9c6589cce79a847177fd42852ee/out/vs/workbench/contrib/webview/browser/pre/", + "webviewContentExternalBaseUrlTemplate": "https://{{uuid}}.vscode-webview.net/insider/93a2a2fa12dd3ae0629eec01c05a28cb60ac1c4b/out/vs/workbench/contrib/webview/browser/pre/", "extensionAllowedProposedApi": [ "ms-vscode.vscode-js-profile-flame", - "ms-vscode.vscode-js-profile-table", -+ "ms-python.python", +@@ -34,6 +37,11 @@ "GitHub.remotehub", "GitHub.remotehub-insiders" ], diff --git a/srcpkgs/vscode/patches/ripgrep.patch b/srcpkgs/vscode/patches/ripgrep.patch index 6e81145a1cb1..ff0dfc233e41 100644 --- a/srcpkgs/vscode/patches/ripgrep.patch +++ b/srcpkgs/vscode/patches/ripgrep.patch @@ -1,32 +1,32 @@ -Ping q66 if this needs updating. +Ping atk if this needs updating. This prevents vscode from fetching prebuilt ripgrep from Microsoft during build, which unbreaks build on platforms where MS deos not ship a prebuilt ripgrep. diff --git a/package.json b/package.json -index 6d1fb7cca0c..057ed39ac31 100644 +index 5d6022a2a40..f66ee44eef0 100644 --- a/package.json +++ b/package.json -@@ -83,7 +83,7 @@ - "vscode-oniguruma": "1.6.1", - "vscode-proxy-agent": "^0.11.0", - "vscode-regexpp": "^3.1.0", -- "vscode-ripgrep": "^1.12.1", -+ "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git", - "vscode-textmate": "5.5.0", - "xterm": "4.16.0-beta.2", - "xterm-addon-search": "0.9.0-beta.6", +@@ -63,7 +63,7 @@ + "@parcel/watcher": "2.0.5", + "@vscode/debugprotocol": "1.51.0", + "@vscode/iconv-lite-umd": "0.7.0", +- "@vscode/ripgrep": "^1.14.1", ++ "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git", + "@vscode/sqlite3": "4.0.12", + "@vscode/sudo-prompt": "9.3.1", + "@vscode/vscode-languagedetection": "1.0.21", diff --git a/remote/package.json b/remote/package.json -index 662ce3568ab..a79fe3764d9 100644 +index 4bc40998093..9d22d408c02 100644 --- a/remote/package.json +++ b/remote/package.json -@@ -22,7 +22,7 @@ - "vscode-oniguruma": "1.6.1", - "vscode-proxy-agent": "^0.11.0", - "vscode-regexpp": "^3.1.0", -- "vscode-ripgrep": "^1.12.1", -+ "vscode-ripgrep": "https://github.com/q66/vscode-ripgrep.git", - "vscode-textmate": "5.5.0", - "xterm": "4.16.0-beta.2", - "xterm-addon-search": "0.9.0-beta.6", +@@ -6,7 +6,7 @@ + "@microsoft/applicationinsights-web": "^2.6.4", + "@parcel/watcher": "2.0.5", + "@vscode/iconv-lite-umd": "0.7.0", +- "@vscode/ripgrep": "^1.14.1", ++ "@vscode/ripgrep": "https://github.com/atk/void-vscode-ripgrep.git", + "@vscode/vscode-languagedetection": "1.0.21", + "applicationinsights": "1.4.2", + "cookie": "^0.4.0", diff --git a/srcpkgs/vscode/template b/srcpkgs/vscode/template index 97f1a142a814..620c9a6928aa 100644 --- a/srcpkgs/vscode/template +++ b/srcpkgs/vscode/template @@ -1,17 +1,17 @@ # Template file for 'vscode' pkgname=vscode -version=1.63.2 +version=1.65.2 revision=1 -_electronver=13.6.1 -hostmakedepends="pkg-config python nodejs yarn tar git ripgrep" -makedepends="libxkbfile-devel libsecret-devel electron13" -depends="libXtst libxkbfile nss dejavu-fonts-ttf xdg-utils ripgrep electron13" +_electronver=13.6.7 +hostmakedepends="pkg-config python3 nodejs yarn tar git ripgrep" +makedepends="libxkbfile-devel libsecret-devel libxml2-devel ncurses-devel electron13" +depends="libXtst ncurses nss dejavu-fonts-ttf xdg-utils ripgrep electron13" short_desc="Microsoft Code for Linux" -maintainer="shizonic " +maintainer="shizonic , Alex Lohr " license="MIT" homepage="https://code.visualstudio.com/" distfiles="https://github.com/Microsoft/vscode/archive/${version}.tar.gz" -checksum=21fc9bc17ba4cf480b1e006f298363d86215c339c480f8d781cabcfedad2d624 +checksum=bd59713f001c06b7f0eb5573dd9c020fc98328880e24e2a4281c57d1028ab06e nocross=yes # x64 build does not cut it, it contains native code if [ "$XBPS_TARGET_WORDSIZE" = "32" ]; then @@ -61,7 +61,6 @@ do_install() { ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.desktop ${DESTDIR}/usr/share/applications/code-oss.desktop vmkdir usr/share/pixmaps ln -sf /usr/lib/code-oss/resources/app/resources/linux/code.png ${DESTDIR}/usr/share/pixmaps/code-oss.png - ln -sf /usr/bin/rg ${DESTDIR}/usr/lib/code-oss/resources/app/node_modules.asar.unpacked/vscode-ripgrep/bin/rg vsed \ -e "s|ELECTRON=.*|ELECTRON=/usr/lib/electron${_electronver%%.*}/electron|g" \ -e 's|"$CLI"|"$CLI" --app="${VSCODE_PATH}/resources/app"|g' \ From 66a15be0f9e7acba7df49d7d5625427de5a201c0 Mon Sep 17 00:00:00 2001 From: teldra Date: Mon, 21 Feb 2022 09:40:04 +0100 Subject: [PATCH 091/222] geonkick: update to 2.9.0. --- srcpkgs/geonkick/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/geonkick/template b/srcpkgs/geonkick/template index 79f8ba451959..af8ea0fa8190 100644 --- a/srcpkgs/geonkick/template +++ b/srcpkgs/geonkick/template @@ -1,6 +1,6 @@ # Template file for 'geonkick' pkgname=geonkick -version=2.8.1 +version=2.9.0 revision=1 build_style=cmake hostmakedepends="pkg-config tar xz" @@ -10,9 +10,9 @@ short_desc="Free software percussion synthesizer" maintainer="teldra " license="GPL-3.0-or-later" homepage="https://github.com/free-sm/geonkick" -changelog="https://github.com/free-sm/geonkick/blob/main/NEWS.md" +changelog="https://raw.githubusercontent.com/free-sm/geonkick/main/NEWS.md" distfiles="https://github.com/free-sm/geonkick/archive/refs/tags/v${version}.tar.gz" -checksum=813fb10709136ed79403c8baf3d847fce9fbf717fea3c194ad2952e0172e6d45 +checksum=54968894e3fab1ad1b7a92e12cdb5041ca39a22842c8e815a443f50cbcc4dc5b if [ ${CROSS_BUILD} ]; then configure_args+=" -DGKICK_ARCHITECTURE=$XBPS_TARGET_MACHINE" From f029644de4a23fb8046da91855cb49507de992f7 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 16 Mar 2022 14:55:31 +0100 Subject: [PATCH 092/222] libtls: update to 3.4.3. --- srcpkgs/libtls/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libtls/template b/srcpkgs/libtls/template index 42f33db208a6..f8217c020c65 100644 --- a/srcpkgs/libtls/template +++ b/srcpkgs/libtls/template @@ -1,6 +1,6 @@ # Template file for 'libtls' pkgname=libtls -version=3.4.2 +version=3.4.3 revision=1 wrksrc="libressl-${version}" build_style=gnu-configure @@ -13,7 +13,7 @@ license="OpenSSL, ISC" homepage="http://www.libressl.org/" changelog="https://raw.githubusercontent.com/libressl-portable/portable/master/ChangeLog" distfiles="http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${version}.tar.gz" -checksum=cb82ca7d547336917352fbd23db2fc483c6c44d35157b32780214ec74197b3ce +checksum=ff88bffe354818b3ccf545e3cafe454c5031c7a77217074f533271d63c37f08d _lssl_asm_ver="1.2.0" replaces="libtls20>0" From 1c97521345b3519398e1878e5cf456002c981eb2 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Wed, 16 Mar 2022 18:34:42 +0100 Subject: [PATCH 093/222] flatpak: update to 1.12.7. --- srcpkgs/flatpak/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/flatpak/template b/srcpkgs/flatpak/template index 2682c5ce96c8..7820788874be 100644 --- a/srcpkgs/flatpak/template +++ b/srcpkgs/flatpak/template @@ -1,6 +1,6 @@ # Template file for 'flatpak' pkgname=flatpak -version=1.12.6 +version=1.12.7 revision=1 build_style=gnu-configure build_helper="gir" @@ -23,7 +23,7 @@ license="LGPL-2.1-or-later" homepage="https://flatpak.org/" changelog="https://github.com/flatpak/flatpak/raw/main/NEWS" distfiles="https://github.com/flatpak/flatpak/releases/download/${version}/flatpak-${version}.tar.xz" -checksum=ef02cb505b91cce5173099b5485768eef1899ebcf39edf827c4254163a811627 +checksum=6db52a531ce278282ac7ebfb99f66a0bb3eccaf44e864844c2c95c1ee5ba9316 build_options="gir" build_options_default="gir" From aaa20f83655e0cd83e4a94a05ca7113bdd7a3532 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:51:15 +0100 Subject: [PATCH 094/222] tali: update to 40.5. --- srcpkgs/tali/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template index bfd640177d27..3e50e64f96fc 100644 --- a/srcpkgs/tali/template +++ b/srcpkgs/tali/template @@ -1,14 +1,13 @@ # Template file for 'tali' pkgname=tali -version=3.38.3 +version=40.5 revision=1 build_style=meson -hostmakedepends="cmake pkg-config gettext glib-devel appstream-glib - desktop-file-utils itstool" +hostmakedepends="pkg-config gettext glib-devel itstool" makedepends="gtk+3-devel libgnome-games-support-devel" short_desc="GNOME sort of poker game with dice" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Tali" distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz" -checksum=0215428b50c4a0827fb0de2e4e6ba6e56678f9ba76d8d25b7eeca85215f25a39 +checksum=63a09c55e46a1a19756bf5e0957caf994300fadabdba6bda602e668dfcdf7122 From 94981bba8b979b4fd7cfac4dcbe35285f638330e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 16 Mar 2022 23:20:44 +0100 Subject: [PATCH 095/222] pangomm2.48: update to 2.50.0. --- srcpkgs/pangomm2.48/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pangomm2.48/template b/srcpkgs/pangomm2.48/template index 291837c42612..d46d232ea53f 100644 --- a/srcpkgs/pangomm2.48/template +++ b/srcpkgs/pangomm2.48/template @@ -1,6 +1,6 @@ # Template file for 'pangomm2.48' pkgname=pangomm2.48 -version=2.48.1 +version=2.50.0 revision=1 wrksrc="pangomm-$version" build_style=meson @@ -10,8 +10,9 @@ short_desc="C++ bindings for the pango library" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gtkmm.org" +changelog="https://gitlab.gnome.org/GNOME/pangomm/-/raw/master/NEWS" distfiles="${GNOME_SITE}/pangomm/${version%.*}/pangomm-${version}.tar.xz" -checksum=776ad53e791e43106b7f40ff0834bee6e4eb1c6ad7cb6d215546f7a3df0edc4d +checksum=a27aa77e017b9afce9e751d85bd1cf890abbb3a58bf59d0fac917eef82db3b5b pangomm2.48-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 61acb9ec4f788f42edd8f550d911843dd42ac900 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 00:25:52 +0100 Subject: [PATCH 096/222] zathura: fix distfiles 404 --- srcpkgs/zathura/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zathura/template b/srcpkgs/zathura/template index 3f456aa370ff..c93fbc062cee 100644 --- a/srcpkgs/zathura/template +++ b/srcpkgs/zathura/template @@ -12,9 +12,9 @@ checkdepends="gettext-devel check-devel" short_desc="Highly customizable and functional document viewer" maintainer="lemmi " license="Zlib" -homepage="https://pwmt.org/projects/zathura" -distfiles="${homepage}/download/zathura-${version}.tar.xz" -checksum=fc30c42cd660d993bce8758e22e4ba8078761d51f1e29494e7a0d37a8a3e5e57 +homepage="https://git.pwmt.org/pwmt/zathura/" +distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=82235cbc89899421fca98477265626f2149df7d072740f0360550cc8d4e449d6 if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -Dtests=enabled" From b7f414537729342bdc452eeff7ca87d0f8cc811c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 00:25:54 +0100 Subject: [PATCH 097/222] zathura-ps: fix distfiles 404 --- srcpkgs/zathura-ps/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zathura-ps/template b/srcpkgs/zathura-ps/template index 2ca4483f9147..e17da900762c 100644 --- a/srcpkgs/zathura-ps/template +++ b/srcpkgs/zathura-ps/template @@ -9,9 +9,9 @@ depends="zathura ghostscript" short_desc="PostScript support for zathura" maintainer="lemmi " license="Zlib" -homepage="http://pwmt.org/projects/zathura-ps/" -distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz" -checksum=5897f9204cf5f978b9413be7ce7febde843157af48e351938edf07dbf9308e46 +homepage="https://git.pwmt.org/pwmt/zathura-ps/" +distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=e7092c831e345002edc87321911faa27c5dc3210dd6e3939dfbc49192a54d35e post_install() { vlicense LICENSE From 83138c840c18d250a0505738fa652456913352aa Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 00:25:57 +0100 Subject: [PATCH 098/222] zathura-djvu: fix distfiles 404 --- srcpkgs/zathura-djvu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zathura-djvu/template b/srcpkgs/zathura-djvu/template index 80ce14959c2a..733475923712 100644 --- a/srcpkgs/zathura-djvu/template +++ b/srcpkgs/zathura-djvu/template @@ -9,9 +9,9 @@ depends="zathura" short_desc="DjVu support for zathura" maintainer="lemmi " license="Zlib" -homepage="http://pwmt.org/projects/zathura-djvu/" -distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz" -checksum=96e6f8a6ee53231073b2f7003264872f84501e63c3da7bf0598d046286b0c200 +homepage="https://git.pwmt.org/pwmt/zathura-djvu/" +distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=84fae6da42e7cdc2e49ed4cd4f0315ac09716e95358b9c7487803a2cff47dbca post_install() { vlicense LICENSE From af3b43fb0fcf6246d13a9ad37f82b8032961f5b9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 00:26:05 +0100 Subject: [PATCH 099/222] zathura-cb: fix distfiles 404 --- srcpkgs/zathura-cb/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zathura-cb/template b/srcpkgs/zathura-cb/template index 80d700895c54..4cfed7b4d6f0 100644 --- a/srcpkgs/zathura-cb/template +++ b/srcpkgs/zathura-cb/template @@ -9,9 +9,9 @@ depends="zathura" short_desc="Comic book support for zathura" maintainer="lemmi " license="Zlib" -homepage="http://pwmt.org/projects/zathura-cb/" -distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz" -checksum=3ad7619449987fd2e0203644f7487e073000b022a8b80bdd1df52147424b40d6 +homepage="https://git.pwmt.org/pwmt/zathura-cb/" +distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=30d2cea3b1eb65e7386eb66ec305e455b2bed272c35530faaec541b47217fdcd post_install() { vlicense LICENSE From cb0d06e92dce382bca7048dcd0b8143cf1e82845 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 00:26:15 +0100 Subject: [PATCH 100/222] zathura-pdf-mupdf: fix distfiles 404 --- srcpkgs/zathura-pdf-mupdf/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zathura-pdf-mupdf/template b/srcpkgs/zathura-pdf-mupdf/template index e2afbf966505..9f973214cf83 100644 --- a/srcpkgs/zathura-pdf-mupdf/template +++ b/srcpkgs/zathura-pdf-mupdf/template @@ -12,9 +12,9 @@ depends="zathura" short_desc="PDF support for zathura (using mupdf)" maintainer="lemmi " license="Zlib" -homepage="http://pwmt.org/projects/zathura-pdf-mupdf/" -distfiles="https://pwmt.org/projects/${pkgname}/download/${pkgname}-${version}.tar.xz" -checksum=2f00aa682d4d4a6324c9777bf158e51584c77729ec393f3e10343bec936ea21d +homepage="https://git.pwmt.org/pwmt/zathura-pdf-mupdf/" +distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=3f2d341dfe3bdbfb7a51a33aee81f3763a684d0ea503dd20c726311125d7c08a conflicts="zathura-pdf-poppler>=0" post_install() { From 6fd8404664b97bf7cc694cdcb9ff34904f3f5324 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 17 Mar 2022 00:26:18 +0100 Subject: [PATCH 101/222] zathura-pdf-poppler: fix distfiles 404 --- srcpkgs/zathura-pdf-poppler/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/zathura-pdf-poppler/template b/srcpkgs/zathura-pdf-poppler/template index 9c174c61fab0..d638f659a507 100644 --- a/srcpkgs/zathura-pdf-poppler/template +++ b/srcpkgs/zathura-pdf-poppler/template @@ -9,9 +9,9 @@ depends="zathura" short_desc="PDF support for zathura (using poppler)" maintainer="lemmi " license="Zlib" -homepage="http://pwmt.org/projects/zathura-pdf-poppler/" -distfiles="https://pwmt.org/projects/zathura-pdf-poppler/download/zathura-pdf-poppler-${version}.tar.xz" -checksum=d5cc3a7dae49471b85b503bbb9049c6f8d10903f4a611d721a2e0fefe726d4ed +homepage="https://git.pwmt.org/pwmt/zathura-pdf-poppler/" +distfiles="https://git.pwmt.org/pwmt/${pkgname}/-/archive/${version}/${pkgname}-${version}.tar.gz" +checksum=2034f70a936d458ddc9276f769e77ff308ba3bb1b7a7cdc87bab8b9ef7ade84a conflicts="zathura-pdf-mupdf>=0" From 4d5f4a49cbbded36f29e160e38dfa75388242a05 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 21:48:52 +0100 Subject: [PATCH 102/222] certbot: update to 1.25.0. --- srcpkgs/certbot/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/certbot/template b/srcpkgs/certbot/template index 63432609805f..aa8de157d59b 100644 --- a/srcpkgs/certbot/template +++ b/srcpkgs/certbot/template @@ -1,6 +1,6 @@ # Template file for 'certbot' pkgname=certbot -version=1.24.0 +version=1.25.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -14,4 +14,4 @@ maintainer="Alex Childs " license="Apache-2.0" homepage="https://certbot.eff.org/" distfiles="${PYPI_SITE}/c/certbot/certbot-${version}.tar.gz" -checksum=ba19713ff22c4ac0939c7863986d673d0a45209340f80b1bc6a301d278580be3 +checksum=9633d21051fe7fd076d64cb41963de61d300d7c30f4b491c8d18cb8306357509 From 2fe0ac1b065fd6e622fe7fcdc14a1cc4f35ee644 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 21:48:56 +0100 Subject: [PATCH 103/222] certbot-apache: update to 1.25.0. --- srcpkgs/certbot-apache/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/certbot-apache/template b/srcpkgs/certbot-apache/template index cf9eb1c6fd70..1f5c098c802d 100644 --- a/srcpkgs/certbot-apache/template +++ b/srcpkgs/certbot-apache/template @@ -1,6 +1,6 @@ # Template file for 'certbot-apache' pkgname=certbot-apache -version=1.24.0 +version=1.25.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,4 +11,4 @@ maintainer="Kartik S. " license="Apache-2.0" homepage="https://certbot.eff.org/" distfiles="${PYPI_SITE}/c/certbot-apache/certbot-apache-${version}.tar.gz" -checksum=d432e6b748ae3d12a794da2a90d3a40a054bcc36c4ff63c303766a685f48b324 +checksum=91dbd326c5ee4fe7a2ef5f1c3c525863a7f4ed5f228e1c7c10048d18fe18d0a1 From 228767ee1b39d301b7104ae5d1247c5ef2e6fa87 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 21:48:58 +0100 Subject: [PATCH 104/222] certbot-nginx: update to 1.25.0. --- srcpkgs/certbot-nginx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/certbot-nginx/template b/srcpkgs/certbot-nginx/template index 3cd8fb59c303..b635785e5d0a 100644 --- a/srcpkgs/certbot-nginx/template +++ b/srcpkgs/certbot-nginx/template @@ -1,6 +1,6 @@ # Template file for 'certbot-nginx' pkgname=certbot-nginx -version=1.24.0 +version=1.25.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,4 +11,4 @@ maintainer="Kartik Singh " license="Apache-2.0" homepage="https://certbot.eff.org/" distfiles="${PYPI_SITE}/c/certbot-nginx/certbot-nginx-${version}.tar.gz" -checksum=192843768cf50e07c133efd79c4cae8b689d986c2f952173875fa0717a0cbaf7 +checksum=433a7237e841c462a67f9195fb7d7711ac6ed6d27bedb981c71238ef5348d62b From 8f449fe100453137c99e5d6f0702db8c61189a30 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 21:49:03 +0100 Subject: [PATCH 105/222] python3-acme: update to 1.25.0. --- srcpkgs/python3-acme/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-acme/template b/srcpkgs/python3-acme/template index 20fbf978b912..19e374d105a8 100644 --- a/srcpkgs/python3-acme/template +++ b/srcpkgs/python3-acme/template @@ -1,6 +1,6 @@ # Template file for 'python3-acme' pkgname=python3-acme -version=1.24.0 +version=1.25.0 revision=1 wrksrc="acme-${version}" build_style=python3-module @@ -14,4 +14,4 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/certbot/certbot" distfiles="${PYPI_SITE}/a/acme/acme-${version}.tar.gz" -checksum=63161f442d7c995313305663ad2eef6b3f770899c3f635e1c1f1d0141696b298 +checksum=e3fbe36fcfa27ec46f450369498f3486370ab53a0fd7db91557a23d58b3969fa From 274f37d11387f5fb61d37b0bd20a58b319be09a6 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 16 Mar 2022 21:49:06 +0100 Subject: [PATCH 106/222] python3-josepy: update to 1.13.0. --- srcpkgs/python3-josepy/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-josepy/template b/srcpkgs/python3-josepy/template index 4130d629dc3b..6df2673629f2 100644 --- a/srcpkgs/python3-josepy/template +++ b/srcpkgs/python3-josepy/template @@ -1,6 +1,6 @@ # Template file for 'python3-josepy' pkgname=python3-josepy -version=1.12.0 +version=1.13.0 revision=1 wrksrc="josepy-${version}" build_style=python3-module @@ -11,8 +11,9 @@ short_desc="JOSE protocol implementation in Python3" maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/certbot/josepy" +changelog="https://raw.githubusercontent.com/certbot/josepy/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/j/josepy/josepy-${version}.tar.gz" -checksum=267004a64f08c016cd54b7aaf7c323fa3ef3679fb62f4b086cd56448d0fecb25 +checksum=8931daf38f8a4c85274a0e8b7cb25addfd8d1f28f9fb8fbed053dd51aec75dc9 pre_check() { vsed -e '/addopts/d' -i pytest.ini From e677dc0a27c9f41e3d2595230d95794a8cf1cc75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 10 Mar 2022 21:30:02 +0700 Subject: [PATCH 107/222] nss: update to 3.76. --- srcpkgs/nss/patches/D136289.patch | 43 -------------------- srcpkgs/nss/patches/cpputil-databuffer.patch | 20 +++++++++ srcpkgs/nss/template | 4 +- 3 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/nss/patches/D136289.patch create mode 100644 srcpkgs/nss/patches/cpputil-databuffer.patch diff --git a/srcpkgs/nss/patches/D136289.patch b/srcpkgs/nss/patches/D136289.patch deleted file mode 100644 index a6d380515504..000000000000 --- a/srcpkgs/nss/patches/D136289.patch +++ /dev/null @@ -1,43 +0,0 @@ -Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1750624 -diff --git a/nss/tests/chains/chains.sh b/nss/tests/chains/chains.sh ---- a/nss/tests/chains/chains.sh -+++ b/nss/tests/chains/chains.sh -@@ -917,7 +917,7 @@ - done - - VFY_OPTS_TNAME="${DB_OPT} ${ENGINE} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${TRUST_OPT}" -- VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}" -+ VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${VFY_TIME_OPT} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}" - - TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${VFY_OPTS_TNAME}" - echo "${SCRIPTNAME}: ${TESTNAME}" -@@ -1118,6 +1118,7 @@ - ;; - "verify") - VERIFY="${VALUE}" -+ VFY_TIME_OPT= - TRUST= - TRUST_AND_DB= - POLICY= -@@ -1126,6 +1127,9 @@ - REV_OPTS= - USAGE_OPT= - ;; -+ "at_time") -+ VFY_TIME_OPT="-b ${VALUE}" -+ ;; - "cert") - VERIFY="${VERIFY} ${VALUE}" - ;; -diff --git a/nss/tests/chains/scenarios/realcerts.cfg b/nss/tests/chains/scenarios/realcerts.cfg ---- a/nss/tests/chains/scenarios/realcerts.cfg -+++ b/nss/tests/chains/scenarios/realcerts.cfg -@@ -22,6 +22,7 @@ - - verify PayPalEE:x - policy OID.2.16.840.1.114412.2.1 -+ at_time 2201010000Z - result pass - - verify BrAirWaysBadSig:x - diff --git a/srcpkgs/nss/patches/cpputil-databuffer.patch b/srcpkgs/nss/patches/cpputil-databuffer.patch new file mode 100644 index 000000000000..44dd3f467882 --- /dev/null +++ b/srcpkgs/nss/patches/cpputil-databuffer.patch @@ -0,0 +1,20 @@ +Source: https://bugzilla.mozilla.org/show_bug.cgi?id=1758478 +diff --git a/nss/cpputil/databuffer.h b/nss/cpputil/databuffer.h +index 8d34e1a..6aee509 100644 +--- a/nss/cpputil/databuffer.h ++++ b/nss/cpputil/databuffer.h +@@ -33,11 +33,9 @@ class DataBuffer { + return *this; + } + DataBuffer& operator=(DataBuffer&& other) { +- if (this == &other) { +- data_ = other.data_; +- len_ = other.len_; +- other.data_ = nullptr; +- other.len_ = 0; ++ if (this != &other) { ++ std::swap(data_, other.data_); ++ std::swap(len_, other.len_); + } + return *this; + } diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template index 52ce1074b303..f85cfe79a868 100644 --- a/srcpkgs/nss/template +++ b/srcpkgs/nss/template @@ -3,7 +3,7 @@ _nsprver=4.32 pkgname=nss -version=3.75 +version=3.76 revision=1 hostmakedepends="perl" makedepends="nspr-devel sqlite-devel zlib-devel" @@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="MPL-2.0" homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS" distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz" -checksum=fd571507827284644f4dd522a032acda2286835f6683ed22a1c2d3878cc58582 +checksum=1b8e0310add364d2ade40620cde0f1c37f4f00a6999b2d3e7ea8dacda4aa1630 export NS_USE_GCC=1 export LIBRUNPATH= From 1bd3c86564fa28a16331faf61cc4ea6d7e838f7c Mon Sep 17 00:00:00 2001 From: mobinmob Date: Wed, 16 Mar 2022 15:26:02 +0200 Subject: [PATCH 108/222] skype: update to 8.82.0.403. --- srcpkgs/skype/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skype/template b/srcpkgs/skype/template index b0cfc9ea66c1..7760c535079c 100644 --- a/srcpkgs/skype/template +++ b/srcpkgs/skype/template @@ -1,7 +1,7 @@ # Template file for 'skype' # This just repackages the rpm package. pkgname=skype -version=8.81.0.268 +version=8.82.0.403 revision=1 archs="x86_64" create_wrksrc=yes @@ -12,7 +12,7 @@ maintainer="mobinmob " license="custom:skype-servicesagreement" # no vlicense homepage="https://www.skype.com" distfiles="https://repo.skype.com/rpm/stable/skypeforlinux_${version}-1.x86_64.rpm" -checksum=0a701bee1be8b2b0872696f3fea1c429635b6dfd738b86978f9b81d238f35118 +checksum=df903a805c3db301d8846e5fcfe2ec5acbea720c49f3031edb50d416f5a52a24 repository="nonfree" nostrip="yes" From 112aa362fd48b079050fe058660253bf2767eaf8 Mon Sep 17 00:00:00 2001 From: MouadCharradi Date: Wed, 9 Mar 2022 18:50:40 +0100 Subject: [PATCH 109/222] python3-docutils: update to 0.18.1. --- srcpkgs/python3-docutils/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-docutils/template b/srcpkgs/python3-docutils/template index 0600a65a729b..13bc5f4d7c33 100644 --- a/srcpkgs/python3-docutils/template +++ b/srcpkgs/python3-docutils/template @@ -1,7 +1,7 @@ # Template file for 'python3-docutils' pkgname=python3-docutils -version=0.17.1 -revision=2 +version=0.18.1 +revision=1 wrksrc="docutils-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -13,7 +13,7 @@ maintainer="Alessio Sergi " license="Public Domain, BSD-2-Clause, GPL-3.0-or-later, Python-2.0" homepage="http://docutils.sourceforge.net" distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz" -checksum=686577d2e4c32380bb50cbb22f575ed742d58168cee37e99117a854bcd88f125 +checksum=679987caf361a7539d76e584cbeddc311e3aee937877c87346f31debc63e9d06 alternatives=" docutils:rst2html:/usr/bin/rst2html.py From c0316139402e9be92b16d5821af2929ec44fc89b Mon Sep 17 00:00:00 2001 From: skmpz Date: Tue, 15 Mar 2022 21:12:07 +0400 Subject: [PATCH 110/222] python3-curl: update to 7.45.1. --- srcpkgs/python3-curl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-curl/template b/srcpkgs/python3-curl/template index ea7831c2f087..7a728a5ff62d 100644 --- a/srcpkgs/python3-curl/template +++ b/srcpkgs/python3-curl/template @@ -1,6 +1,6 @@ # Template file for 'python3-curl' pkgname=python3-curl -version=7.45.0 +version=7.45.1 revision=1 wrksrc="pycurl-${version}" build_style=python3-module @@ -13,7 +13,7 @@ license="LGPL-2.1-or-later, MIT" homepage="http://pycurl.io/" changelog="https://raw.githubusercontent.com/pycurl/pycurl/master/ChangeLog" distfiles="${PYPI_SITE}/p/pycurl/pycurl-${version}.tar.gz" -checksum=5036c53c6f4106e9160d053a4baa3433a0215fb3386073e211273c56a3a95f3d +checksum=a863ad18ff478f5545924057887cdae422e1b2746e41674615f687498ea5b88a pre_build() { vsed -i "/setup_args\['data_files'\] = /d" setup.py From 26b8ee588b8d429fd22056e524ae82587a43712c Mon Sep 17 00:00:00 2001 From: skmpz Date: Wed, 16 Mar 2022 19:45:56 +0400 Subject: [PATCH 111/222] python3-regex: update to 2022.3.15. --- srcpkgs/python3-regex/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-regex/template b/srcpkgs/python3-regex/template index 6e31d60343e8..57e5b7f4fb02 100644 --- a/srcpkgs/python3-regex/template +++ b/srcpkgs/python3-regex/template @@ -1,6 +1,6 @@ # Template file for 'python3-regex' pkgname=python3-regex -version=2022.3.2 +version=2022.3.15 revision=1 wrksrc="regex-${version}" build_style=python3-module @@ -12,7 +12,7 @@ maintainer="skmpz " license="CNRI-Python, Apache-2.0" homepage="https://pypi.org/project/regex/" distfiles="${PYPI_SITE}/r/regex/regex-${version}.tar.gz" -checksum=79e5af1ff258bc0fe0bdd6f69bc4ae33935a898e3cbefbbccf22e88a27fa053b +checksum=0a7b75cc7bb4cc0334380053e4671c560e31272c9d2d5a6c4b8e9ae2c9bd0f82 do_check() { (cd build/lib* && python3 -m unittest regex/test_regex.py) From 621a97e0541b8dc7cab1b0bdc2724e37aa3741ac Mon Sep 17 00:00:00 2001 From: Philipp David Date: Thu, 17 Feb 2022 16:13:22 +0100 Subject: [PATCH 112/222] python3-pikepdf: update to 5.0.1. --- srcpkgs/python3-pikepdf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pikepdf/template b/srcpkgs/python3-pikepdf/template index bc4dc5911630..ae0b2ee09ba5 100644 --- a/srcpkgs/python3-pikepdf/template +++ b/srcpkgs/python3-pikepdf/template @@ -1,6 +1,6 @@ # Template file for 'python3-pikepdf' pkgname=python3-pikepdf -version=4.4.1 +version=5.0.1 revision=1 wrksrc="pikepdf-${version}" build_style=python3-module @@ -14,7 +14,7 @@ maintainer="Philipp David " license="MPL-2.0" homepage="https://github.com/pikepdf/pikepdf" distfiles="${PYPI_SITE}/p/pikepdf/pikepdf-${version}.tar.gz" -checksum=c25d4c7673f9588d1f98bca498db98ba675070dc89ffffe50b3b124d4a005df9 +checksum=5fae9eeb7a0120d466fb219aea643a94a1423d68ee9171639a44cf0329ebe7aa pre_build() { vsed -e '/setuptools_scm_git_archive/d' -i setup.py From e838f4a476e7cb8745ef652c39d4108b4f131b48 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 09:53:29 -0400 Subject: [PATCH 113/222] python3: update to 3.10.3. --- srcpkgs/python3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 85cd88971a4d..df408f9ed74d 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -3,7 +3,7 @@ # THIS PACKAGE MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter". # pkgname=python3 -version=3.10.2 +version=3.10.3 revision=1 wrksrc="Python-${version}" build_style="gnu-configure" @@ -22,7 +22,7 @@ maintainer="Andrew J. Hesford " license="Python-2.0" homepage="https://www.python.org" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7 +checksum=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc alternatives=" python:idle:/usr/bin/idle${version%.*} From 0bb98c27261beb30c94644c1708ac892ef2ca2a2 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 09:54:49 -0400 Subject: [PATCH 114/222] python3-tkinter: update to 3.10.3. --- srcpkgs/python3-tkinter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-tkinter/template b/srcpkgs/python3-tkinter/template index 3c7ecb8cfd82..bfe219597ff5 100644 --- a/srcpkgs/python3-tkinter/template +++ b/srcpkgs/python3-tkinter/template @@ -8,7 +8,7 @@ _desc="Python programming language" pkgname=python3-tkinter -version=3.10.2 +version=3.10.3 revision=1 wrksrc="Python-${version}" build_style="gnu-configure" @@ -29,7 +29,7 @@ maintainer="Andrew J. Hesford " homepage="https://www.python.org" license="Python-2.0" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7 +checksum=596c72de998dc39205bc4f70ef0dbf7edec740a306d09b49a9bd0a77806730dc if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3" From 56df4886ad4d52f32ac079ba4ad4d22551748ab5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 09:55:04 -0400 Subject: [PATCH 115/222] python3-MarkupSafe: update to 2.1.1. --- srcpkgs/python3-MarkupSafe/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template index d298c3f318bd..3f1b6a839d0f 100644 --- a/srcpkgs/python3-MarkupSafe/template +++ b/srcpkgs/python3-MarkupSafe/template @@ -1,6 +1,6 @@ # Template file for 'python3-MarkupSafe' pkgname=python3-MarkupSafe -version=2.1.0 +version=2.1.1 revision=1 wrksrc="MarkupSafe-${version}" build_style=python3-module @@ -13,7 +13,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://palletsprojects.com/p/markupsafe/" distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz" -checksum=80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f +checksum=7f91197cc9e48f989d12e4e6fbc46495c446636dfc81b9ccf50bb0ec74b91d4b post_install() { vlicense LICENSE.rst From 210fa53db5e6d314c911fa92b9e0a1a1f8216130 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 09:55:14 -0400 Subject: [PATCH 116/222] python3-cppy: update to 1.2.0. --- srcpkgs/python3-cppy/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-cppy/template b/srcpkgs/python3-cppy/template index de7943af84f5..3afd8399c77a 100644 --- a/srcpkgs/python3-cppy/template +++ b/srcpkgs/python3-cppy/template @@ -1,18 +1,19 @@ # Template file for 'python3-cppy' pkgname=python3-cppy -version=1.1.0 -revision=2 +version=1.2.0 +revision=1 wrksrc="cppy-${version}" build_style=python3-module hostmakedepends="python3-setuptools" depends="python3" +checkdepends="python3-pytest" short_desc="C++ headers to make it easier to write Python C extensions" maintainer="Andrew J. Hesford " license="BSD-3-Clause" homepage="https://cppy.readthedocs.io" changelog="https://raw.githubusercontent.com/nucleic/cppy/master/releasenotes.rst" distfiles="${PYPI_SITE}/c/cppy/cppy-${version}.tar.gz" -checksum=4eda6f1952054a270f32dc11df7c5e24b259a09fddf7bfaa5f33df9fb4a29642 +checksum=95e8862e4f826c3f2a6b7b658333b162f80cbe9f943aa0d0a7a6b2ef850aeffc post_install() { vlicense LICENSE From f0638d601887b32f77dc30ddc73a241b6b8d04f5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 09:55:45 -0400 Subject: [PATCH 117/222] python3-cryptography_vectors: update to 36.0.2. --- srcpkgs/python3-cryptography_vectors/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template index 152ad12ebdde..c31863f52ad7 100644 --- a/srcpkgs/python3-cryptography_vectors/template +++ b/srcpkgs/python3-cryptography_vectors/template @@ -1,7 +1,7 @@ # Template file for 'python3-cryptography_vectors' pkgname=python3-cryptography_vectors -version=36.0.0 -revision=2 +version=36.0.2 +revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford " license="BSD-3-Clause, Apache-2.0" homepage="https://github.com/pyca/cryptography" distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz" -checksum=c6b7e53ec701f47497297cfcfbafdf81a3f76f6f9d684721ef3dea254301faa5 +checksum=2a7924449a03025faf7f8754a6f4200001cab210734a6ce6ac1f6bdacd3a68e4 post_install() { vlicense LICENSE From f063023471edd28ff72056e2029f100ad93d3daf Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 09:57:51 -0400 Subject: [PATCH 118/222] python3-cryptography: update to 36.0.2. --- srcpkgs/python3-cryptography/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template index 40c226de9f8c..278446d27efb 100644 --- a/srcpkgs/python3-cryptography/template +++ b/srcpkgs/python3-cryptography/template @@ -1,6 +1,6 @@ # Template file for 'python3-cryptography' pkgname=python3-cryptography -version=36.0.0 +version=36.0.2 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -16,7 +16,7 @@ license="BSD-3-Clause, Apache-2.0" homepage="https://github.com/pyca/cryptography" changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz" -checksum=52f769ecb4ef39865719aedc67b4b7eae167bafa48dbc2a26dd36fa56460507f +checksum=70f8f4f7bb2ac9f340655cbac89d68c527af5bb4387522a8413e841e3e6628c9 if [ "$CROSS_BUILD" ]; then makedepends+=" rust-std" From 85ca09bd61c0aa7995b7680ff65f5b661636d33e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 10:00:01 -0400 Subject: [PATCH 119/222] python3-pywt: update to 1.3.0. --- srcpkgs/python3-pywt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pywt/template b/srcpkgs/python3-pywt/template index 3fdb9e576558..cb3cad5d80d6 100644 --- a/srcpkgs/python3-pywt/template +++ b/srcpkgs/python3-pywt/template @@ -1,6 +1,6 @@ # Template file for 'python3-pywt' pkgname=python3-pywt -version=1.2.0 +version=1.3.0 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -14,7 +14,7 @@ maintainer="Andrew J. Hesford " license="MIT" homepage="https://github.com/PyWavelets/pywt" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=ad88e5745eeaccaf759287f11b63539353df31324fe7498d9f8121e01e4106ed +checksum=6dc7e55a2d7c415262eb212a2fbbb0e3aa19572fecd5cebcef72b810ac11d4ae do_check() { (cd build/lib* && python3 -m pytest pywt/tests) From c097b95c9d978ca4071c188392a34c1960a83fb4 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 10:00:13 -0400 Subject: [PATCH 120/222] python3-tifffile: update to 2022.3.16. --- srcpkgs/python3-tifffile/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-tifffile/template b/srcpkgs/python3-tifffile/template index d7a735438e5b..00d4c6c3f391 100644 --- a/srcpkgs/python3-tifffile/template +++ b/srcpkgs/python3-tifffile/template @@ -1,6 +1,6 @@ # Template file for 'python3-tifffile' pkgname=python3-tifffile -version=2022.2.9 +version=2022.3.16 revision=1 wrksrc="${pkgname#python3-}-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/cgohlke/tifffile" changelog="https://raw.githubusercontent.com/cgohlke/tifffile/master/CHANGES.rst" distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=901f11169c2aa94c6b3cd9af2998de4b169d33210f78ae08a9acd21a231ebb7e +checksum=2e51c805be3a77f472c0cca3f0c13e60eb110fbfc305a20e278dad3d4e4fe4bf # Tests require unpackaged fsspec make_check=no From 0767b2762a323ad5c2af6e94c97e5341f0cb0d4e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 10:02:25 -0400 Subject: [PATCH 121/222] maturin: update to 0.12.11. --- srcpkgs/maturin/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template index a7de61b7704a..a6c1cbdd3d71 100644 --- a/srcpkgs/maturin/template +++ b/srcpkgs/maturin/template @@ -1,6 +1,6 @@ # Template file for 'maturin' pkgname=maturin -version=0.12.10 +version=0.12.11 revision=1 build_style=cargo build_helper=qemu @@ -17,7 +17,7 @@ homepage="https://github.com/PyO3/maturin" # bump target-lexicon version if it changes in Cargo.lock distfiles="${homepage}/archive/v${version}.tar.gz https://github.com/bytecodealliance/target-lexicon/archive/v0.12.3.tar.gz>target-lexicon-${version}.tar.gz" -checksum="764d91bb35a41d0fa389f3e8179353c0a7e173fbb52c6d434e2877951f15e4a4 +checksum="4d39f15fae9c01f2f23a544fc26b20c68693ec03f820b30ca5f505647c452be1 30ef841ec97532172726787ef9cac3b0cbf565dfdda4b6311e6414ffe63bef3e" # Tests use unstable features and fail to build make_check=no From 037bf41ac03c1b2adc1f5adb7e6a467a5f14a44e Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 17 Mar 2022 10:06:09 -0400 Subject: [PATCH 122/222] python3-pyzmq: ignore beta releases --- srcpkgs/python3-pyzmq/update | 1 + 1 file changed, 1 insertion(+) create mode 100644 srcpkgs/python3-pyzmq/update diff --git a/srcpkgs/python3-pyzmq/update b/srcpkgs/python3-pyzmq/update new file mode 100644 index 000000000000..e9b0a0a5ea4c --- /dev/null +++ b/srcpkgs/python3-pyzmq/update @@ -0,0 +1 @@ +ignore="*b*" From 06549a2fcb2b26dd5ae40b4d764f1d27e2956fd4 Mon Sep 17 00:00:00 2001 From: MouadCharradi Date: Wed, 9 Mar 2022 18:44:49 +0100 Subject: [PATCH 123/222] python3-setuptools: update to 60.9.3. Closes: #36067 [via git-merge-pr] --- srcpkgs/python3-setuptools/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template index a17da25edcac..1c21c918978d 100644 --- a/srcpkgs/python3-setuptools/template +++ b/srcpkgs/python3-setuptools/template @@ -1,6 +1,6 @@ # Template file for 'python3-setuptools' pkgname=python3-setuptools -version=60.5.0 +version=60.9.3 revision=1 wrksrc="setuptools-${version}" build_style=python3-module @@ -12,7 +12,7 @@ license="MIT" homepage="https://github.com/pypa/setuptools" changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst" distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz" -checksum=2404879cda71495fc4d5cbc445ed52fdaddf352b36e40be8dcc63147cb4edabe +checksum=2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5 provides="python3-distribute-${version}_1" replaces="python3-distribute>=0" # Tests rely on jaraco.path, which relies on singledispatch, both unpackaged; From cb53b61259cc8be747e94562fff86533c632079e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 22 Feb 2022 01:59:54 +0100 Subject: [PATCH 124/222] python3-pulsectl: update to 22.1.3. Closes: #35749 [via git-merge-pr] --- srcpkgs/python3-pulsectl/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-pulsectl/template b/srcpkgs/python3-pulsectl/template index 006363a1c5d4..2c2a985b0b39 100644 --- a/srcpkgs/python3-pulsectl/template +++ b/srcpkgs/python3-pulsectl/template @@ -1,18 +1,19 @@ # Template file for 'python3-pulsectl' pkgname=python3-pulsectl -version=20.5.1 -revision=2 +version=22.1.3 +revision=1 wrksrc="pulsectl-${version}" build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools" +checkdepends="pulseaudio" short_desc="Python3 high-level interfaces and ctypes bindings for libpulse" maintainer="Orphaned " license="MIT" homepage="https://github.com/mk-fg/python-pulse-control" changelog="https://github.com/mk-fg/python-pulse-control/raw/master/CHANGES.rst" distfiles="${PYPI_SITE}/p/pulsectl/pulsectl-${version}.tar.gz" -checksum=39b0a0e7974a7d6468d826a838822f78b00ac9c3803f0d7bfa9b1cad08ee22db +checksum=f28fe4b881dd2cc144d2d94f83ec60d8c59a52642a0ad3635cc4d0f8406f4858 post_install() { vlicense COPYING From feb141427de3f6c6e9450d4a134b108db27a1163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 15 Mar 2022 18:01:31 +0100 Subject: [PATCH 125/222] doctl: update to 1.71.0. --- srcpkgs/doctl/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doctl/template b/srcpkgs/doctl/template index 8dd3efe61c68..0580a504f27e 100644 --- a/srcpkgs/doctl/template +++ b/srcpkgs/doctl/template @@ -1,6 +1,6 @@ # Template file for 'doctl' pkgname=doctl -version=1.70.0 +version=1.71.0 revision=1 build_style=go go_import_path="github.com/digitalocean/doctl/cmd/doctl" @@ -10,4 +10,4 @@ maintainer="Benjamín Albiñana " license="Apache-2.0" homepage="https://github.com/digitalocean/doctl" distfiles="https://github.com/digitalocean/doctl/archive/v${version}.tar.gz" -checksum=527a0d02acb303ca3e55c28db162acbc018fb77ca9e77d9298fece2124774c32 +checksum=62a14c05bd4b8442f0a610f9eba7237fe67e1afc397750893cdf2b741aebfd54 From dcaf8209ea5389e481a8cc53ed4a88dd5c26754b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 15 Mar 2022 17:28:55 +0100 Subject: [PATCH 126/222] qpdf: update to 10.6.3. --- srcpkgs/qpdf/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/qpdf/template b/srcpkgs/qpdf/template index 83b293d0ac77..324de5aefaa2 100644 --- a/srcpkgs/qpdf/template +++ b/srcpkgs/qpdf/template @@ -1,6 +1,6 @@ # Template file for 'qpdf' pkgname=qpdf -version=10.6.2 +version=10.6.3 revision=1 wrksrc="qpdf-release-qpdf-${version}" build_style=gnu-configure @@ -12,7 +12,7 @@ license="Apache-2.0" homepage="https://github.com/qpdf/qpdf" changelog="https://raw.githubusercontent.com/qpdf/qpdf/stable/manual/release-notes.rst" distfiles="${homepage}/archive/release-qpdf-${version}.tar.gz" -checksum=e8f8f7f09fe3b9d1f98907e4a0cb7fddb4f0f9b8084e7e3201a571334e686c8c +checksum=64bbb654ec19b6812284ef1bc40c57b091de5281f265f1c3c83dd8ccf6bedcf5 if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" From cabd2a42896caaebd1291cc55add7b12160c1f95 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Thu, 17 Mar 2022 16:06:11 +0100 Subject: [PATCH 127/222] libguestfs: update to 1.48.0. --- srcpkgs/libguestfs/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/libguestfs/template b/srcpkgs/libguestfs/template index 5ac1d1d2b8ee..8d669017077e 100644 --- a/srcpkgs/libguestfs/template +++ b/srcpkgs/libguestfs/template @@ -1,7 +1,7 @@ # Template file for 'libguestfs' pkgname=libguestfs -version=1.46.2 -revision=2 +version=1.48.0 +revision=1 _version_short=${version%.*} build_style=gnu-configure make_install_args="INSTALLDIRS=vendor" @@ -22,7 +22,7 @@ maintainer="Andrea Brancaleoni " license=" GPL-2.0-or-later" homepage="http://libguestfs.org" distfiles="http://libguestfs.org/download/${_version_short}-stable/${pkgname}-${version}.tar.gz" -checksum=e6ea69ca521d60f0c54bd6d3daf1f591cc62e1105dc253897152489aa348006b +checksum=1681fddedfcf484ca6deec54230330a32defbd30c2ab1f81788e252cb5d04829 conf_files="etc/libguestfs-tools.conf" From a7b63c35aab2d622b5f0d024e4710419c61585e7 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 1 Mar 2022 13:38:42 +0100 Subject: [PATCH 128/222] lrzip: update to 0.650. * enable ASM for x86 * liblrzip is deprecated --- srcpkgs/liblrzip | 1 - srcpkgs/lrzip-devel | 1 - srcpkgs/lrzip/template | 27 ++++++++++----------------- srcpkgs/removed-packages/template | 4 +++- 4 files changed, 13 insertions(+), 20 deletions(-) delete mode 120000 srcpkgs/liblrzip delete mode 120000 srcpkgs/lrzip-devel diff --git a/srcpkgs/liblrzip b/srcpkgs/liblrzip deleted file mode 120000 index ce2559e2110e..000000000000 --- a/srcpkgs/liblrzip +++ /dev/null @@ -1 +0,0 @@ -lrzip \ No newline at end of file diff --git a/srcpkgs/lrzip-devel b/srcpkgs/lrzip-devel deleted file mode 120000 index ce2559e2110e..000000000000 --- a/srcpkgs/lrzip-devel +++ /dev/null @@ -1 +0,0 @@ -lrzip \ No newline at end of file diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template index 2ec52997c8e8..1b492e9e6c6c 100644 --- a/srcpkgs/lrzip/template +++ b/srcpkgs/lrzip/template @@ -1,6 +1,6 @@ # Template file for 'lrzip' pkgname=lrzip -version=0.641 +version=0.650 revision=1 build_style="gnu-configure" hostmakedepends="perl automake libtool" @@ -10,25 +10,18 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://lrzip.kolivas.org/" distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz" -checksum=9b6b4bb1ae76dafbaab96ec9d50d41af5fed45a6c4f2e06feea828c2cd8025c0 +checksum=e07b2b3511689e4aaf7404d289feba5d9d6e1170c448f85e393a11249502dd66 + +case "$XBPS_TARGET_MACHINE" in + i686*|x86_64*) hostmakedepends+=" nasm";; +esac pre_configure() { NOCONFIGURE=1 ./autogen.sh } -lrzip-devel_package() { - short_desc+=" - development files" - depends="liblrzip-${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - } -} -liblrzip_package() { - short_desc+=" - runtime library" - pkg_install() { - vmove "usr/lib/*.so.*" - } +# The library is deprecated as of lrzip 0.650. +post_install() { + rm -f ${DESTDIR}/usr/include/Lrzip.h + rm -f ${DESTDIR}/usr/lib/pkgconfig/lrzip.pc } diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 6a744198712d..c23125bb0cb4 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=65 +revision=66 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -211,6 +211,7 @@ replaces=" libgksu<=2.0.12_5 libglib-static<=2.58.3_5 libgtkhtml<=4.10.0_1 + liblrzip<=0.641_1 libmagick6-devel<=6.9.12.12_2 libmagick6-perl<=6.9.12.12_2 libmagick6<=6.9.12.12_2 @@ -228,6 +229,7 @@ replaces=" livewallpaper<=0.5.0_2 llvm3.9<=3.9.1_5 lprng<=3.8.C_1 + lrzip-devel<=0.641_1 ls++-git<=20140919_3 luxmark<=3.1_9 luxrays-devel<=3.1_18 From 50137513d497120a9595642631c7fae7f7a8e6dd Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Tue, 15 Mar 2022 20:13:45 +0100 Subject: [PATCH 129/222] sigil: update to 1.9.2. --- srcpkgs/sigil/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/sigil/template b/srcpkgs/sigil/template index 47b8b14dd330..5e0adb74c86c 100644 --- a/srcpkgs/sigil/template +++ b/srcpkgs/sigil/template @@ -1,6 +1,6 @@ # Template file for 'sigil' pkgname=sigil -version=1.9.1 +version=1.9.2 revision=1 wrksrc="Sigil-${version}" build_style=cmake @@ -20,7 +20,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/Sigil-Ebook/Sigil" changelog="https://raw.githubusercontent.com/Sigil-Ebook/Sigil/master/ChangeLog.txt" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=08a6c52a9043ecb5fa8314783191b81aa21346bd6b937a522ee417e7bb0dc773 +checksum=d1a16f33fe93cda88442c798e0c53f700fa8e2ef792dd78566392d7ad11d997f python_version=3 if [ "$CROSS_BUILD" ]; then From c307ee2b7f24b9d2aaf4940fe406018e50be0cf9 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Wed, 9 Mar 2022 01:52:18 +0100 Subject: [PATCH 130/222] mercurial: update to 6.1. --- srcpkgs/mercurial/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mercurial/template b/srcpkgs/mercurial/template index 778d60757cf6..26795f34512d 100644 --- a/srcpkgs/mercurial/template +++ b/srcpkgs/mercurial/template @@ -1,6 +1,6 @@ # Template file for 'mercurial' pkgname=mercurial -version=6.0.3 +version=6.1 revision=1 build_style=python3-module hostmakedepends="python3 python3-setuptools python3-devel gettext" @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.mercurial-scm.org/" distfiles="https://www.mercurial-scm.org/release/mercurial-${version}.tar.gz" -checksum=67f13647a46517a2b567cdcb73c98721d75d36a0432debb15022b77f9c138333 +checksum=86f98645e4565a9256991dcde22b77b8e7d22ca6fbb60c1f4cdbd8469a38cc1f pre_check() { if [ "$XBPS_TARGET_LIBC" = musl ]; then From f02f313a0f9bd9b598bd22463edd56a4dfb2cbcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 15 Mar 2022 11:35:30 +0100 Subject: [PATCH 131/222] ansible-core: update to 2.12.3. --- srcpkgs/ansible-core/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ansible-core/template b/srcpkgs/ansible-core/template index fc3df299249c..80236532b369 100644 --- a/srcpkgs/ansible-core/template +++ b/srcpkgs/ansible-core/template @@ -1,6 +1,6 @@ # Template file for 'ansible-core' pkgname=ansible-core -version=2.12.2 +version=2.12.3 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage " license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz" -checksum=bc79e1723a5a92cbc105d581b25b66840d15bb5f4c98925c936ef5a71f92e7c3 +checksum=8a135a9f74c97cab67759293744ad34350f719523e8bd9bb9008df4cf953af20 conflicts="ansible<2.10.1_1" replaces="ansible-base<2.11.0_1" # Tests are currently broken for ansible on python 3.10 From c07edf101e7b9c94ad3ae3b14fed983b08f0d2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?= Date: Tue, 15 Mar 2022 11:35:33 +0100 Subject: [PATCH 132/222] ansible: update to 5.4.0. --- srcpkgs/ansible/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ansible/template b/srcpkgs/ansible/template index 70de17aec1f3..eb132fa68380 100644 --- a/srcpkgs/ansible/template +++ b/srcpkgs/ansible/template @@ -1,6 +1,6 @@ # Template file for 'ansible' pkgname=ansible -version=5.3.0 +version=5.4.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -10,7 +10,7 @@ maintainer="Jan Christian Grünhage " license="GPL-3.0-or-later" homepage="https://www.ansible.com/" distfiles="${PYPI_SITE}/a/ansible/ansible-${version}.tar.gz" -checksum=50020dab43f6c59debdeb57f45c90ec6db78d4fa574edc6d75bc52e05cbd3639 +checksum=2f0ecbd8a3232e520bf3e3bc23f40dda60b9ce7924ca194bd35f4de4027100fc # Tests are currently broken for ansible on python 3.10 # See https://github.com/ansible/ansible/issues/74658 # and https://github.com/ansible/ansible/issues/74660 From f9698de4ccfd83272371fb405baef1ea6a1e4130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Mar 2022 22:57:58 +0700 Subject: [PATCH 133/222] python3-pkgconfig: depends on pkg-config Close #35371 --- srcpkgs/python3-pkgconfig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pkgconfig/template b/srcpkgs/python3-pkgconfig/template index 8b015d19b57f..05d37a5d5ee1 100644 --- a/srcpkgs/python3-pkgconfig/template +++ b/srcpkgs/python3-pkgconfig/template @@ -1,11 +1,11 @@ # Template file for 'python3-pkgconfig' pkgname=python3-pkgconfig version=1.5.1 -revision=5 +revision=6 wrksrc="pkgconfig-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3" +depends="python3 pkg-config" short_desc="Python3 module to interface with pkg-config" maintainer="Orphaned " license="MIT" From a35e8deddf7429e0899f312e69b7b8c5678efcea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 17 Mar 2022 23:07:00 +0700 Subject: [PATCH 134/222] xob: fix crash When building xob without any arguments, xob will be built with SYSCONFDIR points to /usr/local/etc. Thus, crash at runtime. Reported-by: Urs Schulz Close #35009 --- srcpkgs/xob/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xob/template b/srcpkgs/xob/template index f2d1701f523e..dfac3851302c 100644 --- a/srcpkgs/xob/template +++ b/srcpkgs/xob/template @@ -1,9 +1,10 @@ # Template file for 'xob' pkgname=xob version=0.3 -revision=1 +revision=2 build_style=gnu-makefile -make_install_args="prefix=/usr sysconfdir=/etc" +make_build_args="prefix=/usr sysconfdir=/etc" +make_install_args="$make_build_args" make_use_env=yes hostmakedepends="pkg-config" makedepends="libX11-devel libconfig-devel libXrender-devel" From 5feb0b157f36aa0e11d344c24f4ab2ec40ad7ab0 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Sun, 6 Mar 2022 18:22:18 -0700 Subject: [PATCH 135/222] python3-identify: update to 2.4.11. Signed-off-by: Joseph Benden --- srcpkgs/python3-identify/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-identify/template b/srcpkgs/python3-identify/template index 6af581162d2f..65fd70ec42c6 100644 --- a/srcpkgs/python3-identify/template +++ b/srcpkgs/python3-identify/template @@ -1,6 +1,6 @@ # Template file for 'python3-identify' pkgname=python3-identify -version=2.3.1 +version=2.4.11 revision=1 wrksrc="identify-${version}" build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Joseph Benden " license="MIT" homepage="https://github.com/chriskuehl/identify" distfiles="${PYPI_SITE}/i/identify/identify-${version}.tar.gz" -checksum=8a92c56893e9a4ce951f09a50489986615e3eba7b4c60610e0b25f93ca4487ba +checksum=2986942d3974c8f2e5019a190523b0b0e2a07cb8e89bf236727fb4b26f27f8fd post_install() { vlicense LICENSE From bd6b2bcb44016fec4c1f795b85343361a2e849e0 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Sun, 6 Mar 2022 18:22:53 -0700 Subject: [PATCH 136/222] pre-commit: update to 2.17.0. Signed-off-by: Joseph Benden --- srcpkgs/pre-commit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/pre-commit/template b/srcpkgs/pre-commit/template index 855dff84d13f..3eecb71e1136 100644 --- a/srcpkgs/pre-commit/template +++ b/srcpkgs/pre-commit/template @@ -1,6 +1,6 @@ # Template file for 'pre-commit' pkgname=pre-commit -version=2.15.0 +version=2.17.0 revision=1 wrksrc="pre_commit-${version}" build_style=python3-module @@ -11,7 +11,7 @@ maintainer="Joseph Benden " license="MIT" homepage="https://pre-commit.com/" distfiles="${PYPI_SITE}/p/pre-commit/pre_commit-${version}.tar.gz" -checksum=3c25add78dbdfb6a28a651780d5c311ac40dd17f160eb3954a0c59da40a505a7 +checksum=c1a8040ff15ad3d648c70cc3e55b93e4d2d5b687320955505587fd79bbaed06a make_check=no # No tests available post_install() { From ad3991d902486ac83fd22e701190b97fef377e20 Mon Sep 17 00:00:00 2001 From: clyhtsuriva Date: Wed, 16 Mar 2022 14:31:06 +0100 Subject: [PATCH 137/222] pyradio: update to 0.8.9.14 --- srcpkgs/pyradio/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/pyradio/template b/srcpkgs/pyradio/template index a86b57d7bd61..1c2670682351 100644 --- a/srcpkgs/pyradio/template +++ b/srcpkgs/pyradio/template @@ -1,17 +1,17 @@ # Template file for 'pyradio' pkgname=pyradio -version=0.8.9.9 -revision=2 +version=0.8.9.14 +revision=1 build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-requests python3-dnspython" +depends="python3-requests python3-dnspython python3-psutil" short_desc="Curses based internet radio player" maintainer="Orphaned " license="MIT" homepage="http://www.coderholic.com/pyradio/" -changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/ChangeLog" +changelog="https://raw.githubusercontent.com/coderholic/pyradio/master/Changelog" distfiles="https://github.com/coderholic/pyradio/archive/${version}.tar.gz" -checksum=9114254088e294bf06399f892c08056d86172bd32c40869474347eb846a965f3 +checksum=76e06934926a1acfd7bba3735d8e0b387d7985dd38a398376877b6fd7da71940 make_check=no # pytest reports "no tests ran" post_install() { From fe71933491f25813be25532473b6c3e6509e76f0 Mon Sep 17 00:00:00 2001 From: Joseph Benden Date: Sun, 27 Feb 2022 10:15:07 -0700 Subject: [PATCH 138/222] nyxt: remove runtime deps on *-devel Signed-off-by: Joseph Benden Close: #35877 --- srcpkgs/nyxt/patches/001-libfixposix.patch | 12 ++++++++++++ srcpkgs/nyxt/patches/002-webkit2gtk.patch | 14 ++++++++++++++ srcpkgs/nyxt/template | 7 ++++--- 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/nyxt/patches/001-libfixposix.patch create mode 100644 srcpkgs/nyxt/patches/002-webkit2gtk.patch diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch new file mode 100644 index 000000000000..23ef9da26442 --- /dev/null +++ b/srcpkgs/nyxt/patches/001-libfixposix.patch @@ -0,0 +1,12 @@ +--- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp.orig 2022-02-27 09:44:00.327307802 -0700 ++++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp 2022-02-27 09:48:30.875539336 -0700 +@@ -12,7 +12,8 @@ + (eval-when (:compile-toplevel :load-toplevel :execute) + (define-foreign-library + (libfixposix :canary "lfp_buildinfo") +- (t (:default "libfixposix"))) ++ (:unix "libfixposix.so.3") ++ (t (:default "libfixposix"))) + (load-foreign-library 'libfixposix)) + + diff --git a/srcpkgs/nyxt/patches/002-webkit2gtk.patch b/srcpkgs/nyxt/patches/002-webkit2gtk.patch new file mode 100644 index 000000000000..5a0fe2e923d3 --- /dev/null +++ b/srcpkgs/nyxt/patches/002-webkit2gtk.patch @@ -0,0 +1,14 @@ +--- a/_build/cl-webkit/webkit2/webkit2.init.lisp 2022-01-14 03:22:05.000000000 -0700 ++++ b/_build/cl-webkit/webkit2/webkit2.init.lisp 2022-02-27 09:59:29.175938024 -0700 +@@ -18,9 +18,9 @@ + "libwebkit2gtk-4.0.37.dylib" + "libwebkit2gtk-4.0.dylib")) + (:unix (:or "libwebkit2gtk-4.1.so" +- "libwebkit2gtk-4.0.so" + ;; Fedora only has this one? +- "libwebkit2gtk-4.0.so.37"))) ++ "libwebkit2gtk-4.0.so.37" ++ "libwebkit2gtk-4.0.so"))) + (use-foreign-library libwebkit2)) + + (defcfun "webkit_get_major_version" :int) diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template index 8332e1286d2c..a0da399fb2da 100644 --- a/srcpkgs/nyxt/template +++ b/srcpkgs/nyxt/template @@ -1,13 +1,13 @@ # Template file for 'nyxt' pkgname=nyxt version=2.2.4 -revision=1 +revision=2 create_wrksrc=yes build_style=gnu-makefile make_build_target=all hostmakedepends="sbcl git" -makedepends="webkit2gtk-devel libfixposix-devel libgirepository-devel" -depends="dbus xclip enchant2 webkit2gtk-devel libfixposix-devel libgirepository-devel" +makedepends="webkit2gtk libfixposix-devel libgirepository-devel" +depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository" short_desc="Keyboard-oriented, extensible web-browser" maintainer="0x0f0f0f " license="BSD-3-Clause" @@ -19,6 +19,7 @@ make_check=no nostrip=yes nopie=yes nocross="Cross-compilation fails due to package iolib/syscalls setting incorrect compiler flags" +shlib_requires="libwebkit2gtk-4.0.so.37 libfixposix.so.3 libgirepository-1.0.so.1" do_install() { make PREFIX=/usr DESTDIR=${DESTDIR} install From d292cd0a4f13600238cfb4aa88415e5b1881b0bb Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Fri, 18 Mar 2022 19:43:51 +0530 Subject: [PATCH 139/222] alacritty: update to 0.10.1 - fix cross-compiling - fix distfiles URL --- srcpkgs/alacritty/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template index 9fb9ccfdb36d..94bf361be18d 100644 --- a/srcpkgs/alacritty/template +++ b/srcpkgs/alacritty/template @@ -1,6 +1,6 @@ # Template file for 'alacritty' pkgname=alacritty -version=0.10.0 +version=0.10.1 revision=1 build_wrksrc="${pkgname}" build_style=cargo @@ -12,9 +12,13 @@ maintainer="Andrea Brancaleoni " license="Apache-2.0" homepage="https://github.com/alacritty/alacritty" changelog="https://raw.githubusercontent.com/alacritty/alacritty/master/CHANGELOG.md" -distfiles="${homepage}/archive/v${version}.tar.gz" -checksum=5dee9c94f944b742b0189dd87c43c87175ffadde8049abb4668ca5a3e68fd65a -nocross="IndexMap/autocfg/rust issues - #34889" +distfiles="${homepage}/archive/refs/tags/v${version}.tar.gz" +checksum=e48d4b10762c2707bb17fd8f89bd98f0dcccc450d223cade706fdd9cfaefb308 + +post_patch() { + # fixes an indexmap error when cross compiling + cargo update --package autocfg --precise 1.1.0 +} case "$XBPS_TARGET_MACHINE" in ppc64*) ;; From c7b75e5a951e841a62c07a54425ac683fe2469fe Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 18 Mar 2022 20:16:43 +0100 Subject: [PATCH 140/222] scite: update to 5.2.1. --- srcpkgs/scite/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/scite/template b/srcpkgs/scite/template index 02f66bdc7b1f..4943d99f3fcf 100644 --- a/srcpkgs/scite/template +++ b/srcpkgs/scite/template @@ -1,6 +1,6 @@ # Template file for 'scite' pkgname=scite -version=5.2.0 +version=5.2.1 revision=1 create_wrksrc=yes hostmakedepends="pkg-config" @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://www.scintilla.org/SciTEDownload.html" distfiles="https://www.scintilla.org/scite${version//./}.tgz" -checksum=a63e0f340bf90df8c1ec9abe8d9c5db0a3aee5663c8b325117155456364f52ff +checksum=0e7a1daca03d9eea20b2857b722ffd57788799235803bb7b84694af5a1707e07 post_extract() { sed -i 's/gthread-2.0/& lua/' scite/gtk/makefile From dd61d993e8e696c8299b6ff766587e0e04fffca5 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Thu, 17 Mar 2022 16:48:30 +0100 Subject: [PATCH 141/222] lrzip: update to 0.651. --- srcpkgs/lrzip/template | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/srcpkgs/lrzip/template b/srcpkgs/lrzip/template index 1b492e9e6c6c..afc7475bf96d 100644 --- a/srcpkgs/lrzip/template +++ b/srcpkgs/lrzip/template @@ -1,6 +1,6 @@ # Template file for 'lrzip' pkgname=lrzip -version=0.650 +version=0.651 revision=1 build_style="gnu-configure" hostmakedepends="perl automake libtool" @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="http://lrzip.kolivas.org/" distfiles="https://github.com/ckolivas/lrzip/archive/v${version}.tar.gz" -checksum=e07b2b3511689e4aaf7404d289feba5d9d6e1170c448f85e393a11249502dd66 +checksum=f4c84de778a059123040681fd47c17565fcc4fec0ccc68fcf32d97fad16cd892 case "$XBPS_TARGET_MACHINE" in i686*|x86_64*) hostmakedepends+=" nasm";; @@ -19,9 +19,3 @@ esac pre_configure() { NOCONFIGURE=1 ./autogen.sh } - -# The library is deprecated as of lrzip 0.650. -post_install() { - rm -f ${DESTDIR}/usr/include/Lrzip.h - rm -f ${DESTDIR}/usr/lib/pkgconfig/lrzip.pc -} From 4adba35b8b6edb6df101ec7eddcc31781bda4ee0 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 18 Mar 2022 20:13:07 +0100 Subject: [PATCH 142/222] perl: update to 5.34.1. --- srcpkgs/perl/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/perl/template b/srcpkgs/perl/template index da223660988a..54ce2298d139 100644 --- a/srcpkgs/perl/template +++ b/srcpkgs/perl/template @@ -1,8 +1,8 @@ # Template file for 'perl' pkgname=perl -version=5.34.0 +version=5.34.1 revision=1 -_perl_cross_version=1.3.6 +_perl_cross_version=1.3.7 build_style=gnu-configure hostmakedepends="less" makedepends="zlib-devel bzip2-devel gdbm-devel db-devel" @@ -14,8 +14,8 @@ license="Artistic-1.0-Perl, GPL-1.0-or-later" homepage="https://www.perl.org" distfiles="https://www.cpan.org/src/5.0/perl-${version}.tar.gz https://github.com/arsv/perl-cross/releases/download/${_perl_cross_version}/perl-cross-${_perl_cross_version}.tar.gz" -checksum="551efc818b968b05216024fb0b727ef2ad4c100f8cb6b43fab615fa78ae5be9a - 4010f41870d64e3957b4b8ce70ebba10a7c4a3e86c5551acb4099c3fcbb37ce5" +checksum="357951a491b0ba1ce3611263922feec78ccd581dddc24a446b033e25acf242a1 + 77f13ca84a63025053852331b72d4046c1f90ded98bd45ccedea738621907335" # Before updating this package to a new major version, run ${FILESDIR}/provides.pl # against ${wrksrc} to find the list of built in packages. @@ -39,7 +39,7 @@ provides="perl-Archive-Tar-2.38_1 perl-Digest-MD5-2.58_1 perl-Digest-SHA-6.02_1 perl-Dumpvalue-1.21_1 - perl-Encode-3.08_1 + perl-Encode-3.08.01_1 perl-Env-1.05_1 perl-Exporter-5.76_1 perl-ExtUtils-CBuilder-0.280236_1 @@ -74,7 +74,7 @@ provides="perl-Archive-Tar-2.38_1 perl-Math-BigRat-0.2614_1 perl-Math-Complex-1.59.02_1 perl-Memoize-1.03.01_1 - perl-Module-CoreList-5.20210520_1 + perl-Module-CoreList-5.20220313_1 perl-Module-Load-0.36_1 perl-Module-Load-Conditional-0.74_1 perl-Module-Loaded-0.08_1 From c891dd98b847399e58bff2778f36c988bc8df2c9 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 19 Mar 2022 08:24:09 +0100 Subject: [PATCH 143/222] cfitsio: update to 4.1.0. --- srcpkgs/cfitsio/template | 6 +++--- srcpkgs/cfitsio/templateo | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/cfitsio/templateo diff --git a/srcpkgs/cfitsio/template b/srcpkgs/cfitsio/template index 55ff7d14e61d..4ce6d6d138bc 100644 --- a/srcpkgs/cfitsio/template +++ b/srcpkgs/cfitsio/template @@ -1,7 +1,7 @@ # Template file for 'cfitsio' pkgname=cfitsio -version=4.0.0 -revision=2 +version=4.1.0 +revision=1 build_style=gnu-configure configure_args="--enable-reentrant" makedepends="libcurl-devel" @@ -10,7 +10,7 @@ maintainer="Helmut Pozimski " license="custom:NASA license" homepage="https://heasarc.gsfc.nasa.gov/fitsio/" distfiles="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${pkgname}-${version}.tar.gz" -checksum=b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e +checksum=b367c695d2831958e7166921c3b356d5dfa51b1ecee505b97416ba39d1b6c17a post_install() { vlicense License.txt diff --git a/srcpkgs/cfitsio/templateo b/srcpkgs/cfitsio/templateo new file mode 100644 index 000000000000..2df3d6385012 --- /dev/null +++ b/srcpkgs/cfitsio/templateo @@ -0,0 +1,27 @@ +# Template file for 'cfitsio' +pkgname=cfitsio +version=4.1.0 +revision=1 +build_style=gnu-configure +configure_args="--enable-reentrant" +makedepends="libcurl-devel" +short_desc="Library for reading and writing data files in FITS data format" +maintainer="Helmut Pozimski " +license="custom:NASA license" +homepage="https://heasarc.gsfc.nasa.gov/fitsio/" +distfiles="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${pkgname}-${version}.tar.gz" +checksum=b2a8efba0b9f86d3e1bd619f662a476ec18112b4f27cc441cc680a4e3777425e + +post_install() { + vlicense License.txt +} + +cfitsio-devel_package() { + depends="cfitsio-${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.so" + vmove usr/lib/pkgconfig + } +} From 0369ed110d1cb04304830cea73eb6b2d26a2187d Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 19 Mar 2022 08:28:30 +0100 Subject: [PATCH 144/222] obconf-qt: update to 0.16.2. --- srcpkgs/obconf-qt/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/obconf-qt/template b/srcpkgs/obconf-qt/template index 40f4e2f54866..793399f3e499 100644 --- a/srcpkgs/obconf-qt/template +++ b/srcpkgs/obconf-qt/template @@ -1,6 +1,6 @@ # Template file for 'obconf-qt' pkgname=obconf-qt -version=0.16.1 +version=0.16.2 revision=1 build_style=cmake hostmakedepends="pkg-config lxqt-build-tools qt5-qmake qt5-host-tools perl" @@ -11,4 +11,4 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="https://lxqt.org/" distfiles="https://github.com/lxqt/obconf-qt/releases/download/${version}/obconf-qt-${version}.tar.xz" -checksum=458d96b63dca8a09a4f477d42030d829e8090aae0ea39b3994fcf0b8da8e8b42 +checksum=7328da1606b289280e2ce0f2279ab30d06f584e4c2d6fc5f01c0f3d9ce714960 From a898e71ecc3cb91f0b697e9f670e89937bc6dd9b Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 19 Mar 2022 09:14:49 +0100 Subject: [PATCH 145/222] vlc: update to 3.0.17.3. --- srcpkgs/vlc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 309477a2f775..318e7ac12ce1 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,6 +1,6 @@ # Template file for 'vlc' pkgname=vlc -version=3.0.17 +version=3.0.17.3 revision=1 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack @@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only" homepage="https://www.videolan.org/vlc/" changelog="https://www.videolan.org/developers/vlc-branch/NEWS" distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz" -checksum=48bd9bf337aa107a1524eba57c52dc4a91e29f5a97fbdee92f6a4dba90383cd0 +checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014 lib32disabled=yes From 3176eba0c01063646a76da19d2e2449f56fcadc8 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 19 Mar 2022 09:18:01 +0100 Subject: [PATCH 146/222] linux5.4: update to 5.4.185. --- srcpkgs/linux5.4/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.4/template b/srcpkgs/linux5.4/template index 983e18bdc0ba..771796079797 100644 --- a/srcpkgs/linux5.4/template +++ b/srcpkgs/linux5.4/template @@ -1,6 +1,6 @@ # Template file for 'linux5.4' pkgname=linux5.4 -version=5.4.184 +version=5.4.185 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=8694ca39e6c665cac5a78c7f80acef83ad9b5b13f9688e94bfe39b3c71541489 +checksum=d15fe9da679bfb624f35f127a17559f6d037ad37a313cf5fd22ce155401f3787 python_version=3 nodebug=yes # -dbg package is generated below manually From b378e25b9c93a872f3d67f544da145b6ea21902a Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Sat, 19 Mar 2022 09:20:12 +0100 Subject: [PATCH 147/222] linux4.19: update to 4.19.235. --- srcpkgs/linux4.19/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux4.19/template b/srcpkgs/linux4.19/template index 64351dd2d235..840a4516d83e 100644 --- a/srcpkgs/linux4.19/template +++ b/srcpkgs/linux4.19/template @@ -1,6 +1,6 @@ # Template file for 'linux4.19' pkgname=linux4.19 -version=4.19.234 +version=4.19.235 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz" -checksum=0082966be4a476c42ed59996e072e7e9fa5282b742efe4ffabadd6cd91212d8b +checksum=530c5ac848111bbf7d1ad407a4ce8173ef8f9a4554477a32c695c5a4eaf02598 python_version=3 nodebug=yes # -dbg package is generated below manually From 9d28ddf61bf304a1d97925ce5ae69fd7aea3c55f Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Fri, 18 Mar 2022 20:56:11 -0500 Subject: [PATCH 148/222] gns3-server: loosen requirements for new python3-distro package --- srcpkgs/gns3-server/patches/requirements.patch | 3 ++- srcpkgs/gns3-server/template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gns3-server/patches/requirements.patch b/srcpkgs/gns3-server/patches/requirements.patch index 4cfa85b16ba2..27cd2441e53c 100644 --- a/srcpkgs/gns3-server/patches/requirements.patch +++ b/srcpkgs/gns3-server/patches/requirements.patch @@ -14,7 +14,8 @@ diff --git a/requirements.txt b/requirements.txt -psutil==5.9.0 +psutil>=5.9.0 async-timeout==3.0.1 - distro==1.6.0 +-distro==1.6.0 ++distro>=1.6.0 py-cpuinfo==8.0.0 -setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 +setuptools>=60.5.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 diff --git a/srcpkgs/gns3-server/template b/srcpkgs/gns3-server/template index 038457a27a3b..c45f0a8f8b82 100644 --- a/srcpkgs/gns3-server/template +++ b/srcpkgs/gns3-server/template @@ -1,7 +1,7 @@ # Template file for 'gns3-server' pkgname=gns3-server version=2.2.31 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-jsonschema python3-aiohttp-cors python3-yarl From 9e8ef621c754abc37c76e7e9bdc683369ede73f9 Mon Sep 17 00:00:00 2001 From: Tim Sandquist Date: Fri, 18 Mar 2022 20:57:06 -0500 Subject: [PATCH 149/222] gns3-gui: loosen requirements for new python3-distro package --- srcpkgs/gns3-gui/patches/requirements.patch | 3 ++- srcpkgs/gns3-gui/template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gns3-gui/patches/requirements.patch b/srcpkgs/gns3-gui/patches/requirements.patch index ab3d55dea830..6cf6d68d94cc 100644 --- a/srcpkgs/gns3-gui/patches/requirements.patch +++ b/srcpkgs/gns3-gui/patches/requirements.patch @@ -7,7 +7,8 @@ diff --git a/requirements.txt b/requirements.txt -sentry-sdk==1.5.4 -psutil==5.9.0 +psutil>=5.9.0 - distro==1.6.0 +-distro==1.6.0 ++distro>=1.6.0 -setuptools==60.6.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 +setuptools>=60.5.0; python_version >= '3.7' # don't upgrade because of https://github.com/pypa/setuptools/issues/3084 setuptools==59.6.0; python_version < '3.7' # v59.7.0 dropped support for Python 3.6 diff --git a/srcpkgs/gns3-gui/template b/srcpkgs/gns3-gui/template index 175eab41080c..348325010d73 100644 --- a/srcpkgs/gns3-gui/template +++ b/srcpkgs/gns3-gui/template @@ -1,7 +1,7 @@ # Template file for 'gns3-gui' pkgname=gns3-gui version=2.2.31 -revision=1 +revision=2 build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-setuptools python3-psutil python3-jsonschema From 0f65f08ad76aa21fc7908cc3afc86da2d3fe0d1b Mon Sep 17 00:00:00 2001 From: chili-b Date: Fri, 4 Mar 2022 19:16:42 -0500 Subject: [PATCH 150/222] New package: tea-0.8.0 --- srcpkgs/tea/template | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 srcpkgs/tea/template diff --git a/srcpkgs/tea/template b/srcpkgs/tea/template new file mode 100644 index 000000000000..5b01c790341f --- /dev/null +++ b/srcpkgs/tea/template @@ -0,0 +1,19 @@ +# Template file for 'tea' +pkgname=tea +version=0.8.0 +revision=1 +wrksrc=$pkgname +build_style=go +go_import_path=code.gitea.io/tea +depends="git" +short_desc="Command line tool to interact with Gitea" +maintainer="chili-b " +license="MIT" +homepage="https://gitea.com/gitea/tea" +changelog="https://gitea.com/gitea/tea/raw/branch/master/CHANGELOG.md" +distfiles="https://gitea.com/gitea/tea/archive/v${version}.tar.gz" +checksum=6c73c0a7b66cdfd1e5a302257d54df06a3a41eb9bdbfeb547966db431ae23b23 + +post_install() { + vlicense LICENSE +} From 9e389088334a128f126c9e3d3567465ff0437057 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 19 Mar 2022 16:14:15 +0100 Subject: [PATCH 151/222] linux5.15: update to 5.15.30. --- srcpkgs/linux5.15/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template index d314a6f8a251..9b43d8ebf3e3 100644 --- a/srcpkgs/linux5.15/template +++ b/srcpkgs/linux5.15/template @@ -1,6 +1,6 @@ # Template file for 'linux5.15' pkgname=linux5.15 -version=5.15.28 +version=5.15.30 revision=1 wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -10,7 +10,7 @@ homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz" checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8 - 1019709aa85b87904e901aca141f8ade27b3719333be8a3e9d3b2cb0e05ad345" + 18059d8e3f01ab38b22ddf4c2e0a0a9db50926f6535649f51ee7a86a8542aff1" skip_extraction="patch-${version}.xz" python_version=3 From 1199aa216385510cdda9988df79ec4a51a602827 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 19 Mar 2022 16:18:09 +0100 Subject: [PATCH 152/222] linux5.10: update to 5.10.107. --- srcpkgs/linux5.10/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template index 305d9822a51c..a3ccac15e158 100644 --- a/srcpkgs/linux5.10/template +++ b/srcpkgs/linux5.10/template @@ -1,6 +1,6 @@ # Template file for 'linux5.10' pkgname=linux5.10 -version=5.10.105 +version=5.10.107 revision=1 wrksrc="linux-${version}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -8,7 +8,7 @@ maintainer="Leah Neukirchen " license="GPL-2.0-only" homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version}.tar.xz" -checksum=3ddc0e0ab2b9cadb64df43141e0a1e5432b5963ed50f34d586c065ac8d4fcb85 +checksum=c467c3077946370fb26c9277313b601d6c48bb557abc889f4892caf627fcdfea python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR. From 9c3d7c750a1f91eafb2ee4851ed91aa95c5edd9d Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 19 Mar 2022 16:22:26 +0100 Subject: [PATCH 153/222] linux5.16: update to 5.16.16. --- srcpkgs/linux5.16/files/arm64-dotconfig | 5 +++-- srcpkgs/linux5.16/template | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/linux5.16/files/arm64-dotconfig b/srcpkgs/linux5.16/files/arm64-dotconfig index d928e0d07a04..23f03c1e5630 100644 --- a/srcpkgs/linux5.16/files/arm64-dotconfig +++ b/srcpkgs/linux5.16/files/arm64-dotconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.16.11 Kernel Configuration +# Linux/arm64 5.16.16 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203" CONFIG_CC_IS_GCC=y @@ -376,6 +376,7 @@ CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_ERRATUM_1508412=y CONFIG_ARM64_WORKAROUND_TRBE_OVERWRITE_FILL_MODE=y CONFIG_ARM64_ERRATUM_2051678=y +CONFIG_ARM64_ERRATUM_2077057=y CONFIG_ARM64_ERRATUM_2119858=y CONFIG_ARM64_ERRATUM_2139208=y CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y @@ -429,7 +430,6 @@ CONFIG_HZ=100 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_HW_PERF_EVENTS=y -CONFIG_ARCH_HAS_FILTER_PGPROT=y CONFIG_PARAVIRT=y # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set CONFIG_KEXEC=y @@ -439,6 +439,7 @@ CONFIG_TRANS_TABLE=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y diff --git a/srcpkgs/linux5.16/template b/srcpkgs/linux5.16/template index a4d787e19716..5775997c8c58 100644 --- a/srcpkgs/linux5.16/template +++ b/srcpkgs/linux5.16/template @@ -1,6 +1,6 @@ # Template file for 'linux5.16' pkgname=linux5.16 -version=5.16.11 +version=5.16.16 revision=1 wrksrc="linux-${version%.*}" short_desc="Linux kernel and modules (${version%.*} series)" @@ -10,7 +10,7 @@ homepage="https://www.kernel.org" distfiles="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${version%.*}.tar.xz https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-${version}.xz" checksum="027d7e8988bb69ac12ee92406c3be1fe13f990b1ca2249e226225cd1573308bb - ef7b5e4f1b043a58fcece6e3f5d9e5425db7fb2a1abddc64c5094b93931bab37" + 9e7af5007d3596c1efee8556aaa1b1a2e40ddded107448b583624a1f305376db" skip_extraction="patch-${version}.xz" python_version=3 From b74b1eb67107647e8a5d01bc16c8db94bcfb0f5f Mon Sep 17 00:00:00 2001 From: Eduard Ganiukov Date: Sat, 19 Feb 2022 23:05:21 +0100 Subject: [PATCH 154/222] himalaya: update to 0.5.9 --- srcpkgs/himalaya/template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/srcpkgs/himalaya/template b/srcpkgs/himalaya/template index 5ad5316f8c08..6869ca90cc20 100644 --- a/srcpkgs/himalaya/template +++ b/srcpkgs/himalaya/template @@ -1,8 +1,9 @@ # Template file for 'himalaya' pkgname=himalaya -version=0.5.1 +version=0.5.9 revision=1 build_style=cargo +make_check_args="--lib" hostmakedepends="pkg-config" makedepends="openssl-devel" short_desc="CLI email client" @@ -11,7 +12,12 @@ license="BSD-3-Clause" homepage="https://github.com/soywod/himalaya" changelog="https://raw.githubusercontent.com/soywod/himalaya/master/CHANGELOG.md" distfiles="https://github.com/soywod/himalaya/archive/v${version}.tar.gz" -checksum=13567726903243f04a4aa64e96b88e0d0fd5c3ccbe4953357f3a8ef1c569dad9 +checksum=70da5d75354e47b47315938b9cbeca2ec167b8e6bd8ce133eff68ef1638d8c59 + +post_patch() { + # fixes an indexmap error when cross compiling + cargo update --package autocfg --precise 1.1.0 +} post_install() { vlicense LICENSE From 54497a6bb363eb409046451d8640e6aba176e26a Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sat, 19 Mar 2022 17:29:07 +0100 Subject: [PATCH 155/222] babashka: update to 0.7.8. --- srcpkgs/babashka/template | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/babashka/template b/srcpkgs/babashka/template index 64fd2b0b1cfe..5a2292af27bf 100644 --- a/srcpkgs/babashka/template +++ b/srcpkgs/babashka/template @@ -1,6 +1,6 @@ # Template file for 'babashka' pkgname=babashka -version=0.7.6 +version=0.7.8 revision=1 hostmakedepends="mandrel leiningen git" makedepends="zlib-devel" @@ -10,14 +10,14 @@ maintainer="Leah Neukirchen " license="EPL-1.0" homepage="https://babashka.org/" changelog="https://github.com/babashka/babashka/blob/master/CHANGELOG.md" -_sci_commit=582aa8fa0bac2251e9d4acb93d042bf9d99282c7 +_sci_commit=4eb8e99e18942ba9c3b7ec3c4707d8237f970035 _babashka_curl_commit=3d3d117ea0f8a143a06e3cace92e4e8b6a5782df -_babashka_nrepl_commit=e8e2273a8de6e8c45371e8ee8d5fa49e5d7dea02 +_babashka_nrepl_commit=d3fce67198b042707f01d841c032f841cc57ab7f _depstar_commit=c419b8c82041855d55593c5b561fc7cea8234712 -_process_commit=2343393d3266026097a61b8fced6f1b1beaefad0 +_process_commit=5db9560eab698f9773537acb0167f38d6fd0d322 _pods_commit=538fc6f4147badf3a457b3eb8f9f95dd3bc947b1 -_deps_clj_commit=e6fb7918b5898549084fc82d006ed8857bf49ccd -_fs_commit=ec037054668d3fd31d858de97ce125462d357da6 +_deps_clj_commit=6636890388cdf779708806a93110b165577cd226 +_fs_commit=2bf527f797d69b3f14247940958e0d7b509f3ce2 _babashka_core_commit=52a6037bd4b632bffffb04394fb4efd0cdab6b1e distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.tar.gz https://github.com/borkdude/sci/archive/${_sci_commit}.tar.gz @@ -29,15 +29,15 @@ distfiles="https://github.com/babashka/babashka/archive/refs/tags/v${version}.ta https://github.com/borkdude/deps.clj/archive/${_deps_clj_commit}.tar.gz https://github.com/babashka/fs/archive/${_fs_commit}.tar.gz https://github.com/babashka/babashka.core/archive/${_babashka_core_commit}.tar.gz" -checksum="97e61e9138cf614cf1e2d92083a4504eb97fccc0bacfba4853f1417230d6b679 - e39d038aa0ff3f058a41a962fae6cc1e87192cfa26b27c218fe2333245692e41 +checksum="23a08adcc9237be9f24c1781cb646514434dbcb651aac00c3eedca763ca25086 + 0766f0a8be23e94efefbfc16c5987f1dab4520da3294f1bccef402f97898c490 45abdaa5e4effd3bcfea777d02844d4634f1f80a592843eca9ec7d3544b7e16d - bc6a65c9bad2ced362636fca54ee5105e12706bd7c4412edd64c0bb18af15b3e + b56a06bf113bcd85084d48f595541447014308860d9c45efcde5b02e859c934c 9d214a10a4f5e4f15b9c80354dae85689a40e941ec3417203354c0dc3ce9457b - 99ffaf99eccccb78001f2fd85527d41461f645d65f4cd839295fcba07f85eb8b + b6671246a1f0742bd4ae4d1f7b0afe4101d6c8907060455e0473c2ef966e370c 7fea6762ecbb31d454e0b5c194d12e1e6d4ec301972aa33daf617b571e097678 - 2f1824c0a525481489ecfa0f2fa4c9e6b5a0e4e00676d0dcecfc7107ceebe979 - 9c98895e85e2566d0db7f5f85815a83e0839525bb7599e6a22778dbdd1ce2a3b + fee3f84f935d141cf7343d7bab19c3eef56fdb2f3dac4a950db71c9b083e0d17 + e5b92a25221b735941861968a5570a4169da1aee7f2a7545975afe930cb8574f bad285812bcc7de7e0dd905c5df99045d7f92d6e2e191fc2768c06adbaaeb709" nocross="https://build.voidlinux.org/builders/aarch64_builder/builds/33769/steps/shell_3/logs/stdio" From 979fb708c9421c67e7994682384261d4c12aee85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Date: Sat, 19 Mar 2022 21:15:33 +0100 Subject: [PATCH 156/222] tailscale: bump to 1.22.2 --- srcpkgs/tailscale/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tailscale/template b/srcpkgs/tailscale/template index 4684014fffd7..27a3611b7296 100644 --- a/srcpkgs/tailscale/template +++ b/srcpkgs/tailscale/template @@ -1,6 +1,6 @@ # Template file for 'tailscale' pkgname=tailscale -version=1.22.0 +version=1.22.2 revision=1 build_style=go go_import_path="tailscale.com" @@ -13,7 +13,7 @@ maintainer="Noel Cower " license="BSD-3-Clause" homepage="https://tailscale.com" distfiles="https://github.com/tailscale/tailscale/archive/v${version}.tar.gz" -checksum=79c240a3d623a304c908a8b4035f1f775014e9dff6ae076c06279c2829a7d746 +checksum=3e7b5b8073a7b94d84ff6677a9f110070b808c8d35c5b7da0c6e6fe639444e58 post_install() { vlicense LICENSE From 550bc66eebdf41e81f9fb5befb575c87661ea1d4 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 19 Mar 2022 19:17:39 -0500 Subject: [PATCH 157/222] nomad: update to 1.2.6. --- srcpkgs/nomad/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nomad/template b/srcpkgs/nomad/template index 0e6f169d0118..8707ada37bf9 100644 --- a/srcpkgs/nomad/template +++ b/srcpkgs/nomad/template @@ -1,11 +1,11 @@ # Template file for 'nomad' pkgname=nomad -version=1.2.3 -revision=2 +version=1.2.6 +revision=1 build_style=go go_import_path="github.com/hashicorp/nomad" go_build_tags="ui release" -_git_commit=55e5c49b99a6fd2bf925e7fd98d95829776c331f +_git_commit=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit}" hostmakedepends="git" short_desc="Cluster scheduler designed to easily integrate into existing workflows" @@ -13,7 +13,7 @@ maintainer="Michael Aldridge " license="MPL-2.0" homepage="https://www.nomadproject.io/" distfiles="https://github.com/hashicorp/nomad/archive/v${version}.tar.gz" -checksum=36e074f34091043a2b5d115496f371fb9df048134f402bb5943e17bcb2f911ff +checksum=c69ec89ae5f76704d4b3ecb842b130f3d90e579bfd31191721b5f2da99f95a93 post_install() { vlicense LICENSE From 46212091c41db6ee7c7f1382378d9ec215c0220f Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 19 Mar 2022 19:20:47 -0500 Subject: [PATCH 158/222] consul: update to 1.11.4. --- srcpkgs/consul/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/consul/template b/srcpkgs/consul/template index e7a39388514f..fc0e80502879 100644 --- a/srcpkgs/consul/template +++ b/srcpkgs/consul/template @@ -1,10 +1,10 @@ # Template file for 'consul' pkgname=consul -version=1.11.1 +version=1.11.4 revision=1 build_style=go go_import_path="github.com/hashicorp/consul" -_git_commit=2c56447e427c0dd4bdbcabe6cc39bd0802aaf897 +_git_commit=944e8ce64201ab2bbe923b207883d08a4dcff73a go_ldflags="-X ${go_import_path}/version.GitCommit=${_git_commit} -X ${go_import_path}/version.GitDescribe=v${version}" # consul has a vendor directory, but relies on replace statements in go.mod, so # force default non-vendor behavior. @@ -15,7 +15,7 @@ maintainer="iaroki " license="MPL-2.0" homepage="https://www.consul.io/" distfiles="https://${go_import_path}/archive/v${version}.tar.gz" -checksum=e548902d6a9c92bcc07fc1af33049078fb34a371e9853be6b0d6a69cf2a2c208 +checksum=253200fbf79aefee632c5cde9f90e6df6eddcb2766f2909b0d347c4438065126 post_install() { vlicense LICENSE From b8cf21563b92d8b7b16e2872b304bca5d8fff6c4 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 19 Mar 2022 19:27:30 -0500 Subject: [PATCH 159/222] vault: update to 1.9.4. --- srcpkgs/vault/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vault/template b/srcpkgs/vault/template index 1ba3566e77c7..4746d4974195 100644 --- a/srcpkgs/vault/template +++ b/srcpkgs/vault/template @@ -1,11 +1,11 @@ # Template file for 'vault' pkgname=vault -version=1.9.2 +version=1.9.4 revision=1 build_style=go go_import_path="github.com/hashicorp/vault" go_build_tags="release" -_git_commit=aca76f63357041a43b49f3e8c11d67358496959f +_git_commit=fcbe948b2542a13ee8036ad07dd8ebf8554f56cb go_ldflags="-X ${go_import_path}/sdk/version.GitCommit=${_git_commit}" hostmakedepends="git" depends="libcap-progs" @@ -14,7 +14,7 @@ maintainer="Michael Aldridge " license="MPL-2.0" homepage="https://www.vaultproject.io/" distfiles="https://github.com/hashicorp/vault/archive/v${version}.tar.gz" -checksum=84a2506d8d0e0757a3229012328904b5e1e13c39c7766d431ffa9c32bce51fae +checksum=7ebae46e12ff353c3a9e861c4991410679a3c890d36c7c6fb17b43e9ea6f6115 system_accounts="_vault" make_dirs="/var/lib/vault 0700 _vault _vault /etc/vault 0750 root _vault" From b85a636dd74d6e697d3de2c660c2c4457bea47e5 Mon Sep 17 00:00:00 2001 From: Michael Aldridge Date: Sat, 19 Mar 2022 19:37:39 -0500 Subject: [PATCH 160/222] terraform: update to 1.1.7. --- srcpkgs/terraform/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/terraform/template b/srcpkgs/terraform/template index 4f03771b4775..14fb8b368a9a 100644 --- a/srcpkgs/terraform/template +++ b/srcpkgs/terraform/template @@ -1,6 +1,6 @@ # Template file for 'terraform' pkgname=terraform -version=1.1.6 +version=1.1.7 revision=1 build_style=go go_import_path="github.com/hashicorp/$pkgname" @@ -9,4 +9,4 @@ maintainer="Andrea Brancaleoni " license="MPL-2.0" homepage="https://www.terraform.io/" distfiles="https://$go_import_path/archive/v$version.tar.gz" -checksum=4dd037773928b93ba98c7885c9f2f500db96c407555459a744f8316ab9b16d34 +checksum=7651b69a2196de4393195cef4a03171c83aa50581f1019bca3f17cf05db5335b From a5132ef385c1669dd93a54efed61eece8f5fed53 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 20 Mar 2022 00:09:37 +0100 Subject: [PATCH 161/222] zimg: update to 3.0.3. --- srcpkgs/zimg/template | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zimg/template b/srcpkgs/zimg/template index a0b0ff763198..3f2f7291d0aa 100644 --- a/srcpkgs/zimg/template +++ b/srcpkgs/zimg/template @@ -1,6 +1,6 @@ # Template file for 'zimg' pkgname=zimg -version=2.9.3 +version=3.0.3 revision=1 wrksrc=zimg-release-${version} build_style=gnu-configure @@ -9,8 +9,13 @@ short_desc="Image processing library" maintainer="lemmi " license="WTFPL" homepage="https://github.com/sekrit-twc/zimg" +changelog="https://raw.githubusercontent.com/sekrit-twc/zimg/master/ChangeLog" distfiles="https://github.com/sekrit-twc/zimg/archive/release-${version}.tar.gz" -checksum=a15c0483fbe945ffe695a1a989bc43b3381c8bf33e2d1760464ec21d32cdf30b +checksum=5e002992bfe8b9d2867fdc9266dc84faca46f0bfd931acc2ae0124972b6170a7 + +case "$XBPS_TARGET_MACHINE" in + armv7*) configure_args+=" --disable-simd";; +esac pre_configure() { ./autogen.sh From e862093d448ed968d313a469c657e762e64b7b9a Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 20 Mar 2022 00:09:41 +0100 Subject: [PATCH 162/222] vapoursynth: update to R57. --- srcpkgs/vapoursynth/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/vapoursynth/template b/srcpkgs/vapoursynth/template index c4de1d5712a0..63a2043fe522 100644 --- a/srcpkgs/vapoursynth/template +++ b/srcpkgs/vapoursynth/template @@ -1,21 +1,22 @@ # Template file for 'vapoursynth' pkgname=vapoursynth -version=R52 -revision=4 +version=R57 +revision=1 build_style=gnu-configure -# configure checks sys.version[:3] for Python versioning, so 3.10 becomes 3.1; -# until this is fixed upstream, manually define am_cv_python_version to circumvent -configure_args="am_cv_python_version=${py3_ver}" hostmakedepends="automake libtool nasm pkg-config python3-Cython" -makedepends="ffmpeg-devel python3-devel zimg-devel libass-devel libmagick-devel - libxml2-devel" +makedepends="python3-devel zimg-devel" short_desc="Application for video manipulation" maintainer="lemmi " license="LGPL-2.1-or-later, OFL-1.1" homepage="http://www.vapoursynth.com" changelog="https://raw.githubusercontent.com/vapoursynth/vapoursynth/master/ChangeLog" distfiles="https://github.com/vapoursynth/vapoursynth/archive/${version}.tar.gz" -checksum=4d5dc7950f4357da695d29708bc98013bc3e0bd72fc5d697f8c91ce3c4a4b2ac +checksum=9bed2ab1823050cfcbdbb1a57414e39507fd6c73f07ee4b5986fcbf0f6cb2d07 + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + LDFLAGS="-latomic" +fi pre_configure() { ./autogen.sh From 16b8f45f2bfecc0b812e9a3fd43173f82528e0a8 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 13:54:08 +0100 Subject: [PATCH 163/222] common/environment/setup/misc.sh: add ${VIDEOLAN_SITE} --- common/environment/setup/misc.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh index d22a7388d689..177b1e5622a2 100644 --- a/common/environment/setup/misc.sh +++ b/common/environment/setup/misc.sh @@ -17,5 +17,6 @@ MOZILLA_SITE="https://ftp.mozilla.org/pub" GNU_SITE="https://ftp.gnu.org/gnu" FREEDESKTOP_SITE="https://freedesktop.org/software" KDE_SITE="https://download.kde.org/stable" +VIDEOLAN_SITE="https://download.videolan.org/pub/videolan" set +a From e1717bf9911a92b6c097ae25993727868b588901 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 13:53:17 +0100 Subject: [PATCH 164/222] Manual.md: document ${VIDEOLAN_SITE} --- Manual.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Manual.md b/Manual.md index 40b2321f7a25..af5f698debae 100644 --- a/Manual.md +++ b/Manual.md @@ -529,6 +529,7 @@ Example: | UBUNTU_SITE | http://archive.ubuntu.com/ubuntu/pool | | XORG_SITE | https://www.x.org/releases/individual | | KDE_SITE | https://download.kde.org/stable | + | VIDEOLAN_SITE | https://download.videolan.org/pub/videolan | - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be separated by blanks. Please note that the order must be the same than From 64f5d7dcff5482c470e7275417a54b1f9a505ede Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 13:42:29 +0100 Subject: [PATCH 165/222] vlc: use ${VIDEOLAN_SITE} --- srcpkgs/vlc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 318e7ac12ce1..14a00043a651 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -16,7 +16,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://www.videolan.org/vlc/" changelog="https://www.videolan.org/developers/vlc-branch/NEWS" -distfiles="https://download.videolan.org/pub/videolan/vlc/${version}/vlc-${version}.tar.xz" +distfiles="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz" checksum=6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014 lib32disabled=yes From fe1928ba9d70c703d252b0968fe59012c8b1a263 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 13:42:38 +0100 Subject: [PATCH 166/222] x264: use ${VIDEOLAN_SITE} --- srcpkgs/x264/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/x264/template b/srcpkgs/x264/template index 1ed803645ba6..a33dede30ccb 100644 --- a/srcpkgs/x264/template +++ b/srcpkgs/x264/template @@ -10,7 +10,7 @@ short_desc="Free library for encoding H264/AVC video streams" maintainer="DirectorX " license="GPL-2.0-or-later" homepage="https://www.videolan.org/developers/x264.html" -distfiles="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${version//./-}-stable.tar.bz2" +distfiles="${VIDEOLAN_SITE}/x264/snapshots/x264-snapshot-${version//./-}-stable.tar.bz2" checksum=b2495c8f2930167d470994b1ce02b0f4bfb24b3317ba36ba7f112e9809264160 pre_configure() { From 2ddfb67650e914d1d883aa448684fe0ed9aa8629 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 13:42:51 +0100 Subject: [PATCH 167/222] libdvdnav: use ${VIDEOLAN_SITE} --- srcpkgs/libdvdnav/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libdvdnav/template b/srcpkgs/libdvdnav/template index 5a7a859c4c0b..9ff884a90b37 100644 --- a/srcpkgs/libdvdnav/template +++ b/srcpkgs/libdvdnav/template @@ -10,7 +10,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.videolan.org/developers/libdvdnav.html" changelog="https://code.videolan.org/videolan/libdvdnav/blob/master/ChangeLog" -distfiles="https://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2" +distfiles="${VIDEOLAN_SITE}/libdvdnav/${version}/libdvdnav-${version}.tar.bz2" checksum=c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48 libdvdnav-devel_package() { From 8f9b01f38ffc6f529226bf6957ff9baee559f6a0 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 13:43:04 +0100 Subject: [PATCH 168/222] libdvdcss: use ${VIDEOLAN_SITE} --- srcpkgs/libdvdcss/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libdvdcss/template b/srcpkgs/libdvdcss/template index ca9d26cd31cd..c77443b8e055 100644 --- a/srcpkgs/libdvdcss/template +++ b/srcpkgs/libdvdcss/template @@ -7,7 +7,7 @@ short_desc="Simple library designed for accessing DVDs" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.videolan.org/developers/libdvdcss.html" -distfiles="https://download.videolan.org/pub/${pkgname}/${version}/${pkgname}-${version}.tar.bz2" +distfiles="${VIDEOLAN_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.bz2" checksum=233cc92f5dc01c5d3a96f5b3582be7d5cee5a35a52d3a08158745d3d86070079 libdvdcss-devel_package() { From a80557daa3c520ce3954cac9fb640d657c480bd8 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 13:43:17 +0100 Subject: [PATCH 169/222] libdvbpsi: use ${VIDEOLAN_SITE} --- srcpkgs/libdvbpsi/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libdvbpsi/template b/srcpkgs/libdvbpsi/template index c8aa475b2de5..5aac623a13ae 100644 --- a/srcpkgs/libdvbpsi/template +++ b/srcpkgs/libdvbpsi/template @@ -7,7 +7,7 @@ short_desc="PSI decoder and generator library for MPEG2 and DVB streams" maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://www.videolan.org/developers/libdvbpsi.html" -distfiles="https://download.videolan.org/pub/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2" +distfiles="${VIDEOLAN_SITE}/libdvbpsi/${version}/${pkgname}-${version}.tar.bz2" checksum=02b5998bcf289cdfbd8757bedd5987e681309b0a25b3ffe6cebae599f7a00112 libdvbpsi-devel_package() { From a28e44db0a4c3a308fc0fbabbfc2e6db59d055da Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 13:43:28 +0100 Subject: [PATCH 170/222] libdca: use ${VIDEOLAN_SITE} --- srcpkgs/libdca/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libdca/template b/srcpkgs/libdca/template index a9007df8387c..a144e80ad73b 100644 --- a/srcpkgs/libdca/template +++ b/srcpkgs/libdca/template @@ -8,7 +8,7 @@ short_desc="DTS Coherent Acoustics decoder" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.videolan.org/developers/libdca.html" -distfiles="https://download.videolan.org/pub/videolan/libdca/${version}/libdca-${version}.tar.bz2" +distfiles="${VIDEOLAN_SITE}/libdca/${version}/libdca-${version}.tar.bz2" checksum=3a0b13815f582c661d2388ffcabc2f1ea82f471783c400f765f2ec6c81065f6a pre_configure() { From 268e823bd241692999044983e20b309a4dfec559 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 13:43:39 +0100 Subject: [PATCH 171/222] libbluray: use ${VIDEOLAN_SITE} --- srcpkgs/libbluray/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libbluray/template b/srcpkgs/libbluray/template index b81a8ee351de..070c351ee279 100644 --- a/srcpkgs/libbluray/template +++ b/srcpkgs/libbluray/template @@ -10,7 +10,7 @@ short_desc="Library to access Blu-Ray disks for video playback" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://www.videolan.org/developers/libbluray.html" -distfiles="https://download.videolan.org/pub/videolan/libbluray/${version}/libbluray-${version}.tar.bz2" +distfiles="${VIDEOLAN_SITE}/libbluray/${version}/libbluray-${version}.tar.bz2" checksum=e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9 pre_build() { From 9bb0ecd6ed9149e9e77d97875dbdd2672506fa93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 4 Mar 2022 10:17:47 +0700 Subject: [PATCH 172/222] dnsmasq: configurable services Close: #35826 --- srcpkgs/dnsmasq/files/dnsmasq/run | 3 ++- srcpkgs/dnsmasq/template | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/dnsmasq/files/dnsmasq/run b/srcpkgs/dnsmasq/files/dnsmasq/run index 2b740a49d8f5..f3504f9e6ece 100644 --- a/srcpkgs/dnsmasq/files/dnsmasq/run +++ b/srcpkgs/dnsmasq/files/dnsmasq/run @@ -1,3 +1,4 @@ #!/bin/sh mkdir -p /var/lib/misc -exec dnsmasq -k --enable-dbus -u dnsmasq -g dnsmasq 2>&1 +[ -r ./conf ] && . ./conf +exec dnsmasq -k ${OPTS:---enable-dbus -u dnsmasq -g dnsmasq} 2>&1 diff --git a/srcpkgs/dnsmasq/template b/srcpkgs/dnsmasq/template index 731594e8a9de..b59608c47912 100644 --- a/srcpkgs/dnsmasq/template +++ b/srcpkgs/dnsmasq/template @@ -1,7 +1,7 @@ # Template file for 'dnsmasq' pkgname=dnsmasq version=2.86 -revision=1 +revision=2 conf_files="/etc/dnsmasq.conf" hostmakedepends="pkg-config" makedepends="dbus-devel libcap-devel libidn2-devel $(vopt_if dnssec nettle-devel)" From 7551351775e2475c635445cdae28aad09e347c4f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Sun, 20 Mar 2022 19:45:01 +0100 Subject: [PATCH 173/222] ugrep: update to 3.7.6. --- srcpkgs/ugrep/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template index 16301971cb5f..8af468ccc9bc 100644 --- a/srcpkgs/ugrep/template +++ b/srcpkgs/ugrep/template @@ -1,6 +1,6 @@ # Template file for 'ugrep' pkgname=ugrep -version=3.7.5 +version=3.7.6 revision=1 build_style=gnu-configure makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel @@ -10,7 +10,7 @@ maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://github.com/Genivia/ugrep" distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz" -checksum=2b237330ef92017d69ed6611b9dfb91b447d4679b9fb3704514bfd5b89a1a44d +checksum=8288af9eb9f5a5638134911e9e81c8b37d02f29223d473dd96a2046c228cd5d4 post_install() { vlicense LICENSE.txt LICENSE From b27ce98ea4d8b3cce7d2453d66345545765806f1 Mon Sep 17 00:00:00 2001 From: chili-b Date: Sat, 19 Mar 2022 16:00:40 -0400 Subject: [PATCH 174/222] octoxbps: fix detection of Void Linux Without this change, OctoXBPS fails to detect that it is running on Void Linux which causes a password prompt to be shown every time OctoXBPS is opened. --- ...tion-of-Void-Linux-in-getLinuxDistro.patch | 42 +++++++++++++++++++ srcpkgs/octoxbps/template | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch diff --git a/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch new file mode 100644 index 000000000000..9941fc6da8c2 --- /dev/null +++ b/srcpkgs/octoxbps/patches/0001-Fix-detection-of-Void-Linux-in-getLinuxDistro.patch @@ -0,0 +1,42 @@ +From 41e0ba546e85f812d89899a3034d67256ec5f23c Mon Sep 17 00:00:00 2001 +From: chili-b +Date: Sat, 19 Mar 2022 15:33:41 -0400 +Subject: [PATCH] Fix detection of Void Linux in getLinuxDistro + +Before this change, OctoXBPS detects Void Linux based on whether or not +the string, `PRETTY_NAME="void"`, occurs in the file, `/etc/os-release`. +As of March 15 2022, the contents of `/etc/os-release` have been changed +and `PRETTY_NAME="Void Linux"` replaces the previous value. +(see https://github.com/void-linux/void-packages/commit/1dfc401d1237120e8e936627e7e28d2441916e80) + +With this change, Void Linux is detected based on the value of `ID` in +`/etc/os-release` which is less subject to change. + +This change is important because OctoXBPS only checks for the existence +of the local package db if it detects that it is running on either Void +Linux or Trident Linux. If OctoXBPS does not detect that it is running +on either distribution (which it doesn't without this change), it will +prompt for elevated privileges in order to synchronize the local package +database with the remote database using `xbps-install -Syy` every time +it is started, regardless of whether or not there are remote changes +that need to be synced. +--- + src/unixcommand.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/unixcommand.cpp b/src/unixcommand.cpp +index 8a88a2f..1762c4b 100644 +--- a/src/unixcommand.cpp ++++ b/src/unixcommand.cpp +@@ -709,7 +709,7 @@ LinuxDistro UnixCommand::getLinuxDistro() + + QString contents = file.readAll(); + +- if (contents.contains("PRETTY_NAME=\"void\"")) ++ if (contents.contains("ID=\"void\"")) + { + ret = ectn_VOID; + } +-- +2.35.1 + diff --git a/srcpkgs/octoxbps/template b/srcpkgs/octoxbps/template index fef8bb3ab323..8315f57ff0d8 100644 --- a/srcpkgs/octoxbps/template +++ b/srcpkgs/octoxbps/template @@ -1,7 +1,7 @@ # Template file for 'octoxbps' pkgname=octoxbps version=0.3.0 -revision=2 +revision=3 build_style=qmake hostmakedepends="qt5-qmake pkg-config qt5-host-tools" makedepends="qt5-declarative-devel qtermwidget-devel" From 22634d8bd16f2e667848575ea933749e727097d9 Mon Sep 17 00:00:00 2001 From: Philipp David Date: Sat, 6 Nov 2021 15:51:38 +0100 Subject: [PATCH 175/222] cups: update to 2.4.1. Closes: #33939 [via git-merge-pr] --- .../cups/patches/cups-no-export-ssllibs.patch | 11 ----- srcpkgs/cups/template | 48 ++++++------------- 2 files changed, 15 insertions(+), 44 deletions(-) delete mode 100644 srcpkgs/cups/patches/cups-no-export-ssllibs.patch diff --git a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch b/srcpkgs/cups/patches/cups-no-export-ssllibs.patch deleted file mode 100644 index bf618ce330bd..000000000000 --- a/srcpkgs/cups/patches/cups-no-export-ssllibs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200 -+++ b/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200 -@@ -180,7 +180,7 @@ - AC_SUBST(SSLFLAGS) - AC_SUBST(SSLLIBS) - --EXPORT_SSLLIBS="$SSLLIBS" -+EXPORT_SSLLIBS="" - AC_SUBST(EXPORT_SSLLIBS) - - dnl diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template index 66204733fa86..772f73ca4a76 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,22 +1,20 @@ # Template file for 'cups' pkgname=cups -version=2.3.3op2 +version=2.4.1 revision=1 build_style=gnu-configure make_install_args="BUILDROOT=${DESTDIR}" -hostmakedepends="automake $(vopt_if avahi avahi-libs-devel) - gnutls-devel perl pkg-config poppler-utils" -makedepends="acl-devel gnutls-devel libpaper-devel libpng-devel - libusb-devel pam-devel poppler-devel tiff-devel - $(vopt_if avahi avahi-libs-devel) - $(vopt_if gssapi 'mit-krb5-devel')" +hostmakedepends="gnutls-devel pkg-config + $(vopt_if avahi avahi-libs-devel)" +makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel + zlib-devel $(vopt_if avahi avahi-libs-devel) $(vopt_if gssapi mit-krb5-devel)" depends="xdg-utils" short_desc="Common Unix Printing System" maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/OpenPrinting/cups" distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz" -checksum=deb3575bbe79c0ae963402787f265bfcf8d804a71fc2c94318a74efec86f96df +checksum=c7339f75f8d4f2dec50c673341a45fc06b6885bb6d4366d6bf59a4e6c10ae178 conf_files="/etc/pam.d/cups /etc/cups/*.conf /etc/xinetd.d/cups-lpd" make_dirs=" @@ -34,40 +32,24 @@ system_groups=lpadmin cups_pgroup=lp cups_homedir=/var/spool/cups -pre_configure() { - aclocal -I config-scripts - autoconf -I config-scripts -} - do_configure() { ./configure ${configure_args} --sbindir=/usr/bin --libdir=/usr/lib \ - --enable-acl --enable-dbus --enable-raw-printing \ - --enable-threads --with-logdir=/var/log/cups \ - --with-docdir=/usr/share/cups/doc --with-rundir=/run/cups \ - --with-cups-user=cups --with-cups-group=lp --with-system-groups="lpadmin sys root" --enable-relro \ - --enable-libpaper --enable-pam --enable-ssl \ - --with-menudir=/usr/share/applications --with-xinetd=/etc/xinetd.d \ - --with-optim="${CFLAGS}" --disable-systemd --disable-launchd \ - --without-rcdir --without-java --without-perl --without-php \ - --without-python \ - $(vopt_enable avahi) $(vopt_enable gssapi) + --enable-acl --with-logdir=/var/log/cups \ + --docdir=/usr/share/cups/doc --with-rundir=/run/cups \ + --with-cups-user=cups --with-cups-group=lp \ + --with-system-groups="lpadmin sys root" --enable-relro \ + --enable-libpaper --with-menudir=/usr/share/applications \ + --with-xinetd=/etc/xinetd.d --with-optim="${CFLAGS}" \ + --with-rcdir=no \ + $(vopt_if avahi '--with-dnssd=avahi') $(vopt_enable gssapi) } post_install() { - # compress some driver files, adopted from Fedora - find ${DESTDIR}/usr/share/cups/model -name "*.ppd"|xargs gzip -n9f # install some more configuration files that will get filled by cupsd for f in printers classes client subscriptions; do touch ${DESTDIR}/etc/cups/${f}.conf done - # Remove files provided by cups-filters. - rm -f ${DESTDIR}/usr/share/cups/banners/* - rm -f ${DESTDIR}/usr/share/cups/data/testprint - # comment out all conversion rules which use any of the removed filters - perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' \ - ${DESTDIR}/usr/share/cups/mime/mime.convs - # remove unnecessary PageLogFormat entry vsed -i -e 's:PageLogFormat:#PageLogFormat:' ${DESTDIR}/etc/cups/cupsd.conf* @@ -92,7 +74,7 @@ libcups_package() { } cups-devel_package() { - depends="zlib-devel libcups>=${version}_${revision}" + depends="libcups>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include From e07e847671e92c21d2f105493f5c968976069129 Mon Sep 17 00:00:00 2001 From: Piraty Date: Sun, 20 Mar 2022 22:25:04 +0100 Subject: [PATCH 176/222] tumbler: fix homepage and ignore development releases tumbler-4.17 autoconf explicity requires libxfce4util-4.17.1 which is a development release, so i assume the same 'odd mindor release is dev release' policy that most xfce components adhere to is implied for tumbler as well --- srcpkgs/tumbler/template | 4 ++-- srcpkgs/tumbler/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/tumbler/update diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template index dcdd7cfd40e9..9b4de6a28c82 100644 --- a/srcpkgs/tumbler/template +++ b/srcpkgs/tumbler/template @@ -1,7 +1,7 @@ # Template file for 'tumbler' pkgname=tumbler version=4.16.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer" hostmakedepends="intltool pkg-config glib-devel" @@ -10,7 +10,7 @@ makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel short_desc="D-Bus Thumbnailer service" maintainer="Orphaned " license="GPL-2.0-or-later" -homepage="https://xfce.org/" +homepage="https://docs.xfce.org/xfce/tumbler/start" distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" checksum=9b0b7fed0c64041733d490b1b307297984629d0dd85369749617a8766850af66 diff --git a/srcpkgs/tumbler/update b/srcpkgs/tumbler/update new file mode 100644 index 000000000000..5636324afbce --- /dev/null +++ b/srcpkgs/tumbler/update @@ -0,0 +1 @@ +ignore="*.*[13579].*" From afb78c3784cd1132a95ef32f3e7d5fcfc237bf5c Mon Sep 17 00:00:00 2001 From: John Date: Sun, 20 Mar 2022 22:30:27 +0100 Subject: [PATCH 177/222] libreoffice: fix KDE Headers include check --- srcpkgs/libreoffice/patches/kde-inc.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 srcpkgs/libreoffice/patches/kde-inc.patch diff --git a/srcpkgs/libreoffice/patches/kde-inc.patch b/srcpkgs/libreoffice/patches/kde-inc.patch new file mode 100644 index 000000000000..d01aba1e34cf --- /dev/null +++ b/srcpkgs/libreoffice/patches/kde-inc.patch @@ -0,0 +1,22 @@ +--- a/configure.ac 2021-11-18 12:33:09.000000000 +0100 ++++ - 2022-03-20 22:27:09.688261731 +0100 +@@ -12788,7 +12788,7 @@ + kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" + fi + +- kf5_test_include="KF5/kcoreaddons_version.h" ++ kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h" + kf5_test_library="libKF5CoreAddons.so" + kf5_libdirs="$qt5_libdir $kf5_libdirs" + +--- a/configure 2021-11-18 12:36:47.000000000 +0100 ++++ - 2022-03-20 22:27:22.080024887 +0100 +@@ -41089,7 +41089,7 @@ + kf5_libdirs="$kf5_libdirs /usr/lib64 /usr/lib64/kf5 /usr/lib64/kf5/devel" + fi + +- kf5_test_include="KF5/kcoreaddons_version.h" ++ kf5_test_include="KF5/KCoreAddons/kcoreaddons_version.h" + kf5_test_library="libKF5CoreAddons.so" + kf5_libdirs="$qt5_libdir $kf5_libdirs" + From 617e5518a73c47855ccd35c0ce351006be61d065 Mon Sep 17 00:00:00 2001 From: Sanjay Pavan Date: Thu, 3 Mar 2022 19:11:30 +0530 Subject: [PATCH 178/222] nsxiv: update to 29 --- srcpkgs/nsxiv/patches/no-rebuild-options.patch | 12 ++++++++++++ srcpkgs/nsxiv/template | 8 ++++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/nsxiv/patches/no-rebuild-options.patch diff --git a/srcpkgs/nsxiv/patches/no-rebuild-options.patch b/srcpkgs/nsxiv/patches/no-rebuild-options.patch new file mode 100644 index 000000000000..455884f0b1a1 --- /dev/null +++ b/srcpkgs/nsxiv/patches/no-rebuild-options.patch @@ -0,0 +1,12 @@ +Preventing rebuild of options.o when installing +--- a/Makefile ++++ b/Makefile +@@ -106,7 +106,7 @@ + rm -f "$$dir/nsxiv.png"; \ + done + +-install: all ++install: + @echo "INSTALL bin/nsxiv" + mkdir -p $(DESTDIR)$(PREFIX)/bin + cp nsxiv $(DESTDIR)$(PREFIX)/bin/ diff --git a/srcpkgs/nsxiv/template b/srcpkgs/nsxiv/template index 6ef4a1e207d2..a52cc2bb03f2 100644 --- a/srcpkgs/nsxiv/template +++ b/srcpkgs/nsxiv/template @@ -1,17 +1,17 @@ # Template file for 'nsxiv' pkgname=nsxiv -version=28 +version=29 revision=1 build_style=gnu-makefile make_install_target=install-all makedepends="libX11-devel imlib2-devel giflib-devel libexif-devel libXft-devel - libwebp-devel" + libwebp-devel freetype-devel fontconfig-devel" short_desc="Neo (or New or Not) Simple (or Small or Suckless) X Image Viewer" -maintainer="Sanjay Pavan " +maintainer="Sanjay Pavan " license="GPL-2.0-or-later" homepage="https://github.com/nsxiv/nsxiv" distfiles="https://github.com/nsxiv/nsxiv/archive/v${version}.tar.gz" -checksum=38047f60e51854363dd98fb7b3bc9f1cfa9b7d6f9e8788508b6f1e317328dd75 +checksum="564a17d921172336f7cd463bf313e39f84e4bcf4fdc789326f4112f848aad039" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" pre_build() { From e5acb908ef4b17262fed360a7972c2d1edac376a Mon Sep 17 00:00:00 2001 From: UsernameRandomlyGenerated Date: Sat, 5 Mar 2022 12:38:42 +0100 Subject: [PATCH 179/222] syncthing: update to 1.19.1. --- srcpkgs/syncthing/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template index d0792f1961fd..6c2d860909cb 100644 --- a/srcpkgs/syncthing/template +++ b/srcpkgs/syncthing/template @@ -1,6 +1,6 @@ # Template file for 'syncthing' pkgname=syncthing -version=1.19.0 +version=1.19.1 revision=1 build_style=go go_import_path="github.com/syncthing/syncthing" @@ -14,10 +14,10 @@ hostmakedepends="git" short_desc="Open Source Continuous File Synchronization" maintainer="Duncaen " license="MPL-2.0" -homepage="http://syncthing.net/" +homepage="https://syncthing.net/" changelog="https://github.com/syncthing/syncthing/releases" distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz" -checksum=9d7f020ee151512b5a121c08e2b07f7a2ce5bd4a749ca91e60803d21eb1aca02 +checksum=46319031c0805374baa382ee2b21290fb9dc595b70e905b97eb9a5643a78edc4 pre_build() { GOARCH= go generate \ From c4714c5cd85b421ee0385c42f1bddd3e179b4c95 Mon Sep 17 00:00:00 2001 From: mobinmob Date: Sun, 23 Jan 2022 17:57:27 +0200 Subject: [PATCH 180/222] deluge: update to 2.0.5. --- .../0001-Fix-warning-related-to-gettext.patch | 25 ------------ srcpkgs/deluge/patches/drop-priv.patch | 40 ------------------- srcpkgs/deluge/template | 23 ++++++----- 3 files changed, 13 insertions(+), 75 deletions(-) delete mode 100644 srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch delete mode 100644 srcpkgs/deluge/patches/drop-priv.patch diff --git a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch b/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch deleted file mode 100644 index 565cd4f952d0..000000000000 --- a/srcpkgs/deluge/patches/0001-Fix-warning-related-to-gettext.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d6c96d629183e8bab2167ef56457f994017e7c85 Mon Sep 17 00:00:00 2001 -From: neeshy -Date: Sat, 18 Apr 2020 23:23:51 -0400 -Subject: Fix warning related to gettext - ---- - deluge/i18n/util.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deluge/i18n/util.py b/deluge/i18n/util.py -index bd002f7a2..90568fc5b 100644 ---- a/deluge/i18n/util.py -+++ b/deluge/i18n/util.py -@@ -114,7 +114,7 @@ def setup_translation(): - # Workaround for Python 2 unicode gettext (keyword removed in Py3). - kwargs = {} if not deluge.common.PY2 else {'unicode': True} - -- gettext.install(I18N_DOMAIN, translations_path, names='ngettext', **kwargs) -+ gettext.install(I18N_DOMAIN, translations_path, names=['ngettext'], **kwargs) - builtins.__dict__['_n'] = builtins.__dict__['ngettext'] - - libintl = None --- -2.27.0 - diff --git a/srcpkgs/deluge/patches/drop-priv.patch b/srcpkgs/deluge/patches/drop-priv.patch deleted file mode 100644 index cb356dbe018b..000000000000 --- a/srcpkgs/deluge/patches/drop-priv.patch +++ /dev/null @@ -1,40 +0,0 @@ -From d08c3f72e94a3a2b440b5a1a36dd8f7f8641d4fa Mon Sep 17 00:00:00 2001 -From: Jack O'Sullivan -Date: Tue, 24 Sep 2019 11:32:18 +0100 -Subject: [PATCH] Fix privilege dropping when setting process ownership - -`os.setgid()` should be called to set the GID, and it should be called -before `os.setuid()` to prevent reinstatement of privileges. ---- - deluge/argparserbase.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/deluge/argparserbase.py b/deluge/argparserbase.py -index af9d568fa4..77866a3ed6 100644 ---- a/deluge/argparserbase.py -+++ b/deluge/argparserbase.py -@@ -329,18 +329,18 @@ def _handle_ui_options(self, options): - _file.write('%d\n' % os.getpid()) - - if not common.windows_check(): -+ if options.group: -+ if not options.group.isdigit(): -+ import grp -+ -+ options.group = grp.getgrnam(options.group)[2] -+ os.setgid(options.group) - if options.user: - if not options.user.isdigit(): - import pwd - - options.user = pwd.getpwnam(options.user)[2] - os.setuid(options.user) -- if options.group: -- if not options.group.isdigit(): -- import grp -- -- options.group = grp.getgrnam(options.group)[2] -- os.setuid(options.group) - - return options - diff --git a/srcpkgs/deluge/template b/srcpkgs/deluge/template index 180e473235fd..bdb186148072 100644 --- a/srcpkgs/deluge/template +++ b/srcpkgs/deluge/template @@ -1,20 +1,22 @@ # Template file for 'deluge' pkgname=deluge -version=2.0.3 -revision=15 +version=2.0.5 +revision=1 build_style=python3-module # TODO package python3-slimit to minify javascript hostmakedepends="intltool python3-setuptools python3-wheel" depends="python3-setuptools python3-chardet python3-Twisted python3-Mako python3-xdg python3-rencode python3-setproctitle libtorrent-rasterbar-python3 - python3-Pillow" -checkdepends="python3-pytest $depends" + python3-Pillow python3-pyasn1 python3-openssl python3-six python3-zope.interface" +checkdepends="python3-pytest $depends python3-pytest-mock python3-mock gtk+3 + python3-gobject xvfb-run cantarell-fonts" short_desc="Fully-featured cross-platform BitTorrent client" maintainer="Alexey Rochev " license="GPL-3.0-or-later" homepage="https://deluge-torrent.org/" +changelog="https://raw.githubusercontent.com/deluge-torrent/deluge/develop/CHANGELOG.md" distfiles="https://ftp.osuosl.org/pub/deluge/source/2.0/deluge-${version}.tar.xz" -checksum=7e7ae8e6ca2a2bf0d487227cecf81e27332f0b92b567cc2bda38e47d859da891 +checksum=c4bd04abfd211b65218be03f3c46d26f44024884de10e01859fb856fdd6f25d8 system_accounts="deluge" deluge_homedir="/var/lib/deluge" @@ -25,18 +27,19 @@ make_dirs=" /var/lib/deluge/.config/deluge 0755 deluge deluge " -post_install() { - vsv deluged +do_check() { + rm deluge/tests/test_torrentview.py deluge/tests/test_files_tab.py + xvfb-run python3 -m pytest } -do_check() { - python3 -m pytest || : # fails +post_install() { + vsv deluged } deluge-gtk_package() { replaces="deluge<1.3.14_1" short_desc+=" - GTK+ frontend" - depends="${sourcepkg}-${version}_${revision} python3-gobject" + depends="${sourcepkg}-${version}_${revision} python3-gobject gtk+3" pkg_install() { vmove usr/bin/deluge vmove usr/bin/deluge-gtk From a3b9f7de7abf5178847f39febae87663faae25ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 15 Mar 2022 17:05:24 +0100 Subject: [PATCH 181/222] devedeng: update to 4.17.0. --- srcpkgs/devedeng/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/devedeng/template b/srcpkgs/devedeng/template index f3229ed60680..e99cf74e0356 100644 --- a/srcpkgs/devedeng/template +++ b/srcpkgs/devedeng/template @@ -1,15 +1,14 @@ # Template file for 'devedeng' pkgname=devedeng -version=4.16.0 -revision=4 +version=4.17.0 +revision=1 build_style=python3-module -pycompile_module="devedeng" hostmakedepends="gettext python3" depends="cdrtools desktop-file-utils dvdauthor ffmpeg gtk+3 hicolor-icon-theme python3-gobject python3-setuptools vcdimager" short_desc="Create video DVDs and CDs" maintainer="Benjamín Albiñana " license="GPL-3.0-or-later" -homepage="http://www.rastersoft.com/programas/devede.html" +homepage="https://www.rastersoft.com/programas/devede.html" distfiles="https://gitlab.com/rastersoft/devedeng/-/archive/${version}/${pkgname}-${version}.tar.bz2" -checksum=fe2715aa8f73133fc2d809d840fd662dcf9776fcedfb68169984af2e762b5164 +checksum=c0f22037972dcfd70b3cbe92668c98e6853e20055913dbacf862684cebf3809b From bab4abdee31041fc861ee22d3a747571064704c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 15 Mar 2022 17:39:56 +0100 Subject: [PATCH 182/222] doomretro: update to 4.4.9. --- srcpkgs/doomretro/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/doomretro/template b/srcpkgs/doomretro/template index 75e937546567..5367dc8680ce 100644 --- a/srcpkgs/doomretro/template +++ b/srcpkgs/doomretro/template @@ -1,6 +1,6 @@ # Template file for 'doomretro' pkgname=doomretro -version=4.4.8 +version=4.4.9 revision=1 build_style=cmake hostmakedepends="pkg-config" @@ -11,4 +11,4 @@ license="GPL-3.0-or-later" homepage="https://www.doomretro.com" changelog="https://raw.githubusercontent.com/bradharding/doomretro/master/releasenotes.md" distfiles="https://github.com/bradharding/doomretro/archive/v${version}.tar.gz" -checksum=a680eecee1e8929774c340a2db8de24cb4d6e17e1f36d9e7c755656e12cac22c +checksum=02f2f3ec9d8d4db5ad1d00fcb5a5161113d3caa6dc108f14af8760535f00ce9e From 5d94b5cd339628d875df59085cec8ebade369761 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjam=C3=ADn=20Albi=C3=B1ana?= Date: Tue, 15 Mar 2022 17:52:46 +0100 Subject: [PATCH 183/222] lux: update to 0.14.0. --- srcpkgs/lux/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/lux/template b/srcpkgs/lux/template index ac88c0efaaa5..c09f51778e30 100644 --- a/srcpkgs/lux/template +++ b/srcpkgs/lux/template @@ -1,6 +1,6 @@ # Template file for 'lux' pkgname=lux -version=0.13.0 +version=0.14.0 revision=1 build_style=go go_import_path=github.com/iawia002/lux @@ -10,7 +10,7 @@ maintainer="Benjamín Albiñana " license="MIT" homepage="https://github.com/iawia002/lux" distfiles="https://github.com/iawia002/lux/archive/v${version}.tar.gz" -checksum=4fe99247a718dc1038cb6b9b1808c8e836bbf6a8464afefddf4bf8a161b08236 +checksum=3d485c9703851f3fb5cdee9b029b5b6855f84bfd29b44cae310a031a6fa8c00f post_install() { vlicense LICENSE From f7a3b95c265d180cafa0ec3d79838c6a2df198a5 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 5 Mar 2022 13:19:13 -0500 Subject: [PATCH 184/222] menumaker: update to 0.99.14, move to python3. --- srcpkgs/menumaker/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/menumaker/template b/srcpkgs/menumaker/template index 7a057147d0cd..db15e5a366f6 100644 --- a/srcpkgs/menumaker/template +++ b/srcpkgs/menumaker/template @@ -1,19 +1,19 @@ # Template file for 'menumaker' pkgname=menumaker -version=0.99.12 -revision=2 +version=0.99.14 +revision=1 build_style=gnu-configure pycompile_dirs="/usr/share/menumaker" -hostmakedepends="python" -makedepends="python" -depends="python" +hostmakedepends="python3" +makedepends="python3" +depends="python3" short_desc="Menu generation utility" maintainer="Orphaned " license="BSD-2-Clause" homepage="http://menumaker.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz" -checksum=e3a3566186a5a9ed4d721c1e7788a5af243c8c8a45b96fe6fff3e94580289b0c -python_version=2 +checksum=11e95d0e76a3b850f57df81bc5560222bd60141c5751b6e9bd05c3cd5560d65a +python_version=3 post_install() { vlicense COPYING From 87a91aaa7463ede75028ef2c0a6e5170cbadc5fc Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 8 Mar 2022 15:35:49 -0500 Subject: [PATCH 185/222] soju: update to 0.4.0. --- srcpkgs/soju/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/soju/template b/srcpkgs/soju/template index 733636d4a288..04bca21ab088 100644 --- a/srcpkgs/soju/template +++ b/srcpkgs/soju/template @@ -1,7 +1,7 @@ # Template file for 'soju' pkgname=soju -version=0.3.0 -revision=2 +version=0.4.0 +revision=1 build_style=go go_import_path="git.sr.ht/~emersion/soju" go_package="./cmd/soju ./cmd/sojuctl" @@ -12,7 +12,7 @@ license="AGPL-3.0-or-later" homepage="https://soju.im" changelog="https://git.sr.ht/~emersion/soju/refs/v${version}" distfiles="https://git.sr.ht/~emersion/soju/refs/download/v${version}/soju-${version}.tar.gz" -checksum=c1b77e87e42eb12bdc57a8c308b0d0f2b3dd367a2a8f9093a3983fa692c6aa01 +checksum=91a78d8f038fb3319042961ff38d9a54a9bf897942804c0a690628dc6c959118 conf_files="/etc/soju/config" system_accounts="_soju" make_dirs="/var/db/soju 0750 _soju _soju From b193a392c73606d91efaf291f352309459527f7f Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 14 Mar 2022 03:34:41 -0400 Subject: [PATCH 186/222] python3-language-server: update to 0.36.2, add missing dependency. fixes #36129 --- srcpkgs/python3-language-server/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-language-server/template b/srcpkgs/python3-language-server/template index 83332ba10f94..a443ec3fb514 100644 --- a/srcpkgs/python3-language-server/template +++ b/srcpkgs/python3-language-server/template @@ -1,11 +1,12 @@ # Template file for 'python3-language-server' pkgname=python3-language-server -version=0.36.1 -revision=3 +version=0.36.2 +revision=1 wrksrc="${pkgname/3}-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson" +depends="python3-jedi python3-pluggy python3-jsonrpc-server python3-ultrajson + python3-setuptools" checkdepends="${depends} autopep8 python3-coverage python3-flaky python3-matplotlib python3-mccabe python3-mock python3-numpy python3-pandas python3-pycodestyle python3-PyQt5 python3-pyflakes python3-pylint python3-pytest python3-pytest-cov @@ -15,7 +16,7 @@ maintainer="k4leg " license="MIT" homepage="https://github.com/palantir/python-language-server" distfiles="${PYPI_SITE}/p/${pkgname/3}/${pkgname/3}-${version}.tar.gz" -checksum=c85d718ef6860319ad59fd6f2acb1166e9349b782ee8e8908e08ecf241615f52 +checksum=9984c84a67ee2c5102c8e703215f407fcfa5e62b0ae86c9572d0ada8c4b417b0 # Needs unpackaged rope and versioneer # https://github.com/palantir/python-language-server/blob/develop/setup.py#L51 make_check=no From 565e46bec2b4925196e21a38e6c60c0a826f1ab2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 14 Mar 2022 03:39:12 -0400 Subject: [PATCH 187/222] protontricks: update to 1.8.0, add missing dependency. fixes #36072 --- srcpkgs/protontricks/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template index 30b450cd3532..208a55032a36 100644 --- a/srcpkgs/protontricks/template +++ b/srcpkgs/protontricks/template @@ -1,17 +1,17 @@ # Template file for 'protontricks' pkgname=protontricks -version=1.6.1 +version=1.8.0 revision=1 build_style=python3-module hostmakedepends="python3-setuptools_scm" -depends="python3-vdf winetricks" +depends="python3-vdf winetricks python3-setuptools" short_desc="Simple wrapper that does winetricks things for Proton enabled games" maintainer="Orphaned " license="GPL-3.0-only" homepage="https://github.com/Matoking/protontricks" changelog="https://raw.githubusercontent.com/Matoking/protontricks/master/CHANGELOG.md" distfiles="${PYPI_SITE}/p/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=7fe1bcc4cf029947850d8032b8a389e07ffb4e60e2d25a9c7535fa6e845b3ad8 +checksum=d56b53c4ea4286ae20588072433c30193143a75654ea216db389503a63661b09 make_check=no # no tests in pypi tarball post_install() { From 7e73f83414155174f02d84c711fd920bc5a9efb0 Mon Sep 17 00:00:00 2001 From: hechos Date: Sun, 20 Mar 2022 15:38:45 -0300 Subject: [PATCH 188/222] i3status-rust: update to 0.21.8 --- srcpkgs/i3status-rust/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/i3status-rust/template b/srcpkgs/i3status-rust/template index 62c33ae48c9d..6973e02571b4 100644 --- a/srcpkgs/i3status-rust/template +++ b/srcpkgs/i3status-rust/template @@ -1,6 +1,6 @@ # Template file for 'i3status-rust' pkgname=i3status-rust -version=0.21.7 +version=0.21.8 revision=1 build_style=cargo make_check_args="--bins" @@ -12,7 +12,7 @@ license="GPL-3.0-only" homepage="https://github.com/greshake/i3status-rust" changelog="https://raw.githubusercontent.com/greshake/i3status-rust/master/NEWS.md" distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz" -checksum=6085e261b2040110dd2043096d69e02c1f7d8c88651f2129b37f5a770c0a30ac +checksum=259fdcb3ce067c6f9089fc0d7e60b856d838fff3dfb7e7e4dc5c96742c1a1be1 post_install() { vmkdir usr/share/i3status-rust From e6e1d99f2a197751a70ac9f20ffaf012dfc29bb6 Mon Sep 17 00:00:00 2001 From: Subhaditya Nath Date: Sat, 19 Mar 2022 18:20:53 +0530 Subject: [PATCH 189/222] linux-firmware: update to 20220310 --- srcpkgs/linux-firmware/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index b945833d088e..c309bbf2da8a 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,14 +1,14 @@ # Template file for 'linux-firmware' pkgname=linux-firmware -version=20220209 -revision=2 +version=20220310 +revision=1 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}" short_desc="Binary firmware blobs for the Linux kernel" maintainer="Érico Nogueira " license="See /usr/share/licenses/${pkgname}" homepage="https://www.kernel.org/" distfiles="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=1ff936dc3946affa2695f31024b22e117b3faf9aa7b8857aba1d0473cd277897 +checksum=f4c34a7ba8144b52fd7f6dd0b1dea2998f140ab1139372f8fbdb76f4557ff228 python_version=3 nostrip=yes From 8762f5f86d6631eea9dca1a0051b9c7085134ef1 Mon Sep 17 00:00:00 2001 From: Jose G Perez Taveras Date: Sun, 20 Mar 2022 05:19:39 -0400 Subject: [PATCH 190/222] font-iosevka: update to 15.0.3. --- srcpkgs/font-iosevka/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template index 3b89fa15109a..4f1c061d5764 100644 --- a/srcpkgs/font-iosevka/template +++ b/srcpkgs/font-iosevka/template @@ -1,6 +1,6 @@ # Template file for 'font-iosevka' pkgname=font-iosevka -version=15.0.2 +version=15.0.3 revision=1 create_wrksrc=yes depends="font-util" @@ -13,8 +13,8 @@ distfiles="https://raw.githubusercontent.com/be5invis/Iosevka/v${version}/LICENS https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip" checksum="46ecadda73abf39cda76731a94fd357b743f882dc1156b4410a2967a811c4ff1 - 39e5c01184547c47d8dd4eb14897e045f5d4b39a71939f31f5ba410876aa0322 - eaa972a710765849339e17b44f1214e0b080f78cf88eaca21ae61609517301e5" + 7c6a4d8e003cab1a46f86fdf43f8c49e4b9d6ce932961572476266ad9f351608 + 629dd3cf957f7ef255e7dccc3286c5a3b54c0a6a7cde8b93b3a7fdc9dffc4cbd" font_dirs="/usr/share/fonts/TTF" From 13c7b85c3ba90fa7e5a57dd171501deb4f05b90d Mon Sep 17 00:00:00 2001 From: chili-b Date: Sat, 19 Mar 2022 21:10:43 -0400 Subject: [PATCH 191/222] Ice: update to 3.7.7. --- srcpkgs/Ice/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/Ice/template b/srcpkgs/Ice/template index 31b15fbb4d92..90ede78d19ad 100644 --- a/srcpkgs/Ice/template +++ b/srcpkgs/Ice/template @@ -1,7 +1,7 @@ # Template file for 'Ice' pkgname=Ice -version=3.7.5 -revision=2 +version=3.7.7 +revision=1 wrksrc="ice-${version}" build_style=gnu-makefile make_build_args="LANGUAGES=cpp prefix=/usr OPTIMIZE=yes @@ -14,7 +14,7 @@ maintainer="Orphaned " license="GPL-2.0-only, custom:ICE" homepage="https://www.zeroc.com" distfiles="https://github.com/zeroc-ice/ice/archive/v${version}.tar.gz" -checksum=36bf45591a95e6ee7216153d45d8eca05ff00c1da35608f0c400e6ddc8049da9 +checksum=3aef143a44a664f3101cfe02fd13356c739c922e353ef0c186895b5843a312ae if [ "$CROSS_BUILD" ]; then # Cross build requires the host's slice2cpp From 08b21d6f671a985a79c3f1095fe175387f45f38c Mon Sep 17 00:00:00 2001 From: gary <28818063+garylaski@users.noreply.github.com> Date: Sat, 19 Mar 2022 17:43:17 -0400 Subject: [PATCH 192/222] nicotine+: update to 3.2.2 --- srcpkgs/nicotine+/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/nicotine+/template b/srcpkgs/nicotine+/template index 4dbf467d42b3..fc00ddb36446 100644 --- a/srcpkgs/nicotine+/template +++ b/srcpkgs/nicotine+/template @@ -1,6 +1,6 @@ # Template file for 'nicotine+' pkgname=nicotine+ -version=3.2.1 +version=3.2.2 revision=1 wrksrc="nicotine-plus-${version}" build_style=python3-module @@ -13,4 +13,4 @@ license="GPL-3.0-or-later" homepage="https://nicotine-plus.org" changelog="https://raw.githubusercontent.com/nicotine-plus/nicotine-plus/master/NEWS.md" distfiles="https://github.com/Nicotine-Plus/nicotine-plus/archive/${version}.tar.gz" -checksum=fa9301fe816e3a753948325ae193b58750c2e1e80c92aee3e049309ad47ee80b +checksum=f58286f4dec6febfeab075cdfe2d2fc35c58349a504f7d393ec129df132ad40f From c68123372f8fe095110cbf8c356b92c80441e78e Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Sun, 20 Mar 2022 14:50:28 +0100 Subject: [PATCH 193/222] tali: update to 40.6. --- srcpkgs/tali/template | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tali/template b/srcpkgs/tali/template index 3e50e64f96fc..659f5257ae2e 100644 --- a/srcpkgs/tali/template +++ b/srcpkgs/tali/template @@ -1,6 +1,6 @@ # Template file for 'tali' pkgname=tali -version=40.5 +version=40.6 revision=1 build_style=meson hostmakedepends="pkg-config gettext glib-devel itstool" @@ -9,5 +9,6 @@ short_desc="GNOME sort of poker game with dice" maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Tali" +changelog="https://gitlab.gnome.org/GNOME/tali/-/raw/master/NEWS" distfiles="${GNOME_SITE}/tali/${version%.*}/tali-${version}.tar.xz" -checksum=63a09c55e46a1a19756bf5e0957caf994300fadabdba6bda602e668dfcdf7122 +checksum=83fba047edecd196d30719a70e2f4d0986bb26cc2bd5f955a0a9200ea63f0612 From b56fd943f72f968520d0715d707288b265f5b205 Mon Sep 17 00:00:00 2001 From: tibequadorian Date: Fri, 4 Mar 2022 21:05:01 +0100 Subject: [PATCH 194/222] xfce4-diskperf-plugin: update to 2.7.0, adopt. --- srcpkgs/xfce4-diskperf-plugin/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template index d57de65ca808..d7b6f822491a 100644 --- a/srcpkgs/xfce4-diskperf-plugin/template +++ b/srcpkgs/xfce4-diskperf-plugin/template @@ -1,17 +1,18 @@ # Template file for 'xfce4-diskperf-plugin' pkgname=xfce4-diskperf-plugin -version=2.6.3 +version=2.7.0 revision=1 build_style=gnu-configure configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="pkg-config intltool" makedepends="xfce4-panel-devel" short_desc="Plugin for the Xfce4 panel displaying disk/partition performance" -maintainer="Orphaned " +maintainer="tibequadorian " license="BSD-2-Clause" -homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-diskperf-plugin" +homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start" +changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS" distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=73b1ea2deb2403287337e8521d21345fb2f88445f9030732fa28f1bfa5d51c59 +checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9 post_install() { vlicense COPYING From e536762602029cbed14268a85af28e37a4686be7 Mon Sep 17 00:00:00 2001 From: Matthias von Faber Date: Sat, 19 Mar 2022 16:37:20 +0100 Subject: [PATCH 195/222] mkvtoolnix: update to 66.0.0 --- srcpkgs/mkvtoolnix/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template index 0b007bb865d0..98317332f361 100644 --- a/srcpkgs/mkvtoolnix/template +++ b/srcpkgs/mkvtoolnix/template @@ -1,6 +1,6 @@ # Template file for 'mkvtoolnix' pkgname=mkvtoolnix -version=65.0.0 +version=66.0.0 revision=1 build_style=gnu-configure build_helper=qmake @@ -17,7 +17,7 @@ license="GPL-2.0-only" homepage="https://mkvtoolnix.download" changelog="https://mkvtoolnix.download/doc/NEWS.md" distfiles="https://mkvtoolnix.download/sources/${pkgname}-${version}.tar.xz" -checksum=0dddc9cc1bae26ceaac3a184482c50e6bb8add2d62e06ef08b55f9f0108bb92e +checksum=73a3f6c39b3580f28233f93555d282d07d5f51a8bbeb8b0bee09b820de80692c if [ "$CROSS_BUILD" ]; then configure_args+=" --with-boost=${XBPS_CROSS_BASE}/usr" From 696f47b534c94f484a7ff891bdaa062cbfe6229e Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Tue, 8 Mar 2022 02:57:59 -0500 Subject: [PATCH 196/222] autofs: add log service, fix patch --- srcpkgs/autofs/files/autofs/log/run | 2 ++ srcpkgs/autofs/files/autofs/run | 1 + srcpkgs/autofs/patches/musl.patch | 22 +++++++++++----------- srcpkgs/autofs/template | 2 +- 4 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 srcpkgs/autofs/files/autofs/log/run diff --git a/srcpkgs/autofs/files/autofs/log/run b/srcpkgs/autofs/files/autofs/log/run new file mode 100644 index 000000000000..a2abfe61e846 --- /dev/null +++ b/srcpkgs/autofs/files/autofs/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec vlogger -p daemon.info -t autofs diff --git a/srcpkgs/autofs/files/autofs/run b/srcpkgs/autofs/files/autofs/run index 14ee8daad0c8..6da6f9c3d404 100644 --- a/srcpkgs/autofs/files/autofs/run +++ b/srcpkgs/autofs/files/autofs/run @@ -1,2 +1,3 @@ #!/bin/sh +exec 2>&1 exec automount -f diff --git a/srcpkgs/autofs/patches/musl.patch b/srcpkgs/autofs/patches/musl.patch index 5cd45dd184ab..f81228ad740a 100644 --- a/srcpkgs/autofs/patches/musl.patch +++ b/srcpkgs/autofs/patches/musl.patch @@ -30,18 +30,18 @@ #include --- a/lib/log.c.orig 2019-03-30 10:49:52.965336128 +0100 +++ b/lib/log.c 2019-03-30 10:50:43.232710045 +0100 -@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons - char buffer[ATTEMPT_ID_SIZE + 1]; - char *prefixed_msg = NULL; +@@ -38,7 +38,11 @@ + char buffer[ATTEMPT_ID_SIZE + 1]; + char *prefixed_msg = NULL; -- attempt_id = pthread_getspecific(key_thread_attempt_id); -+ if (key_thread_attempt_id) { -+ attempt_id = pthread_getspecific(key_thread_attempt_id); -+ } else { -+ attempt_id = 0; -+ } - if (attempt_id) { - int len = sizeof(buffer) + 1 + strlen(msg) + 1; +- attempt_id = pthread_getspecific(key_thread_attempt_id); ++ if (key_thread_attempt_id) { ++ attempt_id = pthread_getspecific(key_thread_attempt_id); ++ } else { ++ attempt_id = 0; ++ } + if (attempt_id) { + int len = sizeof(buffer) + 1 + strlen(msg) + 1; --- a/include/hash.h 2021-01-31 09:22:19.668222263 +0100 +++ b/include/hash.h 2021-01-31 09:22:41.390327622 +0100 diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template index 6ec782cccbb9..a9abc60e64e8 100644 --- a/srcpkgs/autofs/template +++ b/srcpkgs/autofs/template @@ -1,7 +1,7 @@ # Template file for 'autofs' pkgname=autofs version=5.1.8 -revision=1 +revision=2 build_style=gnu-configure make_build_args="DONTSTRIP=1" configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin" From 1ae6103ed3dc66a4ebcb035e57185ab53757080d Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Fri, 11 Mar 2022 21:13:50 +0100 Subject: [PATCH 197/222] nheko: update to 0.9.2. --- srcpkgs/nheko/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template index 50f5f543b500..846f2e381b17 100644 --- a/srcpkgs/nheko/template +++ b/srcpkgs/nheko/template @@ -1,22 +1,22 @@ # Template file for 'nheko' pkgname=nheko -version=0.9.1 -revision=2 +version=0.9.2 +revision=1 build_style=cmake -hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative" +hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc" makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel spdlog mtxclient-devel cmark-devel olm-devel json-c++ lmdb++ coeurl-devel qt5-declarative-devel qt5-quickcontrols2-devel qtkeychain-qt5-devel gst-plugins-bad1-devel gst-plugins-base1-devel xcb-util-wm-devel" depends="hicolor-icon-theme qt5-quickcontrols2 qt5-graphicaleffects qt5-multimedia gst-plugins-good1 gst-plugins-good1-qt5" -short_desc="Desktop client for Matrix using Qt and C++14" +short_desc="Desktop client for Matrix using Qt and C++" maintainer="Lorem " license="GPL-3.0-or-later" -homepage="https://github.com/Nheko-Reborn/nheko" -changelog="https://github.com/Nheko-Reborn/nheko/blob/master/CHANGELOG.md" +homepage="https://nheko-reborn.github.io" +changelog="https://raw.githubusercontent.com/Nheko-Reborn/nheko/master/CHANGELOG.md" distfiles="https://github.com/Nheko-Reborn/nheko/archive/v${version}.tar.gz" -checksum=f8261131ed10816bdae568e5d88f6f41adc6cc2564f2f57b07266103a4972776 +checksum=207243e1c0d0e879066233488b766e30d1902a24fd8f848850567d88408ce8ce case "$XBPS_TARGET_MACHINE" in armv*-musl) From ac12090d819eeb1d7bfd9ca2f1ac53d72aa6def4 Mon Sep 17 00:00:00 2001 From: Karel Balej Date: Fri, 11 Mar 2022 21:33:23 +0100 Subject: [PATCH 198/222] mtxclient: update to 0.7.0. --- common/shlibs | 2 +- srcpkgs/mtxclient/template | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 83b5783cb026..315841c47bae 100644 --- a/common/shlibs +++ b/common/shlibs @@ -421,7 +421,7 @@ libField3D.so.1.7 Field3D-1.7.3_1 libMAC.so.6 libMAC-5.28_1 libmad.so.0 libmad-0.15.1b_1 libmatroska.so.7 libmatroska-1.6.0_1 -libmatrix_client.so.0.6.2 mtxclient-0.6.2_1 +libmatrix_client.so.0.7.0 mtxclient-0.7.0_1 libebml.so.5 libebml-1.4.0_1 libdvdread.so.8 libdvdread-6.1.1_1 libdvdnav.so.4 libdvdnav-4.1.3_1 diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template index c58ff20762d0..952926c7df99 100644 --- a/srcpkgs/mtxclient/template +++ b/srcpkgs/mtxclient/template @@ -1,6 +1,6 @@ # Template file for 'mtxclient' pkgname=mtxclient -version=0.6.2 +version=0.7.0 revision=1 build_style=cmake configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF" @@ -10,8 +10,9 @@ short_desc="Client API library for the Matrix protocol" maintainer="Lorem " license="MIT" homepage="https://github.com/Nheko-Reborn/mtxclient" +changelog="https://raw.githubusercontent.com/Nheko-Reborn/mtxclient/master/CHANGELOG.md" distfiles="https://github.com/Nheko-Reborn/mtxclient/archive/v${version}.tar.gz" -checksum=97e41340c3f03db8a7625dcd54f6c6a3c8726c7b7226630727fea7d2bb2213bf +checksum=dd8ad5725c391b7c5b18564074e50bfc667fb3047e681561e5e42aec99c25b12 post_install() { vlicense LICENSE From 7d1287b73c23e66a946453b6d1272bcc65ec2dac Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 16 Mar 2022 11:27:47 +0100 Subject: [PATCH 199/222] py3status: update to 3.42. --- srcpkgs/py3status/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/py3status/template b/srcpkgs/py3status/template index 13a91c28109b..a84b6bc296be 100644 --- a/srcpkgs/py3status/template +++ b/srcpkgs/py3status/template @@ -1,6 +1,6 @@ # Template file for 'py3status' pkgname=py3status -version=3.41 +version=3.42 revision=1 build_style=python3-module hostmakedepends="python3-setuptools" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/ultrabug/py3status" changelog="https://raw.githubusercontent.com/ultrabug/py3status/master/CHANGELOG" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=9728ff6913a13087201c73f682f67afcd8dc73a71b044d6833737ee227ad5fba +checksum=bf7dd6cb65e88c3b0cf570a8df08c8ca30b655c88c7ba5b29fbfbf86a0737e27 post_install() { vlicense LICENSE From ed7f660f46845462b7f1b4eb3f0e288cf4301d91 Mon Sep 17 00:00:00 2001 From: zenobit Date: Mon, 14 Mar 2022 23:28:42 +0100 Subject: [PATCH 200/222] gitea: update to 1.16.4 --- srcpkgs/gitea/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index 75d8c4290fe4..f9eaa1b18732 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,6 +1,6 @@ # Template file for 'gitea' pkgname=gitea -version=1.16.3 +version=1.16.4 revision=1 create_wrksrc=yes build_style=go @@ -32,7 +32,7 @@ license="MIT" homepage="https://gitea.io" changelog="https://github.com/go-gitea/gitea/blob/master/CHANGELOG.md" distfiles="https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz" -checksum=913f3b095fcfd4c5012d17adcd8748b081950e3a7d17ace60f6a2f99c9b2e18b +checksum=ef396b797d39a64867dfcd4532043c363dce3fe054afaa37bb97f8a2ea3f2a18 system_accounts="_gitea" _gitea_homedir="/var/lib/gitea" From ee6c11087149123313c2ce72f139470c5e483bc1 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 20 Mar 2022 21:22:09 -0500 Subject: [PATCH 201/222] yara: update to 4.2.0. --- common/shlibs | 2 +- srcpkgs/yara/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 315841c47bae..2d8a8b8b0df3 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3044,7 +3044,7 @@ libbctoolbox.so.1 bctoolbox-0.6.0_1 libortp.so.15 ortp-4.4.0_1 libsuperlu.so.5 superlu-5.2.1_1 libgosu.so.0 gosu-0.12.0_1 -libyara.so.8 libyara-4.1.0_1 +libyara.so.9 libyara-4.2.0_1 libyaz_icu.so.5 yaz-5.23.1_1 libyaz.so.5 yaz-5.23.1_1 libyaz_server.so.5 yaz-5.23.1_1 diff --git a/srcpkgs/yara/template b/srcpkgs/yara/template index f4dcddc35692..fe171d75b35d 100644 --- a/srcpkgs/yara/template +++ b/srcpkgs/yara/template @@ -1,6 +1,6 @@ # Template file for 'yara' pkgname=yara -version=4.1.3 +version=4.2.0 revision=1 build_style=gnu-configure configure_args="--enable-magic --enable-cuckoo" @@ -11,7 +11,7 @@ maintainer="Andrew Benson " license="BSD-3-Clause" homepage="https://virustotal.github.io/yara/" distfiles="https://github.com/VirusTotal/yara/archive/v${version}.tar.gz" -checksum=3610ddd0c3645b8b9cfa7cfbafc0146f2df751ad8d6cd261a638bfff81efbc32 +checksum=6f567d4e4b79a210cd57a820f59f19ee69b024188ef4645b1fc11488a4660951 pre_configure() { autoreconf -fi From 93e1b7e3475c3bd53c57d45547e580a23538e910 Mon Sep 17 00:00:00 2001 From: Andrew Benson Date: Sun, 20 Mar 2022 21:22:11 -0500 Subject: [PATCH 202/222] python3-yara: update to 4.2.0. --- srcpkgs/python3-yara/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-yara/template b/srcpkgs/python3-yara/template index fcbbb46b64a7..3f4c5925636a 100644 --- a/srcpkgs/python3-yara/template +++ b/srcpkgs/python3-yara/template @@ -1,6 +1,6 @@ # Template file for 'python3-yara' pkgname=python3-yara -version=4.1.3 +version=4.2.0 revision=1 wrksrc="yara-python-${version}" build_style=python3-module @@ -12,4 +12,4 @@ maintainer="Andrew Benson " license="Apache-2.0" homepage="http://virustotal.github.io/yara/" distfiles="https://github.com/VirusTotal/yara-python/archive/v${version}.tar.gz" -checksum=009273c362d2f552ae784a297e4f0bd21ec5c51abd7e07fedb408156ffa2da8b +checksum=eb2df7d4b4b2631a9fa09b7fe7e41eea19a03d2f7204eff10a7341f8a443f550 From e168cc80d0d88b2af3ad12cb6806c10cc31ca233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 21 Mar 2022 09:54:31 +0700 Subject: [PATCH 203/222] python3-Sphinx: update to 4.4.0. --- srcpkgs/python3-Sphinx/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template index 8b0493c1f92c..ec36f57837af 100644 --- a/srcpkgs/python3-Sphinx/template +++ b/srcpkgs/python3-Sphinx/template @@ -1,6 +1,6 @@ # Template file for 'python3-Sphinx' pkgname=python3-Sphinx -version=4.2.0 +version=4.4.0 revision=1 wrksrc=Sphinx-${version} build_style=python3-module @@ -18,7 +18,7 @@ maintainer="Đoàn Trần Công Danh " license="BSD-3-Clause" homepage="http://sphinx-doc.org" distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz" -checksum=94078db9184491e15bce0a56d9186e0aec95f16ac20b12d00e06d4e36f1058a6 +checksum=6caad9786055cb1fa22b4a365c1775816b876f91966481765d7d50e9f0dd35cc conflicts="python-Sphinx>=0" post_install() { From 4113d0ca596d3e33d978c129d59a3a80b8c04ec9 Mon Sep 17 00:00:00 2001 From: skmpz Date: Fri, 10 Sep 2021 21:24:56 +0400 Subject: [PATCH 204/222] libssh: update to 0.9.6. --- srcpkgs/libssh/patches/fix-includes.patch | 10 ---------- srcpkgs/libssh/template | 9 +++++---- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/libssh/patches/fix-includes.patch diff --git a/srcpkgs/libssh/patches/fix-includes.patch b/srcpkgs/libssh/patches/fix-includes.patch deleted file mode 100644 index 39122128a307..000000000000 --- a/srcpkgs/libssh/patches/fix-includes.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/libssh/libssh.h -+++ b/include/libssh/libssh.h -@@ -57,6 +57,7 @@ - typedef unsigned long long uint64_t; - typedef int mode_t; - #else /* _MSC_VER */ -+ #include - #include - #include - #endif /* _MSC_VER */ diff --git a/srcpkgs/libssh/template b/srcpkgs/libssh/template index 9b57379bfc88..3732311abb24 100644 --- a/srcpkgs/libssh/template +++ b/srcpkgs/libssh/template @@ -1,9 +1,8 @@ # Template file for 'libssh' pkgname=libssh -version=0.9.5 -revision=2 +version=0.9.6 +revision=1 build_style=cmake -configure_args="-DUNIT_TESTING=ON" hostmakedepends="pkg-config python3" makedepends="zlib-devel openssl-devel cmocka-devel" checkdepends="openssh" @@ -11,8 +10,10 @@ short_desc="Multiplatform C library implementing the SSH v2 protocol" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://www.libssh.org/" +changelog="https://git.libssh.org/projects/libssh.git/plain/ChangeLog?h=stable-${version%.*}" distfiles="https://git.libssh.org/projects/libssh.git/snapshot/${pkgname}-${version}.tar.gz" -checksum=df65d6054554e8ff5458628808ce8d68b928175f4fefa1c833582b9568491e64 +checksum=63ddcb340e0898eb5c874418c1ff421cf90236fcb3fe5166675e79fa8a7511e4 +make_check=ci-skip # some tests fail when running as root case "$XBPS_TARGET_MACHINE" in *-musl) configure_args="-DHAVE_GLOB=0" ;; From ab6bbe502647bcedff8168d8a42a308e70217398 Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Mon, 21 Mar 2022 09:33:41 +0100 Subject: [PATCH 205/222] google-chrome: update to 99.0.4844.82 --- srcpkgs/google-chrome/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/google-chrome/template b/srcpkgs/google-chrome/template index 5516594f44f9..e12c57deeb5c 100644 --- a/srcpkgs/google-chrome/template +++ b/srcpkgs/google-chrome/template @@ -1,6 +1,6 @@ # Template file for 'google-chrome' pkgname=google-chrome -version=99.0.4844.74 +version=99.0.4844.82 revision=1 _channel=stable archs="x86_64" @@ -20,7 +20,7 @@ _chromeUrl="${_baseUrl}/${_filename}" _licenseUrl="https://www.google.com/intl/en/chrome/terms/" distfiles="$_chromeUrl" -checksum=0444893153d4b3b628c6465c48e7c49f06649b101ce5ab066d59b14c363ef9f7 +checksum=b9c181ddc15760795a7c30b950d90a8ef78487825fb12b1e171d1f71fe8a107e do_extract() { mkdir -p ${DESTDIR} From ec7a4f7249193a6f209a97011d57d9024fafac6b Mon Sep 17 00:00:00 2001 From: Henry Naguski Date: Sun, 20 Mar 2022 19:51:34 -0600 Subject: [PATCH 206/222] dolphin-emu: update to 5.0.16101. --- srcpkgs/dolphin-emu/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/dolphin-emu/template b/srcpkgs/dolphin-emu/template index 4f00d57388e1..2b3a783943b8 100644 --- a/srcpkgs/dolphin-emu/template +++ b/srcpkgs/dolphin-emu/template @@ -1,8 +1,8 @@ # Template file for 'dolphin-emu' pkgname=dolphin-emu -version=5.0.15993 +version=5.0.16101 revision=1 -_dolphin_commit=5e595616379a694789fe749e40a27ef069f0090e +_dolphin_commit=8ecfa537a242de74d2e372e30d9d79b14584b2fb _mgba_commit=40d4c430fc36caeb7ea32fd39624947ed487d2f2 #Version/hash pair can be found at https://dolphin-emu.org/download/ archs="x86_64* aarch64* ppc64le* i686*" @@ -25,7 +25,7 @@ license="GPL-2.0-or-later" homepage="http://dolphin-emu.org" distfiles="https://github.com/dolphin-emu/dolphin/archive/${_dolphin_commit}.tar.gz https://github.com/mgba-emu/mgba/archive/${_mgba_commit}.tar.gz" -checksum="d25e597356d410d71a825d881432ab40d66f65a5116412ec7d1661f414c72191 +checksum="a7bff69fce6466668c36e6c7ac3838434d64bb315cd2ad22817c943a9887f6e5 3cabf00a97cf4fb15fe8524b3d02190acdd003f25967cdbbf8de958649b8061b" nopie=yes From 61f9db096c161311b826a7eb0f4ebef59ad52b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 21 Mar 2022 17:04:55 +0700 Subject: [PATCH 207/222] nyxt: fix musl runtime While we're at it, load versioned libgi-repository. Fix: #35877 Fix: #36243 Close: #36251 --- srcpkgs/nyxt/patches/001-libfixposix.patch | 16 +++++++++------- srcpkgs/nyxt/patches/gir.patch | 13 +++++++++++++ srcpkgs/nyxt/template | 4 ++-- 3 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/nyxt/patches/gir.patch diff --git a/srcpkgs/nyxt/patches/001-libfixposix.patch b/srcpkgs/nyxt/patches/001-libfixposix.patch index 23ef9da26442..7339c30acbe8 100644 --- a/srcpkgs/nyxt/patches/001-libfixposix.patch +++ b/srcpkgs/nyxt/patches/001-libfixposix.patch @@ -1,12 +1,14 @@ ---- a/_build/iolib/src/syscalls/ffi-functions-unix.lisp.orig 2022-02-27 09:44:00.327307802 -0700 -+++ b/_build/iolib/src/syscalls/ffi-functions-unix.lisp 2022-02-27 09:48:30.875539336 -0700 -@@ -12,7 +12,8 @@ +Index: nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp +=================================================================== +--- nyxt-2.2.4.orig/_build/iolib/src/syscalls/ffi-functions-unix.lisp ++++ nyxt-2.2.4/_build/iolib/src/syscalls/ffi-functions-unix.lisp +@@ -11,7 +11,8 @@ + ;; FIXME: move this into an ASDF operation (eval-when (:compile-toplevel :load-toplevel :execute) (define-foreign-library - (libfixposix :canary "lfp_buildinfo") -- (t (:default "libfixposix"))) +- (libfixposix :canary "lfp_buildinfo") ++ (libfixposix :canary "lfp_buildinfo_not_exist") + (:unix "libfixposix.so.3") -+ (t (:default "libfixposix"))) + (t (:default "libfixposix"))) (load-foreign-library 'libfixposix)) - diff --git a/srcpkgs/nyxt/patches/gir.patch b/srcpkgs/nyxt/patches/gir.patch new file mode 100644 index 000000000000..39f94a1d4dde --- /dev/null +++ b/srcpkgs/nyxt/patches/gir.patch @@ -0,0 +1,13 @@ +Index: nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp +=================================================================== +--- nyxt-2.2.4.orig/_build/cl-gobject-introspection/src/init.lisp ++++ nyxt-2.2.4/_build/cl-gobject-introspection/src/init.lisp +@@ -10,7 +10,7 @@ + (t "libgobject-2.0")) + (cffi:define-foreign-library girepository + (:darwin "libgirepository-1.0.dylib") +- (:unix (:or "libgirepository-1.0.so" "libgirepository-1.0.so.1")) ++ (:unix (:or "libgirepository-1.0.so.1")) + (:windows (:or "libgirepository-1.0.dll" "libgirepository-1.0.0.dll" + "libgirepository-1.0-1.dll")) + (t "libgirepository-1.0"))) diff --git a/srcpkgs/nyxt/template b/srcpkgs/nyxt/template index a0da399fb2da..8fdd7215cd90 100644 --- a/srcpkgs/nyxt/template +++ b/srcpkgs/nyxt/template @@ -1,12 +1,12 @@ # Template file for 'nyxt' pkgname=nyxt version=2.2.4 -revision=2 +revision=3 create_wrksrc=yes build_style=gnu-makefile make_build_target=all hostmakedepends="sbcl git" -makedepends="webkit2gtk libfixposix-devel libgirepository-devel" +makedepends="webkit2gtk libfixposix-devel libgirepository" depends="dbus xclip enchant2 webkit2gtk libfixposix libgirepository" short_desc="Keyboard-oriented, extensible web-browser" maintainer="0x0f0f0f " From 0b8c50bcc3e3020e5f9d68123fa6e27d0434a991 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 21 Mar 2022 14:06:08 +0100 Subject: [PATCH 208/222] z3: update to 4.8.15. --- srcpkgs/z3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/z3/template b/srcpkgs/z3/template index a907482b751d..2d5bf7a80954 100644 --- a/srcpkgs/z3/template +++ b/srcpkgs/z3/template @@ -1,6 +1,6 @@ # Template file for 'z3' pkgname=z3 -version=4.8.14 +version=4.8.15 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=configure @@ -15,7 +15,7 @@ maintainer="Leah Neukirchen " license="MIT" homepage="https://github.com/Z3Prover/z3" distfiles="https://github.com/Z3Prover/z3/archive/z3-${version}.tar.gz" -checksum=96a1f49a7701120cc38bfa63c02ff93be4d64c7926cea41977dedec7d87a1364 +checksum=2abe7f5ecb7c8023b712ffba959c55b4515f4978522a6882391de289310795ac build_options="ocaml" desc_option_ocaml="Enable support for OCaml bindings" From 0324ac7f04f923b5ba862f6aacbda63ac8d40205 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 21 Mar 2022 16:12:29 +0100 Subject: [PATCH 209/222] knot-resolver: update to 5.5.0. --- srcpkgs/knot-resolver/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/knot-resolver/template b/srcpkgs/knot-resolver/template index 2f03d4420f03..f40c2f1646ee 100644 --- a/srcpkgs/knot-resolver/template +++ b/srcpkgs/knot-resolver/template @@ -1,6 +1,6 @@ # Template file for 'knot-resolver' pkgname=knot-resolver -version=5.4.4 +version=5.5.0 revision=1 build_style=meson configure_args=" @@ -19,7 +19,7 @@ maintainer="Duncaen " license="GPL-3.0-or-later" homepage="https://www.knot-resolver.cz/" distfiles="https://secure.nic.cz/files/knot-resolver/knot-resolver-${version}.tar.xz" -checksum=588964319e943679d391cc9c886d40ef858ecd9b33ae160023b4e2b5182b2cea +checksum=4e6f48c74d955f143d603f6072670cb41ab9acdd95d4455d6e74b6908562c55a system_accounts="_knot_resolver" _knot_resolver_homedir="/var/cache/knot-resolver" From 441ce5650e30c57397baf12a4b807fc99cef1e98 Mon Sep 17 00:00:00 2001 From: Sapein <5852983+Sapein@users.noreply.github.com> Date: Sun, 13 Mar 2022 00:05:24 +0000 Subject: [PATCH 210/222] linux-firmware: move MediaTek firmware Currently only some MediaTek firmware is moved. --- srcpkgs/linux-firmware/template | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/srcpkgs/linux-firmware/template b/srcpkgs/linux-firmware/template index c309bbf2da8a..f3e864b56263 100644 --- a/srcpkgs/linux-firmware/template +++ b/srcpkgs/linux-firmware/template @@ -1,7 +1,7 @@ # Template file for 'linux-firmware' pkgname=linux-firmware version=20220310 -revision=1 +revision=2 depends="${pkgname}-amd>=${version}_${revision} ${pkgname}-network>=${version}_${revision}" short_desc="Binary firmware blobs for the Linux kernel" maintainer="Érico Nogueira " @@ -95,9 +95,6 @@ linux-firmware-network_package() { vmove usr/lib/firmware/mrvl vmove "usr/lib/firmware/mt*.bin" vmove usr/lib/firmware/mediatek - vmove usr/lib/firmware/mediatek/mt8173/vpu_d.bin - vmove usr/lib/firmware/mediatek/mt8173/vpu_p.bin - vmove usr/lib/firmware/mediatek vmove usr/lib/firmware/ueagle-atm vmove usr/lib/firmware/ti-connectivity vmove usr/lib/firmware/dpaa2 From 237fdeb5cf0182dae297bec2fb616dfb5c17f167 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Tue, 25 May 2021 12:08:54 +1100 Subject: [PATCH 211/222] patchelf: update to 0.14.5. --- srcpkgs/patchelf/template | 8 ++++---- srcpkgs/patchelf/update | 2 -- 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 srcpkgs/patchelf/update diff --git a/srcpkgs/patchelf/template b/srcpkgs/patchelf/template index fe2dc3ccee4e..e0071fcf0b1b 100644 --- a/srcpkgs/patchelf/template +++ b/srcpkgs/patchelf/template @@ -1,11 +1,11 @@ # Template file for 'patchelf' pkgname=patchelf -version=0.10 +version=0.14.5 revision=1 build_style=gnu-configure short_desc="Utility for modifing existing ELF executables and libraries" maintainer="Orphaned " license="GPL-3.0-or-later" -homepage="https://nixos.org/patchelf.html" -distfiles="https://nixos.org/releases/patchelf/patchelf-${version}/patchelf-${version}.tar.bz2" -checksum=f670cd462ac7161588c28f45349bc20fb9bd842805e3f71387a320e7a9ddfcf3 +homepage="https://github.com/NixOS/patchelf" +distfiles="${homepage}/releases/download/${version}/patchelf-${version}.tar.bz2" +checksum=b9a46f2989322eb89fa4f6237e20836c57b455aa43a32545ea093b431d982f5c diff --git a/srcpkgs/patchelf/update b/srcpkgs/patchelf/update deleted file mode 100644 index dd90721fd90a..000000000000 --- a/srcpkgs/patchelf/update +++ /dev/null @@ -1,2 +0,0 @@ -site='https://nixos.org/releases/patchelf/' -pattern='patchelf-\K[\d.]+(?=/)' From 1168270adc2d4ebf0b75e553ee8459919d218d64 Mon Sep 17 00:00:00 2001 From: Piraty Date: Tue, 22 Mar 2022 11:51:31 +0100 Subject: [PATCH 212/222] warzone2100: don't install /usr/bin/.portable it tricks keepassxc into portable mode Closes: #36277 --- srcpkgs/warzone2100/template | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template index 9ef2297baeb7..9c691626703f 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -1,7 +1,7 @@ # Template file for 'warzone2100' pkgname=warzone2100 version=4.2.7 -revision=1 +revision=3 wrksrc="warzone2100" build_style=cmake configure_args="-DWZ_ENABLE_WARNINGS_AS_ERRORS=OFF -DWZ_DISTRIBUTOR=void" @@ -28,6 +28,12 @@ post_extract() { fi } +post_install() { + # .portable has side-effect with keepassxc + # https://github.com/Warzone2100/warzone2100/issues/2645 + rm "$DESTDIR"/usr/bin/.portable +} + warzone2100-data_package() { short_desc+=" - data files" pkg_install() { From 532dc6add46d555c58a1ea26c2beb68c1bf85934 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 22 Mar 2022 16:19:05 +0100 Subject: [PATCH 213/222] skaffold: update to 1.37.0. --- srcpkgs/skaffold/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/skaffold/template b/srcpkgs/skaffold/template index fa05e329472f..4f54c6c05e98 100644 --- a/srcpkgs/skaffold/template +++ b/srcpkgs/skaffold/template @@ -1,6 +1,6 @@ # Template file for 'skaffold' pkgname=skaffold -version=1.36.1 +version=1.37.0 revision=1 build_style=go go_import_path=github.com/GoogleContainerTools/skaffold @@ -12,4 +12,4 @@ license="Apache-2.0" homepage="https://skaffold.dev/" changelog="https://github.com/GoogleContainerTools/skaffold/releases" distfiles="https://github.com/GoogleContainerTools/skaffold/archive/v${version}.tar.gz" -checksum=b30361c02963d2374f2636f0181808f868834024f99ace74282c9f7416c1646a +checksum=a97a6f6cbf571f342183e5cf65c30932ade282b182fc92f108cb2a160a46779b From 26afa05ef8f36cd9c21e674bbdaf66549d02a222 Mon Sep 17 00:00:00 2001 From: Ramdziana F Y Date: Mon, 21 Mar 2022 20:11:35 +0700 Subject: [PATCH 214/222] vivaldi: update to 5.1.2567.66 --- srcpkgs/vivaldi/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template index e3421bb8539c..d36738824694 100644 --- a/srcpkgs/vivaldi/template +++ b/srcpkgs/vivaldi/template @@ -1,6 +1,6 @@ # Template file for 'vivaldi' pkgname=vivaldi -version=5.1.2567.57 +version=5.1.2567.66 revision=1 _release=1 archs="x86_64" @@ -14,7 +14,7 @@ license="custom:Proprietary" homepage="https://vivaldi.com" distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb" _licenseUrl="https://vivaldi.com/privacy/vivaldi-end-user-license-agreement/" -checksum=ffb1f9ea4fc7eb9e99274f13a771999682ab1eef078641df6fcd48c1357ffd7a +checksum=e2631cfabdd2d916fd8ab05004afd86efeec4e47d50a86b8be4cd3b59f6430ed repository=nonfree restricted=yes nostrip=yes From bd7003574386cc2dfb5a6841b03f48d6072afb33 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 22 Mar 2022 17:56:15 +0100 Subject: [PATCH 215/222] lollypop: update to 1.4.30. --- srcpkgs/lollypop/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/lollypop/template b/srcpkgs/lollypop/template index 2c2d8c329e63..569c4e291772 100644 --- a/srcpkgs/lollypop/template +++ b/srcpkgs/lollypop/template @@ -1,10 +1,11 @@ # Template file for 'lollypop' pkgname=lollypop -version=1.4.29 +version=1.4.30 revision=1 build_style=meson hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config" -makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel" +makedepends="gtk+3-devel libsoup-devel python3-gobject-devel python3-devel + libhandy1-devel" depends="dconf gst-libav gst-plugins-good1 libnotify libsecret python3-Pillow totem-pl-parser python3-BeautifulSoup4 libhandy1 python3-gobject python3-pylast youtube-dl gnome-keyring" @@ -13,4 +14,4 @@ maintainer="Duncaen " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Lollypop" distfiles="https://adishatz.org/lollypop/lollypop-${version}.tar.xz" -checksum=f6975923315adc57ebe693e7cae9e2668d1d3f7f9a0e3209eda4b67f270761ee +checksum=393c3ed6431026b3214f380b7aa74ee31b054203855f7f5c928b1d25ad1b8ef5 From 2f8725af2dfc3d3c41bf53929c3d63ace94b533c Mon Sep 17 00:00:00 2001 From: Duncaen Date: Tue, 22 Mar 2022 17:58:04 +0100 Subject: [PATCH 216/222] squashfs-tools: update to 4.5.1. --- srcpkgs/squashfs-tools/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/squashfs-tools/template b/srcpkgs/squashfs-tools/template index 04b0bef6df6a..8b22de823ade 100644 --- a/srcpkgs/squashfs-tools/template +++ b/srcpkgs/squashfs-tools/template @@ -1,7 +1,7 @@ # Template file for 'squashfs-tools' pkgname=squashfs-tools -version=4.5 -revision=2 +version=4.5.1 +revision=1 build_wrksrc="squashfs-tools" build_style=gnu-makefile make_use_env=yes @@ -11,8 +11,9 @@ short_desc="Tool to create and append to squashfs filesystems" maintainer="Duncaen " license="GPL-2.0-or-later" homepage="https://github.com/plougher/squashfs-tools" +changelog="https://github.com/plougher/squashfs-tools/raw/master/CHANGES" distfiles="https://github.com/plougher/squashfs-tools/archive/refs/tags/${version}.tar.gz" -checksum=b9e16188e6dc1857fe312633920f7d71cc36b0162eb50f3ecb1f0040f02edddd +checksum=277b6e7f75a4a57f72191295ae62766a10d627a4f5e5f19eadfbc861378deea7 do_install() { vbin mksquashfs From a1a00588fac69b790c91253be4d07b9222a23d43 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Mon, 21 Mar 2022 10:02:40 -0400 Subject: [PATCH 217/222] python-dbus: include egg-info metadata Also drop python-dbus-devel, there is no value in carrying the metapkg. --- srcpkgs/python-dbus-devel | 1 - srcpkgs/python-dbus/template | 64 ++++++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 26 deletions(-) delete mode 120000 srcpkgs/python-dbus-devel diff --git a/srcpkgs/python-dbus-devel b/srcpkgs/python-dbus-devel deleted file mode 120000 index 082b5c2fc193..000000000000 --- a/srcpkgs/python-dbus-devel +++ /dev/null @@ -1 +0,0 @@ -python-dbus \ No newline at end of file diff --git a/srcpkgs/python-dbus/template b/srcpkgs/python-dbus/template index 19ac9e7cbf0b..64c1ae021798 100644 --- a/srcpkgs/python-dbus/template +++ b/srcpkgs/python-dbus/template @@ -1,11 +1,11 @@ # Template file for 'python-dbus' pkgname=python-dbus version=1.2.18 -revision=1 +revision=2 wrksrc="dbus-python-${version}" build_style=gnu-configure -hostmakedepends="pkg-config python-devel python3-devel" -makedepends="libglib-devel ${hostmakedepends/pkg-config/}" +hostmakedepends="pkg-config python python3" +makedepends="libglib-devel python3-devel python-devel" depends="python dbus" short_desc="D-Bus Python2 bindings" maintainer="Orphaned " @@ -20,35 +20,55 @@ pre_configure() { mv * dbus-${py2_ver} || true cp -a dbus-${py2_ver} dbus-${py3_ver} } + do_configure() { - local py_abiver= + local py_abiver py_inc pyver for pyver in $py2_ver $py3_ver; do - if [ "$pyver" != "$py2_ver" ]; then - py_inc="$py3_inc" - py_abiver="$py3_abiver" - else - py_inc="$py2_inc" - fi + case "${pyver}" in + "${py2_ver}") + py_inc="$py2_inc" + ;; + *) + py_inc="$py3_inc" + py_abiver="$py3_abiver" + ;; + esac - cd ${wrksrc}/dbus-${pyver} export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py_inc}" export PYTHON_EXTRA_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${pyver}${py_abiver}" export PYTHON_VERSION="${pyver}" - ./configure ${configure_args} + + ( cd dbus-${pyver} && ./configure ${configure_args} ) + done + + unset PYTHON_CPPFLAGS PYTHON_EXTRA_LIBS PYTHON_VERSION } + do_build() { + local pyver for pyver in $py2_ver $py3_ver; do - cd ${wrksrc}/dbus-${pyver} - make ${makejobs} + ( cd dbus-${pyver} && make ${makejobs} ) done } + do_install() { + local pyver pysite eggver for pyver in $py2_ver $py3_ver; do - cd ${wrksrc}/dbus-${pyver} - make DESTDIR=${DESTDIR} install - vlicense COPYING + case "${pyver}" in + "${py2_ver}") pysite="${py2_sitelib}" ;; + *) pysite="${py3_sitelib}" ;; + esac + + eggver="dbus_python-${version}-py${pyver}" + ( + cd dbus-${pyver} + make DESTDIR=${DESTDIR} install + vcopy dbus_python.egg-info "${pysite}/${eggver}.egg-info" + ) done + + vlicense dbus-${py2_ver}/COPYING } python3-dbus_package() { @@ -57,16 +77,10 @@ python3-dbus_package() { short_desc="${short_desc/Python2/Python3}" pkg_install() { vmove usr/lib/python3* + vlicense dbus-${py3_ver}/COPYING } } -# This package used to provide both Python 2 and Python 3 development files -# Those files are now in python3-dbus-devel -python-dbus-devel_package() { - depends="python-devel python-dbus>=${version}_${revision} - python3-dbus-devel>=${version}_${revision}" - build_style=meta - short_desc+=" - development files (Python 2 meta)" -} + python3-dbus-devel_package() { depends="python3-devel python3-dbus>=${version}_${revision}" short_desc="${short_desc/Python2/Python3} - development files" From 41cc3484832a28e1f8fe98f2c4aa5fe6c7d86585 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Mon, 21 Mar 2022 23:58:07 -0400 Subject: [PATCH 218/222] libusb: fix segfault libusb/libusb#1073 --- .../libusb/patches/late-transfer-free.patch | 136 ++++++++++++++++++ srcpkgs/libusb/template | 2 +- 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libusb/patches/late-transfer-free.patch diff --git a/srcpkgs/libusb/patches/late-transfer-free.patch b/srcpkgs/libusb/patches/late-transfer-free.patch new file mode 100644 index 000000000000..f4d913bbbd84 --- /dev/null +++ b/srcpkgs/libusb/patches/late-transfer-free.patch @@ -0,0 +1,136 @@ +From 010691ff6fdf9fcfaa7f76c1417dfc1f7df124ca Mon Sep 17 00:00:00 2001 +From: Benjamin Berg +Date: Tue, 15 Feb 2022 11:13:41 +0100 +Subject: [PATCH] io: Track device in usbi_transfer + +transfer->dev_handle currently has the behaviour that it will be unset +if the device is closed. The sync API uses this fact to catch an error +case. + +In other cases, transfer->dev_handle will keep its value, which means +that if the transfer lives longer than the device handle, the pointer +becomes invalid. + +The transfer does however keep a reference to the device, which owns the +pointer to the context. As such, we can track this reference internal to +the transfer, and it is set while the transfer is in-flight. + +With this, switch the logging infrastructure to use itransfer->dev->ctx +while checking that itransfer->dev is non-NULL. + +Note that this was a regression caused by 6cae9c6dbd74 ("core: update +usbi_dbg to take the context as an argument"), specifically when +resolving the context while freeing a transfer after closing a device. + +Note that the transfer will now keep a reference to the device until it +is free'ed. This allows it to use the correct context for logging even +in libusb_free_transfer. + +The alternative to all this would be to just explicitly pass NULL to the +log handler in libusb_free_transfer. + +Closes: #1038 +--- + libusb/io.c | 20 ++++++++++++-------- + libusb/libusbi.h | 11 ++++++++--- + 2 files changed, 20 insertions(+), 11 deletions(-) + +diff --git a/libusb/io.c b/libusb/io.c +index 0d2ac9ea..b919e9d9 100644 +--- a/libusb/io.c ++++ b/libusb/io.c +@@ -1344,6 +1344,8 @@ void API_EXPORTED libusb_free_transfer(struct libusb_transfer *transfer) + + itransfer = LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); + usbi_mutex_destroy(&itransfer->lock); ++ if (itransfer->dev) ++ libusb_unref_device(itransfer->dev); + + priv_size = PTR_ALIGN(usbi_backend.transfer_priv_size); + ptr = (unsigned char *)itransfer - priv_size; +@@ -1489,9 +1491,15 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer) + { + struct usbi_transfer *itransfer = + LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer); +- struct libusb_context *ctx = TRANSFER_CTX(transfer); ++ struct libusb_context *ctx; + int r; + ++ assert(transfer->dev_handle); ++ if (itransfer->dev) ++ libusb_unref_device(itransfer->dev); ++ itransfer->dev = libusb_ref_device(transfer->dev_handle->dev); ++ ++ ctx = HANDLE_CTX(transfer->dev_handle); + usbi_dbg(ctx, "transfer %p", transfer); + + /* +@@ -1551,8 +1559,6 @@ int API_EXPORTED libusb_submit_transfer(struct libusb_transfer *transfer) + r = usbi_backend.submit_transfer(itransfer); + if (r == LIBUSB_SUCCESS) { + itransfer->state_flags |= USBI_TRANSFER_IN_FLIGHT; +- /* keep a reference to this device */ +- libusb_ref_device(transfer->dev_handle->dev); + } + usbi_mutex_unlock(&itransfer->lock); + +@@ -1659,7 +1665,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer, + { + struct libusb_transfer *transfer = + USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer); +- struct libusb_device_handle *dev_handle = transfer->dev_handle; + struct libusb_context *ctx = ITRANSFER_CTX(itransfer); + uint8_t flags; + int r; +@@ -1693,7 +1698,6 @@ int usbi_handle_transfer_completion(struct usbi_transfer *itransfer, + * this point. */ + if (flags & LIBUSB_TRANSFER_FREE_TRANSFER) + libusb_free_transfer(transfer); +- libusb_unref_device(dev_handle->dev); + return r; + } + +@@ -1727,10 +1731,10 @@ int usbi_handle_transfer_cancellation(struct usbi_transfer *itransfer) + * function will be called the next time an event handler runs. */ + void usbi_signal_transfer_completion(struct usbi_transfer *itransfer) + { +- libusb_device_handle *dev_handle = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)->dev_handle; ++ struct libusb_device *dev = itransfer->dev; + +- if (dev_handle) { +- struct libusb_context *ctx = HANDLE_CTX(dev_handle); ++ if (dev) { ++ struct libusb_context *ctx = DEVICE_CTX(dev); + unsigned int event_flags; + + usbi_mutex_lock(&ctx->event_data_lock); +diff --git a/libusb/libusbi.h b/libusb/libusbi.h +index 158a9af5..7618236f 100644 +--- a/libusb/libusbi.h ++++ b/libusb/libusbi.h +@@ -329,10 +329,11 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level, + #endif /* ENABLE_LOGGING */ + + #define DEVICE_CTX(dev) ((dev)->ctx) +-#define HANDLE_CTX(handle) (DEVICE_CTX((handle)->dev)) +-#define TRANSFER_CTX(transfer) (HANDLE_CTX((transfer)->dev_handle)) ++#define HANDLE_CTX(handle) ((handle) ? DEVICE_CTX((handle)->dev) : NULL) + #define ITRANSFER_CTX(itransfer) \ +- (TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer))) ++ ((itransfer)->dev ? DEVICE_CTX((itransfer)->dev) : NULL) ++#define TRANSFER_CTX(transfer) \ ++ (ITRANSFER_CTX(LIBUSB_TRANSFER_TO_USBI_TRANSFER(transfer))) + + #define IS_EPIN(ep) (0 != ((ep) & LIBUSB_ENDPOINT_IN)) + #define IS_EPOUT(ep) (!IS_EPIN(ep)) +@@ -562,6 +563,10 @@ struct usbi_transfer { + uint32_t state_flags; /* Protected by usbi_transfer->lock */ + uint32_t timeout_flags; /* Protected by the flying_stransfers_lock */ + ++ /* The device reference is held until destruction for logging ++ * even after dev_handle is set to NULL. */ ++ struct libusb_device *dev; ++ + /* this lock is held during libusb_submit_transfer() and + * libusb_cancel_transfer() (allowing the OS backend to prevent duplicate + * cancellation, submission-during-cancellation, etc). the OS backend diff --git a/srcpkgs/libusb/template b/srcpkgs/libusb/template index 7b63b401f2a6..4f192264d4bc 100644 --- a/srcpkgs/libusb/template +++ b/srcpkgs/libusb/template @@ -1,7 +1,7 @@ # Template file for 'libusb' pkgname=libusb version=1.0.25 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="eudev-libudev-devel" From cd9182631a2919334b182e8f9438649f6203b138 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Tue, 22 Mar 2022 19:54:46 +0100 Subject: [PATCH 219/222] vim: update to 8.2.4609. --- srcpkgs/vim/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/vim/template b/srcpkgs/vim/template index 252c84c21b18..f5ff0d9066a7 100644 --- a/srcpkgs/vim/template +++ b/srcpkgs/vim/template @@ -1,7 +1,7 @@ # Template file for 'vim' pkgname=vim -version=8.2.4221 -revision=2 +version=8.2.4609 +revision=1 hostmakedepends="gettext glib-devel pkg-config" makedepends="acl-devel ncurses-devel $(vopt_if x11 libXt-devel) @@ -13,7 +13,7 @@ maintainer="Neel Chotai " license="Vim" homepage="https://www.vim.org" distfiles="https://github.com/vim/vim/archive/v${version}.tar.gz" -checksum=4b81c03d54a5df697d74bc1eccc5939d6836b8fb58291eda5344c6ddb757ae57 +checksum=a9b150ed68cf41931e1af2f9fe8b958cf36ed1a14d00378ac8cebf7d8617afb1 python_version=3 build_options="x11 gtk3 huge" From 7d620c53169fd31d06927b23d9cbff3de945ce37 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 22 Mar 2022 20:24:14 +0100 Subject: [PATCH 220/222] fwupd: fix -devel dependencies --- srcpkgs/fwupd/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/fwupd/template b/srcpkgs/fwupd/template index 005880d7bcbf..9f15e0a43ddc 100644 --- a/srcpkgs/fwupd/template +++ b/srcpkgs/fwupd/template @@ -1,7 +1,7 @@ # Template file for 'fwupd' pkgname=fwupd version=1.7.5 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dsupported_build=true -Dconsolekit=false -Dsystemd=false -Delogind=true @@ -60,7 +60,9 @@ pre_build() { } fwupd-devel_package() { - depends="${sourcepkg}>=${version}_${revision} libglib-devel" + depends="${sourcepkg}>=${version}_${revision} libglib-devel libcurl-devel + libjcat-devel libgusb-devel libxmlb-devel libarchive-devel gcab-devel + json-glib-devel" short_desc+=" - development files" pkg_install() { vmove usr/include From fb9e3248ec506b7ab2399b3965584617bebffe65 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 12 Mar 2022 17:37:09 +0100 Subject: [PATCH 221/222] nautilus-sendto: remove package --- srcpkgs/nautilus-sendto/template | 14 -------------- srcpkgs/removed-packages/template | 1 + 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 srcpkgs/nautilus-sendto/template diff --git a/srcpkgs/nautilus-sendto/template b/srcpkgs/nautilus-sendto/template deleted file mode 100644 index c357b9efae65..000000000000 --- a/srcpkgs/nautilus-sendto/template +++ /dev/null @@ -1,14 +0,0 @@ -# Template file for 'nautilus-sendto' -pkgname=nautilus-sendto -version=3.8.6 -revision=2 -build_style=meson -# XXX: add pidgin and gajim depends for plugins to work. -hostmakedepends="pkg-config intltool" -makedepends="evolution-data-server-devel nautilus-devel gupnp-devel appstream-glib-devel" -short_desc="Nautilus context menu for sending files" -maintainer="Orphaned " -license="GPL-2.0-or-later" -homepage="http://download.gnome.org/sources/nautilus-sendto/" -distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=164d7c6e8bae29c4579bcc67a7bf50d783662b1545b62f3008e7ea3c0410e04d diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index c23125bb0cb4..30fa0d2cce34 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -243,6 +243,7 @@ replaces=" mongroup<=0.4.1_2 mozjs68<=68.11.0_1 mutagen<=1.43.0_3 + nautilus-sendto<=3.8.6_2 ncdns<=0.0.2_12 newt-python<=0.52.21_5 nodejs-lts-10<=10.24.0_2